From ca6ebeac3b6dffb92cab79168c21e27a58c3d824 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 23 Feb 2015 16:19:53 +0200
Subject: [PATCH 01/45] Gpx tracks card and My tracks updated

---
 OsmAnd/res/layout/available_gpx.xml           | 37 +++++++++++++++++++
 OsmAnd/res/layout/dash_gpx_track_item.xml     |  8 ++--
 OsmAnd/res/layout/dashboard.xml               | 14 +++----
 OsmAnd/res/values/strings.xml                 |  3 +-
 .../plus/activities/AvailableGPXFragment.java | 33 +++++++++++++++++
 .../OsmandExpandableListFragment.java         |  4 +-
 .../plus/monitoring/DashTrackFragment.java    |  4 ++
 7 files changed, 90 insertions(+), 13 deletions(-)
 create mode 100644 OsmAnd/res/layout/available_gpx.xml

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
new file mode 100644
index 0000000000..d45911e47b
--- /dev/null
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent">
+
+	<LinearLayout android:id="@+id/current_track"
+				  android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<include android:layout_height="wrap_content"
+				 android:layout_width="match_parent"
+				 layout="@layout/dash_gpx_track_item"/>
+
+		<Button android:id="@+id/map_btn"
+				android:text="@string/back_to_map"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+
+
+	<ExpandableListView
+		android:id="@android:id/list"
+		style="@style/OsmandListView"
+		android:layout_width="fill_parent"
+		android:layout_height="0dp"
+		android:background="?attr/expandable_list_background"
+		android:layout_marginLeft="0dp"
+		android:layout_marginRight="0dp"
+		android:layout_marginTop="0dp"
+		android:layout_weight="1"
+		android:groupIndicator="@android:color/transparent"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index a3f4783d0b..1adc373af9 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -17,7 +17,7 @@
 					  android:layout_marginRight="@dimen/showAllButtonMarginRight"
 					  android:layout_height="wrap_content">
 			<TextView android:id="@+id/name"
-					  android:textColor="@color/dashboard_black"
+					  android:textColor="?android:textColorPrimary"
 					  android:layout_width="wrap_content"
 					  android:layout_height="wrap_content"/>
 			<LinearLayout android:orientation="horizontal"
@@ -56,14 +56,16 @@
 			</LinearLayout>
 		</LinearLayout>
 
-		<ImageView android:id="@+id/stop"
+		<ImageButton android:id="@+id/stop"
 				   android:visibility="gone"
 				   android:layout_gravity="center_vertical"
+				   android:background="?attr/dashboard_button"
 				   android:layout_width="wrap_content"
 				   android:layout_height="wrap_content"/>
 
-		<ImageView android:id="@+id/show_on_map"
+		<ImageButton android:id="@+id/show_on_map"
 				   android:layout_gravity="center_vertical"
+				   android:background="?attr/dashboard_button"
 				   android:layout_width="@dimen/dashListItemHeight"
 				   android:layout_height="@dimen/dashListItemHeight"/>
 	</LinearLayout>
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 26d8a01a30..f7d2a148e9 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -60,13 +60,13 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
-			<!--<fragment-->
-					<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
-					<!--android:id="@+id/TracksFragment"-->
-					<!--android:name="net.osmand.plus.dashboard.DashTrackFragment"-->
-					<!--android:layout_marginTop="@dimen/dashCardMargin"-->
-					<!--android:layout_width="match_parent"-->
-					<!--android:layout_height="wrap_content"/>-->
+			<fragment
+					xmlns:android="http://schemas.android.com/apk/res/android"
+					android:id="@+id/TracksFragment"
+					android:name="net.osmand.plus.monitoring.DashTrackFragment"
+					android:layout_marginTop="@dimen/dashCardMargin"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
 
 			<!--<fragment-->
 					<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index aade191905..3908e339dd 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,7 +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="currently_recording_track">Currently recording track</string>
+	<string name="back_to_map">Back to map</string>
 	<string name="plugin_nautical_descr1">Activating this view changes the map style to Nautical, thus showing all nautical navigation marks and chart symbols.</string>
 	<string name="plugin_nautical_descr2">A map file containing all nautical symbols globally is availabe as one single download called \'World seamarks\'.</string>
 	<string name="plugin_nautical_descr3">This view can be reverted by either de-activating it again here, or by changing the \'Map style\' under \'Configure map\' as desired.</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 147ea3111d..6323fa1279 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -27,6 +27,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
+import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.util.Algorithms;
 import android.app.Activity;
@@ -39,6 +40,7 @@ import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBarActivity;
@@ -109,6 +111,27 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			asyncLoader = new LoadGpxTask();
 			asyncLoader.execute(getActivity());
 		}
+		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
+		View v = getView();
+		if (v == null){
+			return;
+		}
+		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
+
+
+			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
+			((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
+			int startindex = description.indexOf(">");
+			int endindex = description.indexOf("</font>");
+			String distnace = description.substring(startindex + 1, endindex);
+			((TextView)v.findViewById(R.id.distance)).setText(distnace);
+			v.findViewById(R.id.time_icon).setVisibility(View.GONE);
+		} else {
+			v.findViewById(R.id.current_track).setVisibility(View.GONE);
+		}
+		//TODO implement updating view of current track
 	}
 
 	@Override
@@ -120,6 +143,16 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	}
 
 
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.available_gpx, container, false);
+		listView =(ExpandableListView) v.findViewById(android.R.id.list);
+		if(this.adapter != null) {
+			listView.setAdapter(this.adapter);
+		}
+		return v;
+	}
+
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu.clear();
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
index b286e16955..459ef0429c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListFragment.java
@@ -21,8 +21,8 @@ public abstract class OsmandExpandableListFragment extends Fragment
 		implements OnChildClickListener {
 	
 	
-	private ExpandableListView listView;
-	private ExpandableListAdapter adapter;
+	protected ExpandableListView listView;
+	protected ExpandableListAdapter adapter;
 
 
 	public OsmandApplication getMyApplication() {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
index f0ee8ab704..d29388e34b 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
@@ -18,6 +18,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -92,6 +93,9 @@ public class DashTrackFragment extends DashBaseFragment {
 					setText(distnace);
 			view.findViewById(R.id.time_icon).setVisibility(View.GONE);
 			//view.findViewById(R.id.distance_icon).setVisibility(View.GONE);
+			view.findViewById(R.id.stop).setVisibility(View.GONE);
+			((ImageButton)view.findViewById(R.id.show_on_map)).
+					setImageDrawable(getResources().getDrawable(R.drawable.ic_action_map));
 			tracks.addView(view);
 		}
 	}

From 1fdc3cb31c7bc7fc6f68f99c4d3563a04eb31acc Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 23 Feb 2015 16:51:24 +0200
Subject: [PATCH 02/45] Updated search history view

---
 ...it_dialog.xml => favorite_edit_dialog.xml} |  0
 ..._list_item.xml => favorites_list_item.xml} |  0
 OsmAnd/res/layout/local_index_list_item.xml   |  3 +-
 .../res/layout/search_history_list_item.xml   | 70 ++++++++++++++-----
 .../activities/FavoritesListFragment.java     |  5 +-
 .../activities/FavoritesTreeFragment.java     |  4 +-
 .../search/SearchHistoryFragment.java         | 37 +++++-----
 .../osmand/plus/dialogs/FavoriteDialogs.java  |  2 +-
 8 files changed, 81 insertions(+), 40 deletions(-)
 rename OsmAnd/res/layout/{favourite_edit_dialog.xml => favorite_edit_dialog.xml} (100%)
 rename OsmAnd/res/layout/{favourites_list_item.xml => favorites_list_item.xml} (100%)

diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favorite_edit_dialog.xml
similarity index 100%
rename from OsmAnd/res/layout/favourite_edit_dialog.xml
rename to OsmAnd/res/layout/favorite_edit_dialog.xml
diff --git a/OsmAnd/res/layout/favourites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
similarity index 100%
rename from OsmAnd/res/layout/favourites_list_item.xml
rename to OsmAnd/res/layout/favorites_list_item.xml
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 3a922e413d..3627ec48ce 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -15,8 +15,7 @@
 		android:focusable="false"
 		android:visibility="gone"
 		android:layout_marginRight="@dimen/local_index_check_right_margin"
-		android:layout_marginTop="@dimen/favorites_icon_top_margin"
-/>
+		android:layout_marginTop="@dimen/favorites_icon_top_margin"/>
 
 	<ImageView
 		android:id="@+id/icon"
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 75effe3d8d..8193e02817 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -10,28 +10,66 @@
 			  android:paddingRight="@dimen/list_content_padding"
 			  android:paddingTop="5dp">
 
-	<TextView
-		android:id="@+id/label"
-		style="@style/ListText"
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginRight="@dimen/favorites_icon_right_margin"
+		android:layout_marginTop="@dimen/favorites_icon_top_margin"
+		android:focusable="false"
+		android:src="@drawable/ic_sdcard"/>
+
+
+	<LinearLayout
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:layout_marginRight="3dp"
 		android:layout_weight="1"
-		android:ellipsize="end"
-		android:maxLines="1"
-		android:textColor="?android:textColorPrimary"
-		tools:text="@string/lorem_ipsum"/>
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/dashFavNameTextSize"
+			tools:text="@string/lorem_ipsum"/>
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:id="@+id/direction"
+				android:layout_width="@dimen/dashFavDirectionSize"
+				android:layout_height="@dimen/dashFavDirectionSize"
+				android:layout_gravity="center_vertical"
+				android:visibility="gone"/>
+
+			<TextView
+				android:id="@+id/distance"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="2dp"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="@dimen/showAllButtonTextSize"
+				tools:text="100500 km"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
 
 	<ImageButton
-		android:id="@+id/remove"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:id="@+id/options"
+		android:layout_width="@dimen/list_item_height"
+		android:layout_height="@dimen/list_item_height"
 		android:layout_gravity="center_vertical"
-		android:background="?attr/reset_image"
-		android:contentDescription="@string/default_buttons_delete"
-		android:paddingLeft="2dp"
-		android:paddingRight="2dp"
-		android:paddingTop="2dp"/>
+		android:background="?attr/options_button_background"
+		android:focusable="false"
+		android:src="?attr/list_settings_icon"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
index 1a6f9d5455..4dc224cf09 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
@@ -21,7 +21,6 @@ import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.dialogs.DirectionsDialogs;
-import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 import android.app.Activity;
 import android.content.Intent;
@@ -156,7 +155,7 @@ public class FavoritesListFragment extends ListFragment implements SearchActivit
 		}
 
 		public FavouritesAdapter(Activity activity, List<FavouritePoint> list) {
-			super(activity, R.layout.favourites_list_item, list);
+			super(activity, R.layout.favorites_list_item, list);
 			this.activity = activity;
 			this.app = ((OsmandApplication) activity.getApplication());
 			boolean light = app.getSettings().isLightContent();
@@ -178,7 +177,7 @@ public class FavoritesListFragment extends ListFragment implements SearchActivit
 			View row = convertView;
 			if (row == null) {
 				LayoutInflater inflater = activity.getLayoutInflater();
-				row = inflater.inflate(R.layout.favourites_list_item, parent, false);
+				row = inflater.inflate(R.layout.favorites_list_item, parent, false);
 			}
 
 			TextView name = (TextView) row.findViewById(R.id.favourite_label);
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index a402a31877..2bdf7f5ed1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -204,7 +204,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	private boolean editPoint(final FavouritePoint point) {
 		Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setTitle(R.string.favourites_context_menu_edit);
-		final View v = getActivity().getLayoutInflater().inflate(R.layout.favourite_edit_dialog,
+		final View v = getActivity().getLayoutInflater().inflate(R.layout.favorite_edit_dialog,
 				getExpandableListView(), false);
 		final AutoCompleteTextView cat = (AutoCompleteTextView) v.findViewById(R.id.Category);
 		final EditText editText = (EditText) v.findViewById(R.id.Name);
@@ -762,7 +762,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			View row = convertView;
 			if (row == null) {
 				LayoutInflater inflater = getActivity().getLayoutInflater();
-				row = inflater.inflate(R.layout.favourites_list_item, parent, false);
+				row = inflater.inflate(R.layout.favorites_list_item, parent, false);
 			}
 
 			TextView name = (TextView) row.findViewById(R.id.favourite_label);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index cbb412638f..47ce21c7e3 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -10,11 +10,16 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
+import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
 import net.osmand.util.MapUtils;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.ListFragment;
@@ -24,6 +29,7 @@ import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -95,7 +101,9 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 			location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation();
 		}
 		historyAdapter.clear();
-		historyAdapter.addAll(helper.getHistoryEntries());
+		for(HistoryEntry entry : helper.getHistoryEntries()){
+			historyAdapter.add(entry);
+		}
 		locationUpdate(location);
 		clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE);
 		
@@ -144,33 +152,26 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 				LayoutInflater inflater = getActivity().getLayoutInflater();
 				row = inflater.inflate(R.layout.search_history_list_item, parent, false);
 			}
-			TextView label = (TextView) row.findViewById(R.id.label);
+			TextView nameText = (TextView) row.findViewById(R.id.name);
+			TextView distanceText = (TextView) row.findViewById(R.id.distance);
 			String distance = "";
-			ImageButton icon = (ImageButton) row.findViewById(R.id.remove);
+			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			final HistoryEntry model = getItem(position);
 			if (location != null) {
 				int dist = (int) (MapUtils.getDistance(location, model.getLat(), model.getLon()));
 				distance = OsmAndFormatter.getFormattedDistance(dist, (OsmandApplication) getActivity().getApplication()) + "  ";
 			}
-			String rnk = MessageFormat.format(" {0,number,#.##E00} ", ((float)model.getRank(System.currentTimeMillis())));
-			label.setText(distance + rnk  + model.getName().getName(), BufferType.SPANNABLE);
-			((Spannable) label.getText()).setSpan(new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length(), 0);
-			icon.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					helper.remove(model);
-					historyAdapter.remove(model);
-				}
+			distanceText.setText(distance);
+			nameText.setText(model.getName().getName(), BufferType.SPANNABLE);
 
-			});
-			View.OnClickListener clickListener = new View.OnClickListener() {
+			options.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
 					selectModel(model, v);
 				}
-			};
 
-			label.setOnClickListener(clickListener);
+			});
+
 			return row;
 		}
 	}
@@ -181,4 +182,8 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 			 ((SearchActivity) getActivity()).getClearToolbar(false);
 		}
 	}
+
+	public OsmandApplication getMyApplication() {
+		return (OsmandApplication) getActivity().getApplication();
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
index 14bf014246..146c93d0d5 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
@@ -175,7 +175,7 @@ public class FavoriteDialogs {
 	public  static Dialog createAddFavouriteDialog(final Activity activity, final Bundle args) {
     	Builder builder = new AlertDialog.Builder(activity);
 		builder.setTitle(R.string.favourites_context_menu_edit);
-		final View v = activity.getLayoutInflater().inflate(R.layout.favourite_edit_dialog, null, false);
+		final View v = activity.getLayoutInflater().inflate(R.layout.favorite_edit_dialog, null, false);
 		final FavouritesDbHelper helper = ((OsmandApplication) activity.getApplication()).getFavorites();
 		builder.setView(v);
 		final EditText editText =  (EditText) v.findViewById(R.id.Name);

From a4369d6f0428632b0f90703120c133592d6af16a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 23 Feb 2015 18:46:38 +0200
Subject: [PATCH 03/45] Updated search history view

---
 OsmAnd/res/layout/search_history_list_item.xml    |  4 +---
 .../activities/search/SearchHistoryFragment.java  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 8193e02817..126f2e1865 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -7,7 +7,6 @@
 			  android:orientation="horizontal"
 			  android:paddingBottom="5dp"
 			  android:paddingLeft="@dimen/list_content_padding"
-			  android:paddingRight="@dimen/list_content_padding"
 			  android:paddingTop="5dp">
 
 	<ImageView
@@ -46,8 +45,7 @@
 				android:id="@+id/direction"
 				android:layout_width="@dimen/dashFavDirectionSize"
 				android:layout_height="@dimen/dashFavDirectionSize"
-				android:layout_gravity="center_vertical"
-				android:visibility="gone"/>
+				android:layout_gravity="center_vertical"/>
 
 			<TextView
 				android:id="@+id/distance"
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index 47ce21c7e3..27d9df3b9c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -19,6 +19,9 @@ import net.osmand.util.MapUtils;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.media.Image;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
@@ -35,6 +38,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
@@ -135,6 +139,7 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 
 	class HistoryAdapter extends ArrayAdapter<HistoryEntry> {
 		private LatLon location;
+		Drawable arrowImage;
 
 		public void updateLocation(LatLon l) {
 			location = l;
@@ -143,6 +148,14 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 
 		public HistoryAdapter(List<HistoryEntry> list) {
 			super(getActivity(), R.layout.search_history_list_item, list);
+			arrowImage = getResources().getDrawable(R.drawable.ic_destination_arrow_white);
+			arrowImage.mutate();
+			boolean light = getMyApplication().getSettings().isLightContent();
+			if (light) {
+				arrowImage.setColorFilter(getResources().getColor(R.color.color_distance), PorterDuff.Mode.MULTIPLY);
+			} else {
+				arrowImage.setColorFilter(getResources().getColor(R.color.color_distance), PorterDuff.Mode.MULTIPLY);
+			}
 		}
 
 		@Override
@@ -155,6 +168,8 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 			TextView nameText = (TextView) row.findViewById(R.id.name);
 			TextView distanceText = (TextView) row.findViewById(R.id.distance);
 			String distance = "";
+			ImageView arrow = (ImageView) row.findViewById(R.id.direction);
+			arrow.setImageDrawable(arrowImage);
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			final HistoryEntry model = getItem(position);
 			if (location != null) {

From 80be3b8b1c66e134d4fece0278e89ccc7e4202fc Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Tue, 24 Feb 2015 14:58:03 +0200
Subject: [PATCH 04/45] Added renaming for audio video notes

---
 .../layout/dash_audio_video_notes_item.xml    | 69 -------------------
 OsmAnd/res/layout/note.xml                    |  9 +++
 OsmAnd/res/values/strings.xml                 |  1 +
 .../audionotes/AudioVideoNotesPlugin.java     | 31 ++++++---
 .../DashAudioVideoNotesFragment.java          | 38 +++++-----
 .../osmand/plus/audionotes/NotesFragment.java | 45 +++++-------
 6 files changed, 73 insertions(+), 120 deletions(-)
 delete mode 100644 OsmAnd/res/layout/dash_audio_video_notes_item.xml

diff --git a/OsmAnd/res/layout/dash_audio_video_notes_item.xml b/OsmAnd/res/layout/dash_audio_video_notes_item.xml
deleted file mode 100644
index ff426d59f7..0000000000
--- a/OsmAnd/res/layout/dash_audio_video_notes_item.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="@dimen/dashListItemHeight"
-	android:orientation="vertical">
-
-	<View
-		android:id="@+id/divider"
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:background="?attr/dashboard_divider"/>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="@dimen/dashNoteIconSize"
-			android:layout_height="@dimen/dashNoteIconSize"
-			android:layout_gravity="center_vertical"
-			android:layout_marginLeft="@dimen/dashFavIconMargin"
-			android:layout_marginRight="@dimen/dashFavIconMargin"
-			tools:src="@drawable/ic_type_audio" />
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:orientation="vertical">
-
-			<TextView
-				android:id="@+id/name"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:lines="1"
-				android:textColor="?android:textColorPrimary"
-				android:textSize="@dimen/dashFavNameTextSize"
-				tools:text="@string/lorem_ipsum" />
-
-			<TextView
-				android:id="@+id/descr"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:lines="1"
-				android:textSize="@dimen/showAllButtonTextSize"
-				android:textColor="?android:textColorSecondary"
-				tools:text="@string/lorem_ipsum" />
-
-		</LinearLayout>
-
-		<ImageButton
-			android:id="@+id/play"
-			android:layout_width="@dimen/dashListItemHeight"
-			android:layout_height="@dimen/dashListItemHeight"
-			android:layout_gravity="center_vertical"
-			android:layout_marginLeft="@dimen/dashFavIconMargin"
-			android:background="?attr/dashboard_button"
-			android:src="@drawable/ic_play_light"/>
-	</LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml
index 4879876f82..c98c4fe83c 100644
--- a/OsmAnd/res/layout/note.xml
+++ b/OsmAnd/res/layout/note.xml
@@ -64,4 +64,13 @@
 		android:focusable="false"
 		android:src="?attr/list_settings_icon"/>
 
+	<ImageButton
+		android:id="@+id/play"
+		android:layout_width="@dimen/dashListItemHeight"
+		android:layout_height="@dimen/dashListItemHeight"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="@dimen/dashFavIconMargin"
+		android:background="?attr/dashboard_button"
+		android:src="@drawable/ic_play_light"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1938a185a4..92113f53e9 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="rename_failed">Rename failed.</string>
 	<string name="days_behind">days behind</string>
 	<string name="currently_recording_track">Currently recording track</string>
 	<string name="back_to_map">Back to map</string>
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 7693ec5411..ce6f940b60 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -67,6 +67,7 @@ import android.media.MediaRecorder;
 import android.media.SoundPool;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Environment;
 import android.provider.MediaStore;
 import android.view.Display;
 import android.view.KeyEvent;
@@ -138,9 +139,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			this.file = f;
 		}
 
-		public File file;
+		private File file;
 
-		private String name;
 		private double lat;
 		private double lon;
 		private long duration = -1;
@@ -172,12 +172,26 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			}
 		}
 
-		public void setName(String name) {
-			this.name = name;
+		public File getFile() {
+			return file;
+		}
+
+		public boolean setName(String name) {
+			int index = file.getAbsolutePath().lastIndexOf("/") + 1;
+			if (index < 0){
+				return false;
+			}
+			File directory = new File(file.getAbsolutePath().substring(0, index));
+			File to        = new File(directory, name.trim());
+			if (file.renameTo(to)){
+				file = to;
+				return true;
+			}
+			return false;
 		}
 
 		public String getName() {
-			return name;
+			return file.getName();
 		}
 
 		public boolean isPhoto() {
@@ -289,13 +303,12 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		}
 
 		public String getSmallDescription(Context ctx) {
-			String nm = name == null ? "" : name;
-			
+
 			String time = AndroidUtils.formatDateTime(ctx,file.lastModified());
 			if (isPhoto()) {
-				return ctx.getString(R.string.recording_photo_description, nm, time).trim();
+				return ctx.getString(R.string.recording_photo_description, "", time).trim();
 			}
-			return ctx.getString(R.string.recording_description, nm, "", time).trim();
+			return ctx.getString(R.string.recording_description, "", "", time).trim();
 		}
 
 		private String getDuration(Context ctx) {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
index 7d1e50de06..109d42cdee 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
@@ -94,15 +94,22 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 
 		for (final AudioVideoNotesPlugin.Recording recording : notes){
 			LayoutInflater inflater = getActivity().getLayoutInflater();
-			View view = inflater.inflate(R.layout.dash_audio_video_notes_item, null, false);
+			View view = inflater.inflate(R.layout.note, null, false);
 
 			getNoteView(recording, view, getActivity(), plugin);
+			view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					plugin.playRecording(getActivity(), recording);
+				}
+			});
+			view.findViewById(R.id.options).setVisibility(View.GONE);
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
 					getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, 
 							new PointDescription(PointDescription.POINT_TYPE_NOTE, 
-							!Algorithms.isEmpty(recording.getName())? recording.getName() : recording.getDescription(getActivity())), true,
+							(recording.getName() != null) ? recording.getName() : recording.getDescription(getActivity())), true,
 							recording); //$NON-NLS-1$
 					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}
@@ -113,29 +120,28 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 
 	public static void getNoteView(final AudioVideoNotesPlugin.Recording recording, View view,
 								   final Context ctx, final AudioVideoNotesPlugin plugin) {
-		if (recording.getName() != null){
-			((TextView) view.findViewById(R.id.name)).setText(recording.getName());
-			((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(ctx));
-		} else {
-			((TextView) view.findViewById(R.id.name)).setText(recording.getDescription(ctx));
-			view.findViewById(R.id.descr).setVisibility(View.GONE);
+		String name = recording.getName();
+		TextView nameText = ((TextView) view.findViewById(R.id.name));
+		if (name != null) {
+			nameText.setText(name);
+		} else if (recording.isAudio()) {
+			nameText.setText(R.string.audio);
+		} else if (recording.isVideo()) {
+			nameText.setText(R.string.video);
+		} else if (recording.isPhoto()) {
+			nameText.setText(R.string.photo);
 		}
+		((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(ctx));
 
 		ImageView icon = (ImageView) view.findViewById(R.id.icon);
-		if (recording.isAudio()){
+		if (recording.isAudio()) {
 			icon.setImageResource(R.drawable.ic_type_audio);
-		} else if (recording.isVideo()){
+		} else if (recording.isVideo()) {
 			icon.setImageResource(R.drawable.ic_type_video);
 		} else {
 			icon.setImageResource(R.drawable.ic_type_img);
 		}
 
-		view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				plugin.playRecording(ctx, recording);
-			}
-		});
 	}
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index bf5271c561..6a083907f3 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -28,6 +28,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import android.support.v4.app.ListFragment;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -89,27 +90,8 @@ public class NotesFragment extends ListFragment {
 			}
 
 			final AudioVideoNotesPlugin.Recording recording = getItem(position);
-			String name = recording.getName();
-			TextView nameText = ((TextView) row.findViewById(R.id.name));
-			if (name != null) {
-				nameText.setText(name);
-			} else if (recording.isAudio()) {
-				nameText.setText(R.string.audio);
-			} else if (recording.isVideo()) {
-				nameText.setText(R.string.video);
-			} else if (recording.isPhoto()) {
-				nameText.setText(R.string.photo);
-			}
-			((TextView) row.findViewById(R.id.descr)).setText(recording.getDescription(getActivity()));
-
-			ImageView icon = (ImageView) row.findViewById(R.id.icon);
-			if (recording.isAudio()) {
-				icon.setImageResource(R.drawable.ic_type_audio);
-			} else if (recording.isVideo()) {
-				icon.setImageResource(R.drawable.ic_type_video);
-			} else {
-				icon.setImageResource(R.drawable.ic_type_img);
-			}
+			DashAudioVideoNotesFragment.getNoteView(recording, row, getActivity(), plugin);
+			row.findViewById(R.id.play).setVisibility(View.GONE);
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			options.setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -173,15 +155,15 @@ public class NotesFragment extends ListFragment {
 			public boolean onMenuItemClick(MenuItem item) {
 				Intent sharingIntent = new Intent(Intent.ACTION_SEND);
 				if (recording.isPhoto()) {
-					Uri screenshotUri = Uri.parse(recording.file.getAbsolutePath());
+					Uri screenshotUri = Uri.parse(recording.getFile().getAbsolutePath());
 					sharingIntent.setType("image/*");
 					sharingIntent.putExtra(Intent.EXTRA_STREAM, screenshotUri);
 				} else if (recording.isAudio()) {
-					Uri audioUri = Uri.parse(recording.file.getAbsolutePath());
+					Uri audioUri = Uri.parse(recording.getFile().getAbsolutePath());
 					sharingIntent.setType("audio/*");
 					sharingIntent.putExtra(Intent.EXTRA_STREAM, audioUri);
 				} else if (recording.isVideo()) {
-					Uri videoUri = Uri.parse(recording.file.getAbsolutePath());
+					Uri videoUri = Uri.parse(recording.getFile().getAbsolutePath());
 					sharingIntent.setType("video/*");
 					sharingIntent.putExtra(Intent.EXTRA_STREAM, videoUri);
 				}
@@ -229,12 +211,23 @@ public class NotesFragment extends ListFragment {
 				getListView(), false);
 		final EditText editText = (EditText) v.findViewById(R.id.name);
 		builder.setView(v);
-		editText.setText(recording.getName());
+		String fileName = recording.getName();
+		int extInd = recording.getName().lastIndexOf(".");
+		final String extension;
+		if (extInd >= 0){
+			extension = fileName.substring(extInd, fileName.length());
+		} else {
+			extension = "";
+		}
+
+		editText.setText(recording.getName().substring(0, extInd));
 		builder.setNegativeButton(R.string.default_buttons_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				recording.setName(editText.getText().toString());
+				if(!recording.setName(editText.getText().toString() + extension)) {
+					Toast.makeText(getActivity(),R.string.rename_failed,Toast.LENGTH_SHORT).show();
+				}
 				recording.setDescription();
 				listAdapter.notifyDataSetInvalidated();
 			}

From 9dda58934ce48288fbe3eaf29dfb03d4253b6e6b Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Tue, 24 Feb 2015 18:53:17 +0200
Subject: [PATCH 05/45] Updated tracks card on dashboard. Added current track
 for tracks in my places.

---
 OsmAnd/res/layout/available_gpx.xml           |  38 +++--
 OsmAnd/res/layout/dash_favorites_item.xml     |   2 +-
 OsmAnd/res/layout/dash_gpx_track_item.xml     | 152 +++++++++++-------
 OsmAnd/res/layout/dash_map_fragment.xml       |   2 +-
 OsmAnd/res/layout/favorites_list_item.xml     |   2 +-
 OsmAnd/res/layout/note.xml                    | 121 +++++++-------
 OsmAnd/res/values/colors.xml                  |   4 +-
 .../ActionBarPreferenceActivity.java          |   1 +
 .../plus/activities/AvailableGPXFragment.java |  92 ++++++-----
 .../plus/activities/FavoritesActivity.java    |  18 ++-
 .../audionotes/AudioVideoNotesPlugin.java     |   2 +-
 .../DashAudioVideoNotesFragment.java          |   2 +
 .../plus/dashboard/DashFavoritesFragment.java |   2 +
 .../plus/monitoring/DashTrackFragment.java    |  67 ++++++--
 14 files changed, 316 insertions(+), 189 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index d45911e47b..0bb085b1fc 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -1,24 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
 			  android:layout_width="match_parent"
-			  android:layout_height="match_parent">
+			  android:layout_height="match_parent"
+			  android:orientation="vertical">
 
-	<LinearLayout android:id="@+id/current_track"
-				  android:orientation="vertical"
+	<LinearLayout
+		android:id="@+id/current_track"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:background="?attr/card_bg"
+		android:orientation="vertical">
 
-		<include android:layout_height="wrap_content"
-				 android:layout_width="match_parent"
-				 layout="@layout/dash_gpx_track_item"/>
+		<include
+			layout="@layout/dash_gpx_track_item"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
 
-		<Button android:id="@+id/map_btn"
-				android:text="@string/back_to_map"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"/>
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="?attr/dashboard_divider"/>
 
-		</LinearLayout>
+		<Button
+			android:id="@+id/map_btn"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="?attr/expandable_list_item_background"
+			android:text="@string/back_to_map"/>
+
+	</LinearLayout>
 
 
 	<ExpandableListView
@@ -26,11 +36,11 @@
 		style="@style/OsmandListView"
 		android:layout_width="fill_parent"
 		android:layout_height="0dp"
-		android:background="?attr/expandable_list_background"
 		android:layout_marginLeft="0dp"
 		android:layout_marginRight="0dp"
 		android:layout_marginTop="0dp"
 		android:layout_weight="1"
+		android:background="?attr/expandable_list_background"
 		android:groupIndicator="@android:color/transparent"/>
 
 
diff --git a/OsmAnd/res/layout/dash_favorites_item.xml b/OsmAnd/res/layout/dash_favorites_item.xml
index 20eacc6ec6..62c9076754 100644
--- a/OsmAnd/res/layout/dash_favorites_item.xml
+++ b/OsmAnd/res/layout/dash_favorites_item.xml
@@ -77,7 +77,7 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical"
 					android:layout_marginLeft="4dp"
-					android:textColor="@color/dashboard_descr_colol"
+					android:textColor="@color/icon_color_light"
 					android:textSize="@dimen/showAllButtonTextSize"/>
 			</LinearLayout>
 
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index 1adc373af9..9ac98dd620 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -1,73 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
+			  xmlns:tools="http://schemas.android.com/tools"
 			  android:layout_width="match_parent"
-			  android:layout_height="@dimen/dashListItemHeight">
-	<View android:layout_width="match_parent"
-		  android:background="?attr/dashboard_divider"
-		  android:layout_height="1dp"/>
-	<LinearLayout android:orientation="horizontal"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
-		<LinearLayout android:orientation="vertical"
-					  android:layout_width="0dp"
-					  android:layout_weight="1"
-					  android:layout_gravity="center_vertical"
-					  android:layout_marginLeft="@dimen/subHeaderMarginLeft"
-					  android:layout_marginRight="@dimen/showAllButtonMarginRight"
-					  android:layout_height="wrap_content">
-			<TextView android:id="@+id/name"
-					  android:textColor="?android:textColorPrimary"
-					  android:layout_width="wrap_content"
-					  android:layout_height="wrap_content"/>
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="match_parent"
-						  android:layout_height="wrap_content">
-				<ImageView android:id="@+id/points_icon"
-						   android:src="@drawable/ic_small_point"
-						   android:layout_gravity="center_vertical"
-						   android:layout_width="wrap_content"
-						   android:layout_height="wrap_content"/>
-				<TextView android:id="@+id/points_count"
-						  android:textColor="@color/dashboard_descr_colol"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
+			  android:layout_height="wrap_content"
+			  android:minHeight="@dimen/dashListItemHeight"
+			  android:orientation="vertical">
 
-				<ImageView android:id="@+id/distance_icon"
-						   android:src="@drawable/ic_small_distance"
-						   android:layout_marginLeft="@dimen/dashPluginMargin"
-						   android:layout_gravity="center_vertical"
-						   android:layout_width="wrap_content"
-						   android:layout_height="wrap_content"/>
-				<TextView android:id="@+id/distance"
-						  android:textColor="@color/dashboard_descr_colol"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
+	<View
+		android:id="@+id/divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider"/>
 
-				<ImageView android:id="@+id/time_icon"
-						   android:src="@drawable/ic_small_time"
-						   android:layout_gravity="center_vertical"
-						   android:layout_width="wrap_content"
-						   android:layout_height="wrap_content"/>
-				<TextView android:id="@+id/time"
-						  android:textColor="@color/dashboard_descr_colol"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/subHeaderMarginLeft"
+			android:layout_marginRight="@dimen/showAllButtonMarginRight"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textColor="?android:textColorPrimary"
+				tools:text="@string/validate_gpx_upload_name_pwd"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:id="@+id/points_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:src="@drawable/ic_small_point"/>
+
+				<TextView
+					android:id="@+id/points_count"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/icon_color_light"/>
+
+				<ImageView
+					android:id="@+id/distance_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:layout_marginLeft="@dimen/dashPluginMargin"
+					android:src="@drawable/ic_small_distance"/>
+
+				<TextView
+					android:id="@+id/distance"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/icon_color_light"/>
+
+				<ImageView
+					android:id="@+id/time_icon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:src="@drawable/ic_small_time"/>
+
+				<TextView
+					android:id="@+id/time"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/icon_color_light"/>
 			</LinearLayout>
 		</LinearLayout>
 
-		<ImageButton android:id="@+id/stop"
-				   android:visibility="gone"
-				   android:layout_gravity="center_vertical"
-				   android:background="?attr/dashboard_button"
-				   android:layout_width="wrap_content"
-				   android:layout_height="wrap_content"/>
+		<ImageButton
+			android:id="@+id/stop"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:layout_marginRight="@dimen/favorites_icon_right_margin"
+			android:background="?attr/options_button_background"
+			android:src="@drawable/ic_action_rec_stop"
+			android:visibility="gone"
+			tools:visibility="visible"/>
 
-		<ImageButton android:id="@+id/show_on_map"
-				   android:layout_gravity="center_vertical"
-				   android:background="?attr/dashboard_button"
-				   android:layout_width="@dimen/dashListItemHeight"
-				   android:layout_height="@dimen/dashListItemHeight"/>
+		<ImageButton
+			android:id="@+id/show_on_map"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:background="?attr/options_button_background"
+			android:src="@drawable/ic_action_gsave_dark"/>
 	</LinearLayout>
 
 
diff --git a/OsmAnd/res/layout/dash_map_fragment.xml b/OsmAnd/res/layout/dash_map_fragment.xml
index a8d0e524de..4f10bd82da 100644
--- a/OsmAnd/res/layout/dash_map_fragment.xml
+++ b/OsmAnd/res/layout/dash_map_fragment.xml
@@ -22,7 +22,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:maxLines="3"
-					android:textColor="@color/dashboard_descr_colol"
+					android:textColor="@color/icon_color_light"
 					android:text="@string/loading_data"
 					android:textSize="@dimen/dashProgressTextSize"/>
 		</LinearLayout>
diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
index 609391c1ae..69537c2b8a 100644
--- a/OsmAnd/res/layout/favorites_list_item.xml
+++ b/OsmAnd/res/layout/favorites_list_item.xml
@@ -84,7 +84,7 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical"
 					android:layout_marginLeft="4dp"
-					android:textColor="@color/dashboard_descr_colol"
+					android:textColor="@color/icon_color_light"
 					android:textSize="@dimen/showAllButtonTextSize"/>
 			</LinearLayout>
 
diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml
index c98c4fe83c..5898e02b07 100644
--- a/OsmAnd/res/layout/note.xml
+++ b/OsmAnd/res/layout/note.xml
@@ -5,72 +5,85 @@
 			  android:layout_height="wrap_content"
 			  android:background="?attr/expandable_list_item_background"
 			  android:minHeight="@dimen/list_item_height"
-			  android:orientation="horizontal"
+			  android:orientation="vertical"
 			  android:paddingLeft="@dimen/list_content_padding">
 
-	<CheckBox
-		android:id="@+id/check_local_index"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_marginRight="@dimen/local_index_check_right_margin"
-		android:focusable="false"
-		android:visibility="gone"/>
-
-	<ImageView
-		android:id="@+id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_marginRight="@dimen/favorites_icon_right_margin"
-		android:focusable="false"
-		android:src="@drawable/ic_sdcard"/>
+	<View
+		android:id="@+id/divider"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:visibility="gone"
+		android:background="?attr/dashboard_divider"/>
 
 	<LinearLayout
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:layout_weight="1"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/name"
-			style="@style/ListText.Small"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+		<CheckBox
+			android:id="@+id/check_local_index"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:maxLines="1"
-			android:ellipsize="end"
-			tools:text="@string/app_version"/>
+			android:layout_gravity="center_vertical"
+			android:layout_marginRight="@dimen/local_index_check_right_margin"
+			android:focusable="false"
+			android:visibility="gone"/>
 
-
-		<TextView
-			android:id="@+id/descr"
+		<ImageView
+			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:textSize="@dimen/download_descr_text_size"
-			android:maxLines="25"
-			tools:text="@string/app_mode_aircraft"/>
+			android:layout_gravity="center_vertical"
+			android:layout_marginRight="@dimen/favorites_icon_right_margin"
+			android:focusable="false"
+			android:src="@drawable/ic_sdcard"/>
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/name"
+				style="@style/ListText.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:maxLines="1"
+				android:ellipsize="end"
+				tools:text="@string/app_version"/>
 
 
-	</LinearLayout>
+			<TextView
+				android:id="@+id/descr"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical"
+				android:textSize="@dimen/download_descr_text_size"
+				android:maxLines="25"
+				tools:text="@string/app_mode_aircraft"/>
+
+
+		</LinearLayout>
+
+		<ImageButton
+			android:id="@+id/options"
+			android:layout_width="@dimen/list_item_height"
+			android:layout_height="@dimen/list_item_height"
+			android:layout_gravity="center_vertical"
+			android:background="?attr/options_button_background"
+			android:focusable="false"
+			android:src="?attr/list_settings_icon"/>
+
+		<ImageButton
+			android:id="@+id/play"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/dashFavIconMargin"
+			android:background="?attr/dashboard_button"
+			android:src="@drawable/ic_play_light"/>
+		</LinearLayout>
 
-	<ImageButton
-		android:id="@+id/options"
-		android:layout_width="@dimen/list_item_height"
-		android:layout_height="@dimen/list_item_height"
-		android:layout_gravity="center_vertical"
-		android:background="?attr/options_button_background"
-		android:focusable="false"
-		android:src="?attr/list_settings_icon"/>
 
-	<ImageButton
-		android:id="@+id/play"
-		android:layout_width="@dimen/dashListItemHeight"
-		android:layout_height="@dimen/dashListItemHeight"
-		android:layout_gravity="center_vertical"
-		android:layout_marginLeft="@dimen/dashFavIconMargin"
-		android:background="?attr/dashboard_button"
-		android:src="@drawable/ic_play_light"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 26c1b12534..0136008297 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -20,7 +20,9 @@
     <color name="search_background_dark">#292f33</color>
 
 
-	<color name="dashboard_descr_colol">#727272</color>
+	<color name="icon_color_light">#727272</color>
+
+	<color name="dashboard_gpx_on_map">#448AFF</color>
 	<color name="dashboard_background">#eaeaea</color>
 	<color name="dashboard_divider_light">#F0F0F0</color>
 	<color name="dashboard_divider_dark">#3d474c</color>
diff --git a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
index 0eb1a2eced..e9f0ca4b8a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ActionBarPreferenceActivity.java
@@ -48,6 +48,7 @@ public abstract class ActionBarPreferenceActivity extends PreferenceActivity {
 		}
 		tb.setClickable(true);
 		Drawable back = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+		back.mutate();
 		back.setColorFilter(0xffffffff, PorterDuff.Mode.MULTIPLY);
 		tb.setNavigationIcon(back);
 		tb.setBackgroundColor(getResources().getColor(getResIdFromAttribute(this, R.attr.pstsTabBackground)));
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 6323fa1279..11092c71b2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -37,7 +37,9 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
+import android.graphics.PorterDuff;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -111,27 +113,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			asyncLoader = new LoadGpxTask();
 			asyncLoader.execute(getActivity());
 		}
-		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
-		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
-		View v = getView();
-		if (v == null){
-			return;
-		}
-		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
 
+		updateCurrentTrack(getView());
 
-			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
-			((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
-			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
-			int startindex = description.indexOf(">");
-			int endindex = description.indexOf("</font>");
-			String distnace = description.substring(startindex + 1, endindex);
-			((TextView)v.findViewById(R.id.distance)).setText(distnace);
-			v.findViewById(R.id.time_icon).setVisibility(View.GONE);
-		} else {
-			v.findViewById(R.id.current_track).setVisibility(View.GONE);
-		}
-		//TODO implement updating view of current track
 	}
 
 	@Override
@@ -142,6 +126,24 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
+	private void updateCurrentTrack(View v){
+		if (v == null){
+			return;
+		}
+		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+
+		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
+		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
+			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
+			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
+			int startindex = description.indexOf(">");
+			int endindex = description.indexOf("</font>");
+			String distance = description.substring(startindex + 1, endindex);
+			((TextView)v.findViewById(R.id.distance)).setText(distance);
+		} else {
+			v.findViewById(R.id.current_track).setVisibility(View.GONE);
+		}
+	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -150,6 +152,29 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		if(this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}
+
+		((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+		v.findViewById(R.id.time_icon).setVisibility(View.GONE);
+
+		Drawable icon = getResources().getDrawable(R.drawable.ic_action_rec_stop);
+		icon.mutate();
+		boolean light = getMyApplication().getSettings().isLightContent();
+		if (light){
+			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
+		}
+		ImageButton stop = ((ImageButton)v.findViewById(R.id.stop));
+		stop.setImageDrawable(icon);
+		stop.setVisibility(View.VISIBLE);
+
+		icon = getResources().getDrawable(R.drawable.ic_action_gsave_dark);
+		icon.mutate();
+		if  (light) {
+			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
+		}
+		ImageButton save = ((ImageButton)v.findViewById(R.id.show_on_map));
+		v.findViewById(R.id.divider).setVisibility(View.GONE);
+		save.setImageDrawable(icon);
+		updateCurrentTrack(v);
 		return v;
 	}
 
@@ -225,7 +250,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			}
 		};
 		optionsMenuAdapter.item(R.string.show_gpx_route)
-				.icons(R.drawable.ic_action_map_marker_dark, R.drawable.ic_action_map_marker_dark).listen(listener).reg();
+				.icons(R.drawable.ic_show_on_map, R.drawable.ic_show_on_map).listen(listener).reg();
 		optionsMenuAdapter.item(R.string.local_index_mi_delete)
 				.icons(R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark).listen(listener).reg();
 		optionsMenuAdapter.item(R.string.local_index_mi_reload)
@@ -532,26 +557,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	private void showContextMenu(final GpxInfo info) {
-		Builder builder = new AlertDialog.Builder(getActivity());
-		final ContextMenuAdapter adapter = new ContextMenuAdapter(getActivity());
-		basicFileOperation(info, adapter);
-
-		String[] values = adapter.getItemNames();
-		builder.setItems(values, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				OnContextMenuClick clk = adapter.getClickAdapter(which);
-				if (clk != null) {
-					clk.onContextMenuClick(null, adapter.getElementId(which), which, false);
-				}
-			}
-
-		});
-		builder.show();
-	}
-
-
 	public class LoadGpxTask extends AsyncTask<Activity, GpxInfo, List<GpxInfo>> {
 
 		private List<GpxInfo> result;
@@ -915,8 +920,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		boolean light = getMyApplication().getSettings().isLightContent();
 		final PopupMenu optionsMenu = new PopupMenu(getActivity(), v);
 		DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
+		Drawable showIcon = getResources().getDrawable(R.drawable.ic_show_on_map);
+		if (light) {
+			showIcon.mutate();
+			showIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY);
+		}
 		MenuItem item = optionsMenu.getMenu().add(R.string.show_gpx_route)
-				.setIcon(light ? R.drawable.ic_action_map_marker_light : R.drawable.ic_action_map_marker_dark);
+				.setIcon(showIcon);
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
index db2fe17f19..837d5169d4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesActivity.java
@@ -38,10 +38,12 @@ public class FavoritesActivity extends TabActivity {
 //	private static final String FAVOURITES_INFO = "FAVOURITES_INFO";
 	private static final String TRACKS = "TRACKS";
 //	private static final String SELECTED_TRACK = "SELECTED_TRACK";
-//	public static int FAVORITES_TAB = 0;
-//	public static int GPX_TAB = 1;
-//	public static int SELECTED_GPX_TAB = 2;
-//	public static String TAB_PARAM = "TAB_PARAM";
+	public static int FAVORITES_TAB = 0;
+	public static int GPX_TAB = 1;
+	public static int SELECTED_GPX_TAB = 2;
+	public static int NOTES_TAB = 3;
+	public static int OSM_EDITS_TAB = 4;
+	public static String TAB_PARAM = "TAB_PARAM";
 	protected List<WeakReference<Fragment>> fragList = new ArrayList<WeakReference<Fragment>>();
 
 	@Override
@@ -78,10 +80,18 @@ public class FavoritesActivity extends TabActivity {
 		OsmandPlugin.addMyPlacesTabPlugins(this, mTabs, getIntent());
 		
 		Integer tab = settings.FAVORITES_TAB.get();
+		if (tab == NOTES_TAB) {
+			tab = mTabs.size() -1;
+		} else if (tab == OSM_EDITS_TAB) {
+			//TODO implement method of counting position for other plugins
+		}
 		
 		setViewPagerAdapter(mViewPager, mTabs);
 		mSlidingTabLayout.setViewPager(mViewPager);
 
+		if (tab > mTabs.size() - 1){
+			tab = 0;
+		}
 		mViewPager.setCurrentItem(tab);
 		updateSelectedTracks();
 		// setupHomeButton();
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index ce6f940b60..d2d1abaf01 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -947,7 +947,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		if (getAllRecordings().size() > 0) {
 			mTabs.add(favoritesActivity.getTabIndicator(R.string.notes, NotesFragment.class));
 			if (intent != null && "AUDIO".equals(intent.getStringExtra("TAB"))) {
-				app.getSettings().FAVORITES_TAB.set(mTabs.size() - 1);
+				app.getSettings().FAVORITES_TAB.set(FavoritesActivity.NOTES_TAB);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
index 109d42cdee..47f1381a27 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
@@ -49,6 +49,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 				final Intent favorites = new Intent(activity, fa);
 				favorites.putExtra("TAB", "AUDIO");
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.NOTES_TAB);
 				activity.startActivity(favorites);
 			}
 		});
@@ -104,6 +105,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 				}
 			});
 			view.findViewById(R.id.options).setVisibility(View.GONE);
+			view.findViewById(R.id.divider).setVisibility(View.VISIBLE);
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 63dde7ac8b..557821611b 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -13,6 +13,7 @@ import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.FavoritesActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.dialogs.DirectionsDialogs;
@@ -56,6 +57,7 @@ public class DashFavoritesFragment extends DashLocationFragment implements Favou
 				OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
 				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.FAVORITES_TAB);
 				activity.startActivity(favorites);
 			}
 		});
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
index d29388e34b..223e00f192 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
@@ -4,15 +4,23 @@ import java.io.File;
 import java.util.List;
 
 import net.osmand.IndexConstants;
+import net.osmand.access.AccessibleToast;
 import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.FavoritesActivity;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashBaseFragment;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.helpers.GpxUiHelper;
+
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.PorterDuff;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,6 +29,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 /**
  * Created by Denis
@@ -43,6 +52,7 @@ public class DashTrackFragment extends DashBaseFragment {
 				Activity activity = getActivity();
 				OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
 				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+				getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.GPX_TAB);
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 				activity.startActivity(favorites);
 			}
@@ -62,7 +72,7 @@ public class DashTrackFragment extends DashBaseFragment {
 		final List<String> list = GpxUiHelper.getSortedGPXFilenames(dir);
 
 
-		if (list.size() == 0){
+		if (list.size() == 0) {
 			(mainView.findViewById(R.id.main_fav)).setVisibility(View.GONE);
 			return;
 		} else {
@@ -71,32 +81,69 @@ public class DashTrackFragment extends DashBaseFragment {
 
 		LinearLayout tracks = (LinearLayout) mainView.findViewById(R.id.items);
 		tracks.removeAllViews();
-		if (list.size() > 3){
-			while (list.size() != 3){
+		if (list.size() > 3) {
+			while (list.size() != 3) {
 				list.remove(3);
 			}
 		}
 
-		for (String filename : list){
+		for (String filename : list) {
 			final File f = new File(dir, filename);
-			GPXUtilities.GPXFile res = GPXUtilities.loadGPXFile(getMyApplication(), f);
+			final GPXUtilities.GPXFile res = GPXUtilities.loadGPXFile(getMyApplication(), f);
 			LayoutInflater inflater = getActivity().getLayoutInflater();
 			View view = inflater.inflate(R.layout.dash_gpx_track_item, null, false);
-			((TextView)view.findViewById(R.id.name)).setText(filename);
-			((TextView)view.findViewById(R.id.points_count)).
+			((TextView) view.findViewById(R.id.name)).setText(filename);
+			((TextView) view.findViewById(R.id.points_count)).
 					setText(res.points.size() + " " + getActivity().getString(R.string.points));
 			String description = GpxUiHelper.getDescription(getMyApplication(), res, f, true);
 			int startindex = description.indexOf(">");
 			int endindex = description.indexOf("</font>");
 			String distnace = description.substring(startindex + 1, endindex);
-			((TextView)view.findViewById(R.id.distance)).
+			((TextView) view.findViewById(R.id.distance)).
 					setText(distnace);
 			view.findViewById(R.id.time_icon).setVisibility(View.GONE);
+
+			boolean light = getMyApplication().getSettings().isLightContent();
+			Drawable icon = getResources().getDrawable(R.drawable.ic_show_on_map);
+			GpxSelectionHelper gpxSelectionHelper = getMyApplication().getSelectedGpxHelper();
+			boolean isShowingOnMap = gpxSelectionHelper.getSelectedFileByName(filename) != null;
+			//setting proper icon color
+			if (isShowingOnMap) {
+				icon.mutate();
+				if (light) {
+					icon.setColorFilter(getResources().getColor(R.color.dashboard_gpx_on_map), PorterDuff.Mode.MULTIPLY);
+				} else {
+					icon.setColorFilter(getResources().getColor(R.color.color_distance), PorterDuff.Mode.MULTIPLY);
+				}
+			} else if (light) {
+				icon.mutate();
+				icon.setColorFilter(getResources().getColor(R.color.icon_color_light), PorterDuff.Mode.MULTIPLY);
+
+			}
+			final ImageButton showOnMap = (ImageButton) view.findViewById(R.id.show_on_map);
+			showOnMap.setImageDrawable(icon);
+			showOnMap.setVisibility(View.VISIBLE);
 			//view.findViewById(R.id.distance_icon).setVisibility(View.GONE);
 			view.findViewById(R.id.stop).setVisibility(View.GONE);
-			((ImageButton)view.findViewById(R.id.show_on_map)).
-					setImageDrawable(getResources().getDrawable(R.drawable.ic_action_map));
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					showOnMap(res);
+				}
+			});
 			tracks.addView(view);
 		}
 	}
+
+	private void showOnMap(GPXUtilities.GPXFile file){
+		if (file.isEmpty()) {
+			AccessibleToast.makeText(getActivity(), R.string.gpx_file_is_empty, Toast.LENGTH_LONG).show();
+			return;
+		}
+
+		OsmandSettings settings = getMyApplication().getSettings();
+		settings.setMapLocationToShow(file.getLastPoint().lat, file.getLastPoint().lon, settings.getLastKnownMapZoom());
+		getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(file);
+		MapActivity.launchMapActivityMoveToTop(getActivity());
+	}
 }

From 6734862333f608cedf097f019d2afd8573f2ecfa Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Tue, 24 Feb 2015 21:59:47 +0100
Subject: [PATCH 06/45] Translated using Weblate (Slovak)

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

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 125734e1ed..b872ccd222 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2089,4 +2089,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 
 	<string name="location_on_map">Umiestnenie:\n Šírka %1$s\n Dĺžka %2$s</string>
 	<string name="watch">Zobraziť</string>
+	<string name="days_behind">dní pozadu</string>
 	</resources>

From ae33cac5bdbcde2748a85bee4abb91e1022da6fd Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 25 Feb 2015 13:21:22 +0200
Subject: [PATCH 07/45] Updated current tracks

---
 .../plus/activities/AvailableGPXFragment.java | 117 ++++++++++++------
 .../plus/monitoring/DashTrackFragment.java    |  25 ++++
 .../monitoring/OsmandMonitoringPlugin.java    |  49 +++++---
 3 files changed, 135 insertions(+), 56 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 11092c71b2..baad047575 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -20,6 +20,8 @@ import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper;
+import net.osmand.plus.NavigationService;
+import net.osmand.plus.OsmAndTaskManager;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
@@ -30,6 +32,7 @@ import net.osmand.plus.helpers.ScreenOrientationHelper;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.util.Algorithms;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -73,7 +76,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 
 	public static final int SEARCH_ID = -1;
-//	public static final int ACTION_ID = 0;
+	//	public static final int ACTION_ID = 0;
 //	protected static final int DELETE_ACTION_ID = 1;
 	private boolean selectionMode = false;
 	private List<GpxInfo> selectedItems = new ArrayList<GpxInfo>();
@@ -126,20 +129,21 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	private void updateCurrentTrack(View v){
-		if (v == null){
+	private void updateCurrentTrack(View v) {
+		if (v == null) {
 			return;
 		}
-		OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
 
-		GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
-		if (plugin != null && savingTrackHelper.getCurrentGpx() != null) {
+		if (app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get()) {
+			GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
 			v.findViewById(R.id.current_track).setVisibility(View.VISIBLE);
 			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
 			int startindex = description.indexOf(">");
 			int endindex = description.indexOf("</font>");
 			String distance = description.substring(startindex + 1, endindex);
-			((TextView)v.findViewById(R.id.distance)).setText(distance);
+			String points = String.valueOf(currentTrack.getGpxFile().points.size());
+			((TextView) v.findViewById(R.id.points_count)).setText(points);
+			((TextView) v.findViewById(R.id.distance)).setText(distance);
 		} else {
 			v.findViewById(R.id.current_track).setVisibility(View.GONE);
 		}
@@ -148,34 +152,76 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.available_gpx, container, false);
-		listView =(ExpandableListView) v.findViewById(android.R.id.list);
-		if(this.adapter != null) {
+		listView = (ExpandableListView) v.findViewById(android.R.id.list);
+		if (this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}
 
-		((TextView)v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+		((TextView) v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
 		v.findViewById(R.id.time_icon).setVisibility(View.GONE);
 
-		Drawable icon = getResources().getDrawable(R.drawable.ic_action_rec_stop);
+		createCurrentTrackView(v, getMyApplication());
+
+		v.findViewById(R.id.map_btn).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				MapActivity.launchMapActivityMoveToTop(getActivity());
+			}
+		});
+		return v;
+	}
+
+	public static void createCurrentTrackView(View v, final OsmandApplication app) {
+		Drawable icon = app.getResources().getDrawable(R.drawable.ic_action_rec_stop);
 		icon.mutate();
-		boolean light = getMyApplication().getSettings().isLightContent();
-		if (light){
+		boolean light = app.getSettings().isLightContent();
+		if (light) {
 			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
 		}
-		ImageButton stop = ((ImageButton)v.findViewById(R.id.stop));
+		ImageButton stop = ((ImageButton) v.findViewById(R.id.stop));
 		stop.setImageDrawable(icon);
+		stop.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Runnable run = new Runnable() {
+					@Override
+					public void run() {
+						final OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+						plugin.stopRecording();
+					}
+				};
+				run.run();
+			}
+		});
 		stop.setVisibility(View.VISIBLE);
 
-		icon = getResources().getDrawable(R.drawable.ic_action_gsave_dark);
+		icon = app.getResources().getDrawable(R.drawable.ic_action_gsave_dark);
 		icon.mutate();
-		if  (light) {
+		if (light) {
 			icon.setColorFilter(0xff727272, PorterDuff.Mode.MULTIPLY);
 		}
-		ImageButton save = ((ImageButton)v.findViewById(R.id.show_on_map));
+		ImageButton save = ((ImageButton) v.findViewById(R.id.show_on_map));
+		save.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+
+			}
+		});
+		save.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Runnable run = new Runnable() {
+					@Override
+					public void run() {
+						final OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+						plugin.saveCurrentTrack();
+					}
+				};
+				run.run();
+			}
+		});
 		v.findViewById(R.id.divider).setVisibility(View.GONE);
 		save.setImageDrawable(icon);
-		updateCurrentTrack(v);
-		return v;
 	}
 
 	@Override
@@ -210,7 +256,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			@Override
 			public boolean onMenuItemActionCollapse(MenuItem item) {
 				// Needed to hide intermediate progress bar after closing action mode
-				 new Handler().postDelayed(new Runnable() {
+				new Handler().postDelayed(new Runnable() {
 					public void run() {
 						hideProgressBar();
 					}
@@ -226,7 +272,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 
 
-
 		optionsMenuAdapter = new ContextMenuAdapter(getActivity());
 		OnContextMenuClick listener = new OnContextMenuClick() {
 			@Override
@@ -260,7 +305,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			final MenuItem item;
 			item = menu.add(0, optionsMenuAdapter.getElementId(j), j + 1, optionsMenuAdapter.getItemName(j));
 			MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			if (ScreenOrientationHelper.isOrientationPortrait(getActivity())){
+			if (ScreenOrientationHelper.isOrientationPortrait(getActivity())) {
 				item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 					@Override
 					public boolean onMenuItemClick(MenuItem menuItem) {
@@ -302,12 +347,12 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	}
 
 	public void showProgressBar() {
-		((FavoritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(true);
+		((FavoritesActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(true);
 	}
 
 	public void hideProgressBar() {
-		if (getActivity() != null){
-			((FavoritesActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+		if (getActivity() != null) {
+			((FavoritesActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(false);
 		}
 	}
 
@@ -322,7 +367,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	private void enableSelectionMode(boolean selectionMode) {
 		this.selectionMode = selectionMode;
 		if (ScreenOrientationHelper.isOrientationPortrait(getActivity())) {
-			((FavoritesActivity)getActivity()).setToolbarVisibility(!selectionMode);
+			((FavoritesActivity) getActivity()).setToolbarVisibility(!selectionMode);
 		}
 	}
 
@@ -578,7 +623,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		@Override
 		protected void onPreExecute() {
-			((ActionBarActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(true);
+			((ActionBarActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(true);
 			listAdapter.clear();
 		}
 
@@ -605,10 +650,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		@Override
 		protected void onPostExecute(List<GpxInfo> result) {
 			this.result = result;
-			if(getActivity() != null) {
-				((ActionBarActivity)getActivity()).setSupportProgressBarIndeterminateVisibility(false);
+			if (getActivity() != null) {
+				((ActionBarActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(false);
 			}
-			if (listAdapter.getGroupCount() > 0){
+			if (listAdapter.getGroupCount() > 0) {
 				getExpandableListView().expandGroup(0);
 			}
 		}
@@ -946,7 +991,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		});
 
 		final OsmEditingPlugin osmEditingPlugin = OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class);
-		if (osmEditingPlugin != null && osmEditingPlugin.isActive()){
+		if (osmEditingPlugin != null && osmEditingPlugin.isActive()) {
 			item = optionsMenu.getMenu().add(R.string.export)
 					.setIcon(light ? R.drawable.ic_action_gup_light : R.drawable.ic_action_gup_dark);
 			item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -1088,7 +1133,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		@Override
 		protected void onPreExecute() {
-			((ActionBarActivity)getActivity()).setProgressBarIndeterminateVisibility(true);
+			((ActionBarActivity) getActivity()).setProgressBarIndeterminateVisibility(true);
 		}
 
 		@Override
@@ -1103,14 +1148,14 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	private void loadGpxAsync(GpxInfo info, boolean isSelected){
+	private void loadGpxAsync(GpxInfo info, boolean isSelected) {
 		final boolean selected = isSelected;
 		new AsyncTask<GpxInfo, Void, Void>() {
 			GpxInfo info;
 
 			@Override
 			protected Void doInBackground(GpxInfo... params) {
-				if (params == null){
+				if (params == null) {
 					return null;
 				}
 				info = params[0];
@@ -1130,10 +1175,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 			@Override
 			protected void onPostExecute(Void result) {
-				if (getActivity() != null){
+				if (getActivity() != null) {
 					getActivity().setProgressBarIndeterminateVisibility(false);
 				}
-				if (info.gpx != null){
+				if (info.gpx != null) {
 					getMyApplication().getSelectedGpxHelper().selectGpxFile(info.gpx, selected, true);
 					listAdapter.notifyDataSetChanged();
 					selectedGpxHelper.runUiListeners();
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
index 223e00f192..d0dbb1f154 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
@@ -8,10 +8,13 @@ import net.osmand.access.AccessibleToast;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.activities.AvailableGPXFragment;
 import net.osmand.plus.activities.FavoritesActivity;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.dashboard.DashBaseFragment;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.helpers.GpxUiHelper;
@@ -87,6 +90,28 @@ public class DashTrackFragment extends DashBaseFragment {
 			}
 		}
 
+		OsmandApplication app = getMyApplication();
+		SavingTrackHelper savingTrackHelper = app.getSavingTrackHelper();
+		if (app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get()) {
+			list.remove(2);
+			LayoutInflater inflater = getActivity().getLayoutInflater();
+			View view = inflater.inflate(R.layout.dash_gpx_track_item, null, false);
+
+			AvailableGPXFragment.createCurrentTrackView(view, app);
+
+			GpxSelectionHelper.SelectedGpxFile currentTrack = savingTrackHelper.getCurrentTrack();
+			((TextView)view.findViewById(R.id.name)).setText(R.string.currently_recording_track);
+			String description = GpxUiHelper.getDescription(getMyApplication(), currentTrack.getGpxFile(), null, true);
+			int startindex = description.indexOf(">");
+			int endindex = description.indexOf("</font>");
+			String distance = description.substring(startindex + 1, endindex);
+			String points = String.valueOf(currentTrack.getGpxFile().points.size());
+
+			((TextView) view.findViewById(R.id.points_count)).setText(points);
+			((TextView)view.findViewById(R.id.distance)).setText(distance);
+			tracks.addView(view);
+		}
+
 		for (String filename : list) {
 			final File f = new File(dir, filename);
 			final GPXUtilities.GPXFile res = GPXUtilities.loadGPXFile(getMyApplication(), f);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index dec854ac18..95e0297c77 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -10,6 +10,7 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
 import net.osmand.plus.NavigationService;
 import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmAndTaskManager;
 import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -256,29 +257,11 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 				int which = holder[0];
 				int item = items.get(which);
 				if(item == R.string.save_current_track){
-					app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, Void>() {
-						
-						@Override
-						protected Void doInBackground(Void... params) {
-							isSaving = true;
-							try {
-								SavingTrackHelper helper = app.getSavingTrackHelper();
-								helper.saveDataToGpx(app.getAppCustomization().getTracksDir());
-								helper.close();
-							} finally {
-								isSaving = false;
-							}
-							return null;
-						}
-
-					}, (Void) null);
+					saveCurrentTrack();
 				} else if(item == R.string.gpx_monitoring_start) {
 					startGPXMonitoring(map);
 				} else if(item == R.string.gpx_monitoring_stop) {
-					settings.SAVE_GLOBAL_TRACK_TO_GPX.set(false);
-					if (app.getNavigationService() != null) {
-						app.getNavigationService().stopIfNeeded(app, NavigationService.USED_BY_GPX);
-					}
+					stopRecording();
 				} else if(item == R.string.gpx_start_new_segment) {
 					app.getSavingTrackHelper().startNewSegment();
 				} else if(item == R.string.live_monitoring_stop) {
@@ -313,6 +296,32 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 		}
 	}
 
+	public void saveCurrentTrack() {
+		app.getTaskManager().runInBackground(new OsmAndTaskRunnable<Void, Void, Void>() {
+
+			@Override
+			protected Void doInBackground(Void... params) {
+				isSaving = true;
+				try {
+					SavingTrackHelper helper = app.getSavingTrackHelper();
+					helper.saveDataToGpx(app.getAppCustomization().getTracksDir());
+					helper.close();
+				} finally {
+					isSaving = false;
+				}
+				return null;
+			}
+
+		}, (Void) null);
+	}
+
+	public void stopRecording(){
+		settings.SAVE_GLOBAL_TRACK_TO_GPX.set(false);
+		if (app.getNavigationService() != null) {
+			app.getNavigationService().stopIfNeeded(app, NavigationService.USED_BY_GPX);
+		}
+	}
+
 	private void startGPXMonitoring(MapActivity map) {
 		app.getSavingTrackHelper().startNewSegment();
 		final ValueHolder<Integer> vs = new ValueHolder<Integer>();

From b43e818ccbb6178aa63302c57ce1389ec608b969 Mon Sep 17 00:00:00 2001
From: yahia kurdi <yahia109@hotmail.com>
Date: Tue, 24 Feb 2015 23:19:46 +0100
Subject: [PATCH 08/45] Translated using Weblate (Arabic)

Currently translated at 58.7% (971 of 1653 strings)
---
 OsmAnd/res/values-ar/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 6a7013eeb5..716b036b98 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="recording_context_menu_show">اظهر</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="recording_context_menu_show">اظهر</string>
     <string name="av_def_action_picture">التقط صورة</string>
     
     <string name="av_def_action_video">تسجيل الفيديو</string>
@@ -1443,4 +1444,9 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	
 	<string name="osmand_net_previously_installed">هناك نسخة سابقة مثبّتة من OsmAnd. سوف تُنقل كل البيانات المُخزنة إلى التطبيق الجديد ما عدا النقاط المفضلة التي يجب عليك تصديرها من التطبيق القديم ثم استيرادها في التطبيق الجديد.</string>
 	<string name="gps_status_app_not_found">تطبيق GPS Status غير مثبّت. هل تريد البحث عنه في المتجر؟</string>
+    <string name="plugin_settings_button_caption">اعدادات</string>
+	<string name="plugin_description_title">الوصف</string>
+	<string name="video">فيديو</string>
+	<string name="photo">صورة</string>
+	<string name="rename_recording">إعادة تسمية تسجيل</string>
     </resources>

From 26980382eee29316a9cc62c8e515a0bccb1ffb39 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 24 Feb 2015 19:17:54 +0100
Subject: [PATCH 09/45] Translated using Weblate (Danish)

Currently translated at 100.0% (1653 of 1653 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 2b0558eb2d..aa5a91488f 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1920,7 +1920,7 @@
 	<string name="roads_only">Kun veje</string>
     <string name="notes">Noter</string>
 	<string name="online_map">Online kort</string>
-	<string name="watch">Overvåg</string>
+	<string name="watch">Vis</string>
 	<string name="share_note">Del note</string>
 	<string name="rename_recording">Omdøb optagelse</string>
 	<string name="export">Eksport</string>

From 825edd583ab1414503b8ebc267a300b0b02a64ee Mon Sep 17 00:00:00 2001
From: Andrius <kaikaris.andrius@gmail.com>
Date: Tue, 24 Feb 2015 18:42:37 +0100
Subject: [PATCH 10/45] Translated using Weblate (Lithuanian)

Currently translated at 99.2% (1640 of 1653 strings)
---
 OsmAnd/res/values-lt/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index dbfc091c92..792436ebde 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1931,4 +1931,6 @@
 	<string name="rename_recording">Pervardinti įrašą</string>
     <string name="location_on_map">Vieta:\n Plat. %1$s\n Ilg. %2$s</string>
 	<string name="export">Eksportuoti</string>
+	<string name="days_behind">dienas atsilikęs</string>
+	<string name="plugin_nautical_descr1">Aktyvavus šį rodinį bus rodomas jūrlapis su jūriniais navigaciniais ženklais ir simboliais.</string>
 	</resources>

From b1f51f39f76a5b82a96890741842ae9ff255e3fe Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Wed, 25 Feb 2015 01:16:17 +0100
Subject: [PATCH 11/45] Translated using Weblate (Sardinian)

Currently translated at 99.5% (1646 of 1653 strings)
---
 OsmAnd/res/values-sc/strings.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 6cce01d947..92295f8974 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -240,8 +240,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="plugin_distance_point">Puntu</string>
     <string name="gpx_file_name">Nùmene de su documentu GPX</string>
     <string name="gpx_saved_sucessfully">Documentu GPX sarbadu cun sutzessu in {0}</string>
-    <string name="osmand_distance_planning_plugin_description">Creare àndalas (o impreare/mudare documentos GPX esistentes) pro medire sa distantzia intra \'e tres puntos. Sarbare comente GPX, at a poder èssere impreau pro pianificare una caminera GPX.</string>
-    <string name="osmand_distance_planning_plugin_name">Aina Calcoladore de distàntzia e Pianificatzione</string>
+    <string name="osmand_distance_planning_plugin_description">Ativat unu widget pro creare àndalas carcande in sa mapa (o impreare/mudare documentos GPX esistentes) pro medire sa distantzia intra \'e puntos diferentes. Sos resurtados podent èssere sarbados comente GPX, e ant a poder\'èssere impreados pro pianificare una caminera GPX.</string>
+    <string name="osmand_distance_planning_plugin_name">Aina calcoladore de distàntzia e pianificatzione</string>
     <string name="use_distance_measurement_help">* Toca pro sinnare unu puntu.\n 
         * Carca e tene carcau in sa mapa pro burrare sos puntos antepostos.\n
         * Carca e tene carcau supra de unu puntu pro bìdere e alliongiare una descrizione.\n
@@ -281,13 +281,13 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="monitoring_settings_descr">Cunfigura comente registrare sos biàgios tuos</string>
     <string name="osmo_settings_uuid">ID ùnicu de su dispositivu</string>
     <string name="osmo_settings_descr">Cunfigura sas impostaduras de compidada de su dispositivu e imposta su canale de compidada pessonale</string>
-    <string name="osmo_plugin_description">"OpenStreetMap Compidada - Compidada avantzada in dereta, bie http://osmo.mobi. Sighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comunica. Sunt disponìbiles meda impostaduras pro sa compidada, pro sa sessione in corso o permanentes. Sos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, ad es. non b\'est su controllu remotu e nemmancu s\'amministradore de su grupu.Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. Pro àteras informatziones: http://osmo.mobi. "</string>
-    <string name="osmo_plugin_name">OsMo (Compidada Avantzada in Dereta)</string>
-    <string name="osmo_settings">Compidada OpenStreetMap</string>
+    <string name="osmo_plugin_description">"Compidada OsMo - Compidada avantzada in dereta, bie http://osmo.mobi. Sighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comunica. Sunt disponìbiles meda impostaduras pro sa compidada, pro sa sessione in corso o permanentes. Sos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, ad es. non b\'est su controllu remotu e nemmancu s\'amministradore de su grupu.Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. Pro àteras informatziones: http://osmo.mobi. "</string>
+    <string name="osmo_plugin_name">Compidada OsMo</string>
+    <string name="osmo_settings">Compidada OsMo</string>
    	<string name="osmand_monitoring_plugin_description">Ativa sa compidada e su nàvigu in sa modalidade "a reposu" (ischermu istudau)impreande ischidaduras periòdicas de su dispositivu GPS.
         Ammustra sas impostaduras chi fatzititana sa regitratzione de sos biàgios in documentos GPX locales o in lìnia, impreande unu servitziu in retza.</string>
     <string name="osmand_monitoring_plugin_name">Servitzios de registratzione</string>
-    <string name="osmand_background_plugin_description">Ammustra sas impostaduras pro abilitare sa compidada e su nàvigu in modalidade " a reposu" (ischermu istudau)pro mèdiu de ischidaduras periòdicas de su GPS.</string>
+    <string name="osmand_background_plugin_description">Ammustrat sas impostaduras pro abilitare sa compidada e su nàvigu in modalidade a reposu (ischermu istudau) pro mèdiu de ischidaduras periòdicas de su GPS.</string>
     <string name="contribution_activity">Installa sa versione</string>
     <string name="choose_osmand_theme_descr">Issèbera su tema de s\'aplicu</string>
     <string name="choose_osmand_theme">Tema de s\'aplicu</string>
@@ -1718,8 +1718,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="speak_poi">Annùntzia PDI a curtzu</string>
     <string name="flat_list_waypoints">Totus</string>
     <string name="index_tours">Itineràrios</string>
-    <string name="record_plugin_description">Registra sas rastas tuas carcande su pursante in s\'ischermu de sa mapa. Ammustra sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.</string>
-    <string name="record_plugin_name">Registra sos biàgios tuos</string>
+    <string name="record_plugin_description">Ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s\'ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.</string>
+    <string name="record_plugin_name">Registratzione biàgios</string>
     <string name="int_hour">h</string>
     <string name="duration">Durada</string>
     <string name="distance">Distantzia</string>
@@ -1869,4 +1869,12 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="audio">Àudio</string>
 	<string name="video">Vìdeo</string>
 	<string name="photo">Foto</string>
+	<string name="plugin_nautical_descr1">Ativande custa funtzionalidade s\'istile de sa mapa at a divènnere Nàuticu, e at a èssere disponìbile totu sa simbologia pro su nàvigu.</string>
+	<string name="plugin_nautical_descr2">Sa mapa cun totu sa simbologia nàutica globale est disponìbile comente iscarrigamentu ùnicu cun su nùmene \"World seamarks\".</string>
+	<string name="plugin_nautical_descr3">Custa vista podet èssere furriada siat disativande•la inoghe torra siat cambiande su \'Istile mapa\' in \'Cunfigura sa mapa\' comente boles tue.</string>
+
+	<string name="plugin_ski_descr1">Ativande custa vista s\'istile mapa at a divènnere \'Ierru e iscì\', ammustrande totu sas caraterìsticas de s\'iscenàriu in sas cunditziones de s\'ierru.</string>
+	<string name="plugin_ski_descr2">Est disponìbile una mapa cun totu sas pistas e s\'àndalas pro iscì de fundu suta de Iscarrigàbiles comente \'World ski map\'.</string>
+	<string name="plugin_ski_descr3">Custa vista podet èssere ripristinada disativande•la inoghe torra o cambiande s\'\'Istile mapa\' in \'Cunfigura mapa\'.</string>
+
 	</resources>

From 69721b583c9a5d58e6ce8180ce65a986fd49d1dd Mon Sep 17 00:00:00 2001
From: Roberto GEB <robertogeb@gmail.com>
Date: Tue, 24 Feb 2015 23:28:08 +0100
Subject: [PATCH 12/45] Translated using Weblate (Spanish)

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

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 1edb9fcc41..4cc8ef2e22 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -769,13 +769,13 @@
   <string name="online_map_settings_descr">Configurar fuentes de mapas en línea o teselas guardadas</string>
   <string name="map_settings">Configuraciones del mapa</string>
   <string name="map_settings_descr">Configurar la pantalla del mapa</string>
-  <string name="osmand_rastermaps_plugin_description">Muestra opciones para configurar diversos mapas con conexión o de teselas guardadas como mapa base o como mapas superpuestos / subyacentes. Estos mapas también se pueden preparar sin conexión y copiarlos en la carpeta de datos de OsmAnd.</string>
+  <string name="osmand_rastermaps_plugin_description">Muestra las opciones para usar diversos mapas con conexión o de teselas guardadas, tanto como mapa base como mapas superpuestos / subyacentes. Estos mapas también se pueden preparar sin conexión y copiarlos en la carpeta de datos de OsmAnd.</string>
   <string name="osmand_background_plugin_description">Muestra las configuraciones para habilitar el seguimiento y la navegación en modo suspensión (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
   <string name="osmand_accessibility_description">Muestra las configuraciones para características especiales de accesibilidad.</string>
   <string name="extra_settings">Configuraciones avanzadas</string>
-  <string name="osmand_monitoring_description">Este agregado facilita el registro de sus excursiones a un fichero GPX o en directo usando un servicio web.</string>
+  <string name="osmand_monitoring_description">Muestra el botón y las opciones que facilitan el registro de sus excursiones en un fichero GPX o usando un servicio web.</string>
   <string name="osmand_extra_settings_description">Muestra opciones para configuraciones avanzadas de mapa (como aumentar detalles del mapa) y algunas especificas de dispositivos.</string>
-  <string name="osmand_development_plugin_description">Mostrar opciones de características de desarrollo y depuración como la simulación de rutas o la pantalla de rendimiento de la visualización.</string>
+  <string name="osmand_development_plugin_description">Muestra las opciones de características de desarrollo y depuración como la simulación de rutas o la indicación de rendimiento de la visualización.</string>
   <string name="plugins_screen">Gestor de extras</string>
   <string name="select_plugin_to_activate">Toque un extra para activarlo o desactivarlo. (Puede ser necesario reiniciar OsmAnd.)</string>
   <string name="prefs_plugins_descr">Los extras activan opciones avanzadas y proporcionan funcionalidades adicionales</string>
@@ -784,7 +784,7 @@
 \n*Funcionalidad de extras*\n\t - La mayoría de funcionalidades está agrupada por características y pueden ser habilitadas / deshabilitadas en el Gestor de Extras. Puede habilitar fuentes de teselas de mapas (online o cacheadas), opciones de seguimiento, y muchas otras características nuevas y existentes.\n*Soporte para nuevos datos de mapa descargados*\n\t - La visualización de mapa es más rápida y precisa (Los problemas con la línea de la costa y zonas inundadas están mayormente corregidos)\n\t - Necesita descargarse datos completamente nuevos (los datos antiguos no están soportados)\n*Navegación sin conexión*
 \n\t - La navegación sin conexión es más robusta\n*Usabilidad e interfaz de usuario*
 \n\t - Mejoras en muchas áreas "</string>
-  <string name="osm_editing_plugin_description">Muestra parámetros para la colaboración con OSM como recolectar / modificar objetos PDI de OSM, crear / comentar fallos de OSM, y contribuir con trazas GPX (requiere credenciales OSM).</string>
+  <string name="osm_editing_plugin_description">Muestra las opciones necesarias para la colaboración con OSM como crear / modificar objetos PDI de OSM, abrir / comentar fallos de OSM, y contribuir con trazas GPX (requiere credenciales OSM).</string>
   <string name="vector_maps_may_display_faster_on_some_devices">Los mapas vectoriales pueden mostrarse más rápido. Puede no funcionar correctamente en algunos dispositivos.</string>
   
   <string name="play_commands_of_currently_selected_voice">Reproduce algunas indicaciones de la voz seleccionada actualmente</string>
@@ -911,7 +911,7 @@
   <string name="osmand_parking_pm">PM</string>
   <string name="osmand_parking_am">AM</string>
   <string name="osmand_parking_position_name">Punto de aparcamiento</string>
-  <string name="osmand_parking_plugin_description">Este extra permite guardar la ubicación de su automóvil aparcado.</string>
+  <string name="osmand_parking_plugin_description">Extra adicional (descarga aparte) que permite guardar la ubicación de tu automóvil aparcado.</string>
   <string name="osmand_parking_plugin_name">Posición de aparcamiento (plugin externo)</string>
   <string name="context_menu_item_add_parking_point">Marcar como posición de aparcamiento</string>
   <string name="context_menu_item_delete_parking_point">Eliminar un marcador de aparcamiento</string>
@@ -1073,7 +1073,7 @@
     <string name="osmodroid_plugin_name">Extra OsMoDroid</string>
 	<string name="index_srtm_parts">piezas</string>
     <string name="index_srtm_ele">Curvas de nivel</string>
-    <string name="srtm_plugin_description">Permite descargar curvas de nivel sin conexión y relieve sombreado (\'Opciones\' → \'Gestionar mapas\' → \'Descargar\' → Seleccionar el tipo de mapa deseado).</string>
+    <string name="srtm_plugin_description">Extra adicional (descarga aparte) que permite descargar curvas de nivel y relieve sombreado (\'Opciones\' → \'Gestionar mapas\' → \'Descargar\' → Seleccionar el tipo de mapa deseado). Estos se pueden mostrar en combinación con los mapas sin conexión OsmAnd.</string>
     <string name="srtm_plugin_name">Contornos de nivel (plugin externo)</string>
     <string name="download_select_map_types">Otros mapas</string>
     <string name="download_srtm_maps">Curvas de nivel</string>
@@ -1270,7 +1270,7 @@
     <string name="plugin_distance_point">Punto</string>
     <string name="gpx_file_name">Nombre del archivo GPX</string>
     <string name="gpx_saved_sucessfully">Archivo GPX guardado correctamente en {0}</string>
-    <string name="osmand_distance_planning_plugin_description">Crear caminos (o usar / modificar archivos GPX existentes) para medir la distancia entre los puntos. Guardado como GPX, se puede utilizar para planificar rutas GPX.</string>
+    <string name="osmand_distance_planning_plugin_description">Activa un control que permite crear caminos pulsando en el mapa (o usar / modificar archivos GPX existentes) para medir la distancia entre los puntos. Los resultados pueden guardarse como GPX, y utilizarse para planificar rutas GPX.</string>
     <string name="osmand_distance_planning_plugin_name">Cálculador de distancia y herramienta de planificación</string>
     <string name="use_distance_measurement_help">* Toca para marcar un punto.\n * Mantenga pulsado el mapa para suprimir el punto anterior.\n * Mantenga pulsado el punto para ver e incluir descripción.\n * Pulse en el control de medición para ver más acciones.</string>
     <string name="default_buttons_do_not_show_again">No mostrar de nuevo</string>
@@ -1560,8 +1560,8 @@
 	<string name="interrupt_music">Interrumpir música</string>
 	<string name="osmo_settings_uuid">Id único del dispositivo</string>
     <string name="osmo_settings_descr">Configurar opciones de monitorización y configurar canal de monitoreo</string>
-    <string name="osmo_plugin_description">"OpenStreetMap-Monitoring - Monitorización avanzada en directo. Proporciona la posibilidad de seguir otros dispositivos y ser seguido. Crea grupos anónimos, comparte las localizaciones de cada uno y comuníquense. Tiene varias opciones para seguimiento por sesión o permanente. Los grupos anónimos están limitados a varios días y a algunas funcionalidades, p.e. no hay control remoto ni administrador de grupo. Los grupos completamente funcionales deben ser creados en la web y solo los usuarios registrados tienen acceso a ellos. Por favor, lee más en http://osmo.mobi. "</string>
-    <string name="osmo_plugin_name">OsMo monitoring</string>
+    <string name="osmo_plugin_description">"Muestra las opciones para usar OsMo - Monitorización avanzada en directo, mira http://osmo.mobi. Proporciona la posibilidad de seguir otros dispositivos y ser seguido. Crear grupos anónimos, compartir las localizaciones de cada uno y comunicarse. Tiene varias opciones para seguimiento por sesión o permanente. Los grupos anónimos están limitados a varios días y a algunas funcionalidades, p.e. no hay control remoto ni administrador de grupo. Los grupos completamente funcionales deben ser creados en el sitio web y sólo los usuarios registrados tienen acceso a ellos. "</string>
+    <string name="osmo_plugin_name">Monitorización OsMo</string>
     <string name="osmo_settings">OsMo Monitoring</string>
    	<string name="share_route_as_gpx">Compartir la ruta como archivo GPX</string>
 	<string name="share_route_subject">Ruta compartida vía OsmAnd</string>
@@ -1789,7 +1789,7 @@
     <string name="duration">Duración</string>
     <string name="distance">Distancia</string>
     <string name="record_plugin_name">Grabación de viaje</string>
-    <string name="record_plugin_description">Guarde sus trazas tocando un botón en la pantalla del mapa. Mostrar las configuraciones para grabar sus viajes a archivos GPX locales o usando un servicio web en línea.</string>
+    <string name="record_plugin_description">Activa la funcionalidad para guardar tus trazas tocando un botón en la pantalla del mapa y muestra las opciones para grabar tus viajes a archivos GPX locales o usando un servicio web en línea.</string>
     <string name="rendering_attr_publicTransportMode_name">Rutas de autobús, trolebús y lanzadera</string>
 	<string name="save_track_to_gpx_globally">Guardar traza en fichero GPX</string>
 	<string name="save_track_interval_globally">Intervalo de guardado</string>
@@ -1946,8 +1946,8 @@
 	<string name="plugin_touringview_descr1">Activando esta vista cambia el estilo de mapa a \'Vista de Touring\', que es una vista de alto detalle especial para los viajeros y conductores profesionales.</string>
 	<string name="plugin_touringview_descr2">Esta vista proporciona, en cualquier nivel de zoom del mapa, la máxima cantidad de detalles de viaje disponible en los datos del mapa (especialmente carreteras, pistas, senderos y marcas de orientación). También representa claramente todos los tipos de carreteras sin ambigüedades por códigos de color, que es útil cuando por ejemplo conduciendo vehículos grandes.</string>
 	<string name="days_behind">días atrás</string>
-	<string name="plugin_touringview_descr3">La descarga de un mapa especial no es necesaria, la vista es creada desde nuestros mapas estándar.</string>
-	<string name="plugin_touringview_descr4">La vista puede ser revertida desactivandola de nuevo aquí, o cambiando el \'Estilo de mapa\' desde \'Configurar mapa\' como se quiera.</string>
+	<string name="plugin_touringview_descr3">No es necesario descargar un mapa especial, la vista se crea a partir de nuestros mapas estándar.</string>
+	<string name="plugin_touringview_descr4">Esta vista puede ser revertida desactivandola de nuevo aquí, o cambiando el \'Estilo de mapa\' desde \'Configurar mapa\'.</string>
 	<string name="location_on_map">Localización:\n Lat %1$s\n Lon %2$s</string>
 	<string name="watch">Ver</string>
 	<string name="plugin_touringview_name">Vista de mapa Touring</string>

From 5fbd94975cb6e09d10695e8c0d0bda9e61259e5f Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Wed, 25 Feb 2015 06:54:02 +0100
Subject: [PATCH 13/45] Translated using Weblate (Swedish)

Currently translated at 99.5% (1645 of 1653 strings)
---
 OsmAnd/res/values-sv/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index fe5e186982..4813eb558c 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -963,7 +963,7 @@
     <string name="download_srtm_maps">Höjdkurvsdata</string>
     <string name="tip_recent_changes_1_1_0_t">"Förändringar i 1.1.0:
 \n\t* Insticksmodul för beräkning av avstånd\n\t* Insticksmodul för ljud-/videoanteckningar\n\t* Insticksmodul för höjdkurvor\n\t* Buggfixar
-\n\t* \'Touring View\' - kartutseende med mer kartdetaljer, nytt utseende för vägar, mer kontrast och fjällvandringsalternativ (SAC-skala)
+\n\t* \'Vägkartsvy\' - kartutseende med mer kartdetaljer, nytt utseende för vägar, mer kontrast och fjällvandringsalternativ (SAC-skala)
 \n\t* EGM96 geoid offsetkorrigering för GPS-höjdavläsningar "</string>
     
     
@@ -1828,10 +1828,10 @@
 
 	<string name="plugin_touringview_descr3">Ingen speciell hämtning av någon karta krävs; denna vy skapas med våra standardkartor.</string>
 	<string name="plugin_touringview_descr4">Denna vy kan ändras genom att antingen inaktivera den här igen eller genom att ändra kartstilen under Konfigurera kartor.</string>
-	<string name="plugin_touringview_descr1">Om du aktiverar denna vy ändras kartan till \'Touring view\', som är en speciell vy med mycket detaljer för resenärer och yrkesförare.</string>
+	<string name="plugin_touringview_descr1">Om du aktiverar denna vy ändras kartan till \'Vägkartsvy\', som är en speciell vy med mycket detaljer för resenärer och yrkesförare.</string>
 	<string name="location_on_map">Plats:\n Lat %1$s\n Lon %2$s</string>
 	<string name="plugin_touringview_descr2">Denna vy ger, vid varje zoomnivå, maximalt antal detaljer som är tillgängliga i kartdatat (speciellt vägar, stigar och orienteringsmärken). Den visar också alla vägtyper på ett mycket tydligt sätt via färgkoder något som är användbart t.ex vid framförande av stora fordon.</string>
-	<string name="plugin_touringview_name">Touring map-vy</string>
+	<string name="plugin_touringview_name">Vägkartsvy</string>
 
 	<string name="days_behind">dagar efter</string>
 	<string name="watch">Visa</string>

From 1731137a7fdf40459e8cc9f435743feb7680c9bc Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Tue, 24 Feb 2015 21:07:59 +0100
Subject: [PATCH 14/45] Translated using Weblate (Danish)

Currently translated at 100.0% (641 of 641 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 c4b0188327..320d380c53 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -549,7 +549,7 @@
         <string name="poi_island">Ø</string>
         <string name="poi_islet">Holm</string>
 
-        <string name="poi_seamark_anchorage">Ankringsområde</string>
+        <string name="poi_seamark_anchorage">Ankerplads</string>
         <string name="poi_seamark_anchor_berth">Ankerplads</string>
         <string name="poi_seamark_beacon">Båke</string>
         <string name="poi_seamark_beacon_cardinal">Kompasbåke</string>
@@ -560,13 +560,13 @@
         <string name="poi_seamark_building">Sømærke bygning</string>
         <string name="poi_seamark_bridge">Sømærke bro</string>
         <string name="poi_seamark_buoy_cardinal">Kompastønde</string>
-        <string name="poi_seamark_buoy_installation">Installation tønde</string>
+        <string name="poi_seamark_buoy_installation">Installationstønde</string>
         <string name="poi_seamark_buoy_isolated_danger">Tønde, isoleret fare</string>
         <string name="poi_seamark_buoy_lateral">Sidetønde</string>
         <string name="poi_seamark_buoy_safe_water">Midtfarvandstønde</string>
         <string name="poi_seamark_buoy_special_purpose">Specialtønde</string>
         <string name="poi_seamark_daymark">Dagmærke</string>
-        <string name="poi_seamark_distance_mark">Distance mærke</string>
+        <string name="poi_seamark_distance_mark">Afstandsmærke</string>
         <string name="poi_seamark_dry_dock">Tørdok</string>
         <string name="poi_seamark_dyke">Dige</string>
         <string name="poi_seamark_floating_dock">Flydedok</string>
@@ -676,7 +676,7 @@
 	<string name="poi_tourism">Turisme</string>
 	<string name="poi_entertainment">Fritid</string>
 	<string name="poi_sustenance">Mad og spise</string>
-	<string name="poi_service">Serviceydelser</string>
+	<string name="poi_service">Tjenesteydelse</string>
 	<string name="poi_finance">Finansiel</string>
 	<string name="poi_natural">Natur</string>
 	<string name="poi_seamark">Maritimt</string>

From 41cfd1c1c66d18af8b05d4d371b2798e30298639 Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Wed, 25 Feb 2015 12:33:47 +0100
Subject: [PATCH 15/45] Translated using Weblate (Belarusian)

Currently translated at 99.3% (1643 of 1653 strings)
---
 OsmAnd/res/values-be/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index c028256196..43a0ccb17a 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2041,4 +2041,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="plugin_nautical_descr2">Файл з дадзенымі зьмяшчае ўсе навігацыйныя сімвалы ў выглядзе адзінага файлу з назвай \"World seamarks\".</string>
 	<string name="plugin_nautical_descr3">Гэты стыль можа быць скасаваны шляхам яго выключэньня тут або зьменаю ў пункце \"Стыль мапы\" меню \"Налады мапы\" на патрэбны.</string>
 
+	<string name="back_to_map">Вярнуцца да мапы</string>
 	</resources>

From 66bc3f1768bf0d69ddd2400ce61b488705980aaf Mon Sep 17 00:00:00 2001
From: Nicolas Palix <nicolas.palix@gmail.com>
Date: Wed, 25 Feb 2015 13:54:38 +0100
Subject: [PATCH 16/45] Translated using Weblate (French)

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

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 1acb770fce..eba6d469fc 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1959,4 +1959,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="plugin_nautical_descr2">Une carte marine mondiale est disponible en une seul téléchargement nommé \"Carte marine\".</string>
 	<string name="location_on_map">Position :\n Lat. %1$s\n Lon. %2$s</string>
 	<string name="days_behind">jours écoulés</string>
+	<string name="rename_failed">Échec du renommage.</string>
+	<string name="currently_recording_track">Enregistrement de l\'itinéraire en cours</string>
+	<string name="back_to_map">Retour à la carte</string>
 	</resources>

From e4e48f0f8ac5be024ed9563026714b03307aaf99 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Wed, 25 Feb 2015 14:09:10 +0100
Subject: [PATCH 17/45] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 42a812d7ab..377177605b 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1935,4 +1935,7 @@
 	<string name="plugin_ski_descr3">此檢視可以在這裡經由再次取消啟動，或透過 \'地圖式樣\' 之下的 \'組態地圖\' 這兩者中的任何一個更改而恢復它。</string>
 
 	<string name="plugin_touringview_descr4">此檢視可以在這裡經由再次取消啟動，或透過 \'地圖式樣\' 之下的 \'組態地圖\' 這兩者中的任何一個更改而恢復它。</string>
+	<string name="rename_failed">重新命名失敗。</string>
+	<string name="currently_recording_track">現在錄制的軌跡</string>
+	<string name="back_to_map">返回地圖</string>
 	</resources>

From a6fe0be30eb4887837021e5d3b771727ea53303a Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 25 Feb 2015 14:34:18 +0100
Subject: [PATCH 18/45] Translated using Weblate (Danish)

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

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index aa5a91488f..94672db692 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1943,4 +1943,7 @@
 	<string name="plugin_touringview_descr4">Visningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket.</string>
 	<string name="location_on_map">Placering:\n Lat %1$s\n Long %2$s</string>
 	<string name="days_behind">dage bagefter</string>
+	<string name="rename_failed">Fejl ved omdøbning.</string>
+	<string name="back_to_map">Tilbage til kortet</string>
+	<string name="currently_recording_track">Aktuelt optagelsesspor</string>
 	</resources>

From 7061dfd881091daa28199763d8d5773d5d2b24d4 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 25 Feb 2015 18:02:50 +0200
Subject: [PATCH 19/45] Updated renaming notes functionality and created view
 for selected tracks

---
 OsmAnd/res/layout/available_gpx.xml           | 30 +++++++++++
 OsmAnd/res/layout/dash_gpx_track_item.xml     |  8 +++
 OsmAnd/res/values/strings.xml                 |  4 +-
 .../plus/activities/AvailableGPXFragment.java | 52 +++++++++++++++++++
 .../plus/audionotes/AudioNotesLayer.java      |  2 +-
 .../audionotes/AudioVideoNotesPlugin.java     | 15 +++++-
 .../DashAudioVideoNotesFragment.java          |  2 +-
 .../osmand/plus/audionotes/NotesFragment.java | 21 +++++---
 8 files changed, 122 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index 0bb085b1fc..1de3b2ecab 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -30,6 +30,36 @@
 
 	</LinearLayout>
 
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/card_bg"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<TextView
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="@string/showed_on_map"/>
+
+			<Button
+				android:id="@+id/turn_off_all"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/turn_off_all"/>
+
+		</LinearLayout>
+
+		<ListView
+			android:id="@+id/gpx_on_map"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+	</LinearLayout>
 
 	<ExpandableListView
 		android:id="@android:id/list"
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index 9ac98dd620..554fb6beee 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -98,6 +98,14 @@
 			android:layout_gravity="center_vertical"
 			android:background="?attr/options_button_background"
 			android:src="@drawable/ic_action_gsave_dark"/>
+
+
+		<CheckBox
+			android:id="@+id/check"
+			android:layout_width="@dimen/list_item_height"
+			android:layout_height="@dimen/list_item_height"
+			android:focusable="false"
+			android:visibility="gone"/>
 	</LinearLayout>
 
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index b924561f7d..320ad49e58 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <!--
     	 Disclaimer: 
@@ -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="turn_off_all">Turn_off_all</string>
+	<string name="showed_on_map">Showed on map</string>
 	<string name="rename_failed">Rename failed.</string>
 	<string name="days_behind">days behind</string>
 	<string name="currently_recording_track">Currently recording track</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index baad047575..524db90c62 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -29,6 +29,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
+import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.util.Algorithms;
@@ -62,12 +63,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -118,6 +122,18 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 
 		updateCurrentTrack(getView());
+		updateShowedOnMapTracks();
+
+	}
+
+	private void updateShowedOnMapTracks() {
+		View v = getView();
+		if (v == null) {
+			return;
+		}
+
+		ListView onMap = (ListView)v.findViewById(R.id.gpx_on_map);
+		onMap.setAdapter(new ShowedOnMapAdapter(getActivity(), R.layout.dash_gpx_track_item));
 
 	}
 
@@ -1367,4 +1383,40 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			return fileName = file.getName();
 		}
 	}
+
+	class ShowedOnMapAdapter extends ArrayAdapter<GpxInfo>{
+
+		public ShowedOnMapAdapter(Context context, int resource) {
+			super(context, resource);
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			View v = convertView;
+			if (v == null) {
+				LayoutInflater inflater = getActivity().getLayoutInflater();
+				v = inflater.inflate(R.layout.dash_gpx_track_item, parent, false);
+			}
+
+			GpxInfo gpxInfo = getItem(position);
+
+			TextView viewName = ((TextView) v.findViewById(R.id.name));
+			viewName.setText(gpxInfo.getName());
+
+			v.findViewById(R.id.show_on_map).setVisibility(View.GONE);
+			v.findViewById(R.id.stop).setVisibility(View.GONE);
+			v.findViewById(R.id.divider).setVisibility(View.GONE);
+			String description = GpxUiHelper.getDescription(getMyApplication(), gpxInfo.gpx, gpxInfo.file, true);
+			int startindex = description.indexOf(">");
+			int endindex = description.indexOf("</font>");
+			String distnace = description.substring(startindex + 1, endindex);
+			((TextView) v.findViewById(R.id.distance)).
+					setText(distnace);
+
+			CompoundButton check = (CompoundButton)v.findViewById(R.id.check);
+			check.setVisibility(View.VISIBLE);
+
+			return v;
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
index b3a700409e..c41483c04b 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
@@ -170,7 +170,7 @@ public class AudioNotesLayer extends OsmandMapLayer implements IContextMenuProvi
 	@Override
 	public PointDescription getObjectName(Object o) {
 		if(o instanceof Recording){
-			if(((Recording)o).getName() == null) {
+			if(((Recording)o).getName().isEmpty()) {
 				return new PointDescription(PointDescription.POINT_TYPE_NOTE, view.getResources().getString(R.string.recording_default_name));
 			}
 			return new PointDescription(PointDescription.POINT_TYPE_NOTE, ((Recording)o).getName());
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index d2d1abaf01..d697edf248 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -21,6 +21,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.access.AccessibleToast;
 import net.osmand.data.DataTileManager;
+import net.osmand.data.Street;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
@@ -190,10 +191,22 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			return false;
 		}
 
-		public String getName() {
+		public String getFileName() {
 			return file.getName();
 		}
 
+		public String getName() {
+			String fileName = file.getName();
+
+			String hash;
+			int hashInd = fileName.lastIndexOf("_");
+			if (hashInd != -1) {
+				return fileName.substring(0, hashInd - 1);
+			} else {
+				return "";
+			}
+		}
+
 		public boolean isPhoto() {
 			return file.getName().endsWith(IMG_EXTENSION);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
index 47f1381a27..01e349d6a5 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
@@ -124,7 +124,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 								   final Context ctx, final AudioVideoNotesPlugin plugin) {
 		String name = recording.getName();
 		TextView nameText = ((TextView) view.findViewById(R.id.name));
-		if (name != null) {
+		if (!name.isEmpty()) {
 			nameText.setText(name);
 		} else if (recording.isAudio()) {
 			nameText.setText(R.string.audio);
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index 6a083907f3..59e82b55ef 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.audionotes;
 
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
@@ -13,6 +14,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
@@ -211,21 +213,24 @@ public class NotesFragment extends ListFragment {
 				getListView(), false);
 		final EditText editText = (EditText) v.findViewById(R.id.name);
 		builder.setView(v);
-		String fileName = recording.getName();
-		int extInd = recording.getName().lastIndexOf(".");
-		final String extension;
-		if (extInd >= 0){
-			extension = fileName.substring(extInd, fileName.length());
+
+		String fileName = recording.getFileName();
+		final String hash;
+		int hashInd = fileName.lastIndexOf("_");
+		if (hashInd == -1) {
+			hash = "_" + fileName;
 		} else {
-			extension = "";
+			hash = fileName.substring(hashInd, fileName.length());
 		}
 
-		editText.setText(recording.getName().substring(0, extInd));
+		editText.setText(recording.getName());
+		InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+		imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
 		builder.setNegativeButton(R.string.default_buttons_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				if(!recording.setName(editText.getText().toString() + extension)) {
+				if(!recording.setName(editText.getText().toString() + hash)) {
 					Toast.makeText(getActivity(),R.string.rename_failed,Toast.LENGTH_SHORT).show();
 				}
 				recording.setDescription();

From b4b674178d8f2f524e6085778199b8a6385d078a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 25 Feb 2015 18:21:33 +0200
Subject: [PATCH 20/45] Updated renaming for audio video notes

---
 .../plus/audionotes/AudioNotesLayer.java      |   4 +-
 .../audionotes/AudioVideoNotesPlugin.java     | 214 +++++++++---------
 .../DashAudioVideoNotesFragment.java          |  18 +-
 .../osmand/plus/audionotes/NotesFragment.java |   6 +-
 4 files changed, 118 insertions(+), 124 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
index c41483c04b..d7363e2873 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
@@ -170,10 +170,10 @@ public class AudioNotesLayer extends OsmandMapLayer implements IContextMenuProvi
 	@Override
 	public PointDescription getObjectName(Object o) {
 		if(o instanceof Recording){
-			if(((Recording)o).getName().isEmpty()) {
+			if(((Recording)o).getName(activity).isEmpty()) {
 				return new PointDescription(PointDescription.POINT_TYPE_NOTE, view.getResources().getString(R.string.recording_default_name));
 			}
-			return new PointDescription(PointDescription.POINT_TYPE_NOTE, ((Recording)o).getName());
+			return new PointDescription(PointDescription.POINT_TYPE_NOTE, ((Recording)o).getName(activity));
 		}
 		return null;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index d697edf248..6f1541153c 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -179,12 +179,12 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 
 		public boolean setName(String name) {
 			int index = file.getAbsolutePath().lastIndexOf("/") + 1;
-			if (index < 0){
+			if (index < 0) {
 				return false;
 			}
 			File directory = new File(file.getAbsolutePath().substring(0, index));
-			File to        = new File(directory, name.trim());
-			if (file.renameTo(to)){
+			File to = new File(directory, name.trim());
+			if (file.renameTo(to)) {
 				file = to;
 				return true;
 			}
@@ -195,16 +195,20 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			return file.getName();
 		}
 
-		public String getName() {
+		public String getName(Context ctx) {
 			String fileName = file.getName();
 
-			String hash;
 			int hashInd = fileName.lastIndexOf("_");
 			if (hashInd != -1) {
 				return fileName.substring(0, hashInd - 1);
-			} else {
-				return "";
+			} else if (this.isAudio()) {
+				return ctx.getResources().getString(R.string.audio);
+			} else if (this.isVideo()) {
+				return ctx.getResources().getString(R.string.video);
+			} else if (this.isPhoto()) {
+				return ctx.getResources().getString(R.string.photo);
 			}
+			return "";
 		}
 
 		public boolean isPhoto() {
@@ -237,9 +241,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			try {
 				Class exClass = Class.forName("android.media.ExifInterface");
 
-				Constructor c = exClass.getConstructor(new Class[] { String.class });
+				Constructor c = exClass.getConstructor(new Class[]{String.class});
 				Object exInstance = c.newInstance(file.getAbsolutePath());
-				Method setAttribute = exClass.getMethod("setAttribute", new Class[] { String.class, String.class });
+				Method setAttribute = exClass.getMethod("setAttribute", new Class[]{String.class, String.class});
 				setAttribute.invoke(exInstance, "GPSLatitude", convertDegToExifRational(lat));
 				setAttribute.invoke(exInstance, "GPSLatitudeRef", lat > 0 ? "N" : "S");
 				setAttribute.invoke(exInstance, "GPSLongitude", convertDegToExifRational(lon));
@@ -263,7 +267,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 					setAttribute.invoke(exInstance, "GPSAltitude", altString);
 					setAttribute.invoke(exInstance, "GPSAltitudeRef", alt < 0 ? "1" : "0");
 				}
-				Method saveAttributes = exClass.getMethod("saveAttributes", new Class[] {});
+				Method saveAttributes = exClass.getMethod("saveAttributes", new Class[]{});
 				saveAttributes.invoke(exInstance);
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -277,9 +281,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			try {
 				Class exClass = Class.forName("android.media.ExifInterface");
 
-				Constructor c = exClass.getConstructor(new Class[] { String.class });
+				Constructor c = exClass.getConstructor(new Class[]{String.class});
 				Object exInstance = c.newInstance(file.getAbsolutePath());
-				Method getAttributeInt = exClass.getMethod("getAttributeInt", new Class[] { String.class, Integer.TYPE });
+				Method getAttributeInt = exClass.getMethod("getAttributeInt", new Class[]{String.class, Integer.TYPE});
 				Integer it = (Integer) getAttributeInt.invoke(exInstance, "Orientation", 1);
 				orientation = it;
 			} catch (Exception e) {
@@ -292,15 +296,15 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		public int getBitmapRotation() {
 			int rotation = 0;
 			switch (getExifOrientation()) {
-			case 3:
-				rotation = 180;
-				break;
-			case 6:
-				rotation = 90;
-				break;
-			case 8:
-				rotation = 270;
-				break;
+				case 3:
+					rotation = 180;
+					break;
+				case 6:
+					rotation = 90;
+					break;
+				case 8:
+					rotation = 270;
+					break;
 			}
 			return rotation;
 		}
@@ -317,7 +321,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 
 		public String getSmallDescription(Context ctx) {
 
-			String time = AndroidUtils.formatDateTime(ctx,file.lastModified());
+			String time = AndroidUtils.formatDateTime(ctx, file.lastModified());
 			if (isPhoto()) {
 				return ctx.getString(R.string.recording_photo_description, "", time).trim();
 			}
@@ -346,11 +350,11 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			// API 8
 			if (mRegisterMediaButtonEventReceiver == null) {
 				mRegisterMediaButtonEventReceiver = AudioManager.class.getMethod("registerMediaButtonEventReceiver",
-						new Class[] { ComponentName.class });
+						new Class[]{ComponentName.class});
 			}
 			if (mUnregisterMediaButtonEventReceiver == null) {
 				mUnregisterMediaButtonEventReceiver = AudioManager.class.getMethod("unregisterMediaButtonEventReceiver",
-						new Class[] { ComponentName.class });
+						new Class[]{ComponentName.class});
 			}
 			/* success, this device will take advantage of better remote */
 			/* control event handling */
@@ -368,7 +372,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	public AudioVideoNotesPlugin(OsmandApplication app) {
 		this.app = app;
 		OsmandSettings settings = app.getSettings();
-		ApplicationMode.regWidget("audionotes", (ApplicationMode[])null);
+		ApplicationMode.regWidget("audionotes", (ApplicationMode[]) null);
 		AV_EXTERNAL_RECORDER = settings.registerBooleanPreference("av_external_recorder", false).makeGlobal();
 		AV_EXTERNAL_PHOTO_CAM = settings.registerBooleanPreference("av_external_cam", true).makeGlobal();
 		AV_VIDEO_FORMAT = settings.registerIntPreference("av_video_format", VIDEO_OUTPUT_MP4).makeGlobal();
@@ -457,7 +461,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 
 	@Override
 	public void registerMapContextMenuActions(final MapActivity mapActivity, final double latitude, final double longitude,
-			ContextMenuAdapter adapter, Object selectedObj) {
+											  ContextMenuAdapter adapter, Object selectedObj) {
 		adapter.item(R.string.recording_context_menu_arecord).icons(R.drawable.ic_action_micro_dark, R.drawable.ic_action_micro_light)
 				.listen(new OnContextMenuClick() {
 
@@ -556,9 +560,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	private void chooseDefaultAction(final double lat, final double lon, final MapActivity mapActivity) {
 		AccessibleAlertBuilder ab = new AccessibleAlertBuilder(mapActivity);
 		ab.setItems(
-				new String[] { mapActivity.getString(R.string.recording_context_menu_arecord),
+				new String[]{mapActivity.getString(R.string.recording_context_menu_arecord),
 						mapActivity.getString(R.string.recording_context_menu_vrecord),
-						mapActivity.getString(R.string.recording_context_menu_precord), }, new OnClickListener() {
+						mapActivity.getString(R.string.recording_context_menu_precord),}, new OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						int action = which == 0 ? AV_DEFAULT_ACTION_AUDIO : (which == 1 ? AV_DEFAULT_ACTION_VIDEO
@@ -619,14 +623,15 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	public void mapActivityPause(MapActivity activity) {
 		stopRecording(activity);
 	}
-	
+
 	@Override
 	public void mapActivityResume(MapActivity activity) {
-		this.activity = activity;;
-	    ((AudioManager)activity.getSystemService(Context.AUDIO_SERVICE)).registerMediaButtonEventReceiver(
-	    		new ComponentName(activity,MediaRemoteControlReceiver.class));
+		this.activity = activity;
+		;
+		((AudioManager) activity.getSystemService(Context.AUDIO_SERVICE)).registerMediaButtonEventReceiver(
+				new ComponentName(activity, MediaRemoteControlReceiver.class));
 	}
-	
+
 	public MapActivity getActivity() {
 		return activity;
 	}
@@ -675,7 +680,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 					runMediaRecorder(mapActivity, mr, f);
 				} catch (Exception e) {
 					logErr(e);
-                }
+				}
 			}
 
 			@Override
@@ -707,7 +712,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	private void logErr(Exception e) {
 		log.error("Error starting recorder ", e);
 		AccessibleToast.makeText(app, app.getString(R.string.recording_error) + " : " + e.getMessage(), Toast.LENGTH_LONG).show();
-    }
+	}
 
 	protected Camera openCamera() {
 		try {
@@ -778,18 +783,18 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 					int rotation = mapActivity.getWindowManager().getDefaultDisplay().getRotation();
 					int degrees = 0;
 					switch (rotation) {
-					case /* Surface.ROTATION_0 */0:
-						degrees = 0;
-						break;
-					case /* Surface.ROTATION_90 */1:
-						degrees = 90;
-						break;
-					case /* Surface.ROTATION_180 */2:
-						degrees = 180;
-						break;
-					case /* Surface.ROTATION_270 */3:
-						degrees = 270;
-						break;
+						case /* Surface.ROTATION_0 */ 0:
+							degrees = 0;
+							break;
+						case /* Surface.ROTATION_90 */ 1:
+							degrees = 90;
+							break;
+						case /* Surface.ROTATION_180 */ 2:
+							degrees = 180;
+							break;
+						case /* Surface.ROTATION_270 */ 3:
+							degrees = 270;
+							break;
 					}
 
 					// if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
@@ -822,51 +827,50 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 						// camera picture size:
 						List<Camera.Size> psps = parameters.getSupportedPictureSizes();
 						int index = AV_CAMERA_PICTURE_SIZE.get();
-						log.debug("takePhotoWithCamera() index=" + index );
-						if(index == AV_PHOTO_SIZE_DEFAULT)
-						{
+						log.debug("takePhotoWithCamera() index=" + index);
+						if (index == AV_PHOTO_SIZE_DEFAULT) {
 							index = cameraPictureSizeDefault;
 							log.debug("takePhotoWithCamera() Default value of picture size. Set index to cameraPictureSizeDefault. Now index="
-								+ index );
+									+ index);
 						}
 						Camera.Size selectedCamPicSize = psps.get(index);
 						parameters.setPictureSize(selectedCamPicSize.width, selectedCamPicSize.height);
 						log.debug("takePhotoWithCamera() set Picture size: width=" + selectedCamPicSize.width
-							+ " height=" + selectedCamPicSize.height );
-						
+								+ " height=" + selectedCamPicSize.height);
+
 						// camera focus type:
 						boolean autofocus = true;
 						// boolean autofocus = !Boolean.parseBoolean(parameters.get("auto-exposure-lock-supported"));
 						parameters.setGpsLatitude(lat);
 						parameters.setGpsLongitude(lon);
 						switch (AV_CAMERA_FOCUS_TYPE.get()) {
-						case AV_CAMERA_FOCUS_HIPERFOCAL:
-							parameters.setFocusMode(Parameters.FOCUS_MODE_FIXED);
-							autofocus = false;
-							log.info("Osmand:AudioNotes set camera FOCUS_MODE_FIXED");
-							break;
-						case AV_CAMERA_FOCUS_EDOF:
-							parameters.setFocusMode(Parameters.FOCUS_MODE_EDOF);
-							autofocus = false;
-							log.info("Osmand:AudioNotes set camera FOCUS_MODE_EDOF");
-							break;
-						case AV_CAMERA_FOCUS_INFINITY:
-							parameters.setFocusMode(Parameters.FOCUS_MODE_INFINITY);
-							autofocus = false;
-							log.info("Osmand:AudioNotes set camera FOCUS_MODE_INFINITY");
-							break;
-						case AV_CAMERA_FOCUS_MACRO:
-							parameters.setFocusMode(Parameters.FOCUS_MODE_MACRO);
-							log.info("Osmand:AudioNotes set camera FOCUS_MODE_MACRO");
-							break;
-						case AV_CAMERA_FOCUS_CONTINUOUS:
-							parameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
-							log.info("Osmand:AudioNotes set camera FOCUS_MODE_CONTINUOUS_PICTURE");
-							break;
-						default:
-							parameters.setFocusMode(Parameters.FOCUS_MODE_AUTO);
-							log.info("Osmand:AudioNotes set camera FOCUS_MODE_AUTO");
-							break;
+							case AV_CAMERA_FOCUS_HIPERFOCAL:
+								parameters.setFocusMode(Parameters.FOCUS_MODE_FIXED);
+								autofocus = false;
+								log.info("Osmand:AudioNotes set camera FOCUS_MODE_FIXED");
+								break;
+							case AV_CAMERA_FOCUS_EDOF:
+								parameters.setFocusMode(Parameters.FOCUS_MODE_EDOF);
+								autofocus = false;
+								log.info("Osmand:AudioNotes set camera FOCUS_MODE_EDOF");
+								break;
+							case AV_CAMERA_FOCUS_INFINITY:
+								parameters.setFocusMode(Parameters.FOCUS_MODE_INFINITY);
+								autofocus = false;
+								log.info("Osmand:AudioNotes set camera FOCUS_MODE_INFINITY");
+								break;
+							case AV_CAMERA_FOCUS_MACRO:
+								parameters.setFocusMode(Parameters.FOCUS_MODE_MACRO);
+								log.info("Osmand:AudioNotes set camera FOCUS_MODE_MACRO");
+								break;
+							case AV_CAMERA_FOCUS_CONTINUOUS:
+								parameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+								log.info("Osmand:AudioNotes set camera FOCUS_MODE_CONTINUOUS_PICTURE");
+								break;
+							default:
+								parameters.setFocusMode(Parameters.FOCUS_MODE_AUTO);
+								log.info("Osmand:AudioNotes set camera FOCUS_MODE_AUTO");
+								break;
 						}
 						// parameters.setFocusMode(Parameters.FOCUS_MODE_FIXED);
 						// parameters.set("auto-exposure-lock", "true");
@@ -954,7 +958,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			}
 		});
 	}
-	
+
 	@Override
 	public void addMyPlacesTab(FavoritesActivity favoritesActivity, List<TabItem> mTabs, Intent intent) {
 		if (getAllRecordings().size() > 0) {
@@ -997,7 +1001,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		}
 		recordings.registerObject(r.lat, r.lon, r);
 		recordingByFileName.put(f.getName(), r);
-        return true;
+		return true;
 	}
 
 	@Override
@@ -1023,33 +1027,33 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			File[] files = avPath.listFiles();
 			if (files != null) {
 				for (File f : files) {
-                    indexFile(registerNew, f);
-                }
+					indexFile(registerNew, f);
+				}
 			}
 		}
 		return null;
 	}
 
-    private void indexFile(boolean registerInGPX, File f) {
-        if (f.getName().endsWith(THREEGP_EXTENSION) || f.getName().endsWith(MPEG4_EXTENSION)
-                || f.getName().endsWith(IMG_EXTENSION)) {
-            boolean newFileIndexed = indexSingleFile(f);
-            if (newFileIndexed && registerInGPX) {
-                Recording rec = recordingByFileName.get(f.getName());
-                if (rec != null && 
-                		(app.getSettings().SAVE_TRACK_TO_GPX.get()
-                				|| app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get())
-                        && OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) {
-                    String name = f.getName();
-                    SavingTrackHelper savingTrackHelper = app.getSavingTrackHelper();
-                    savingTrackHelper.insertPointData(rec.lat, rec.lon, System.currentTimeMillis(), name);
-                }
-            }
+	private void indexFile(boolean registerInGPX, File f) {
+		if (f.getName().endsWith(THREEGP_EXTENSION) || f.getName().endsWith(MPEG4_EXTENSION)
+				|| f.getName().endsWith(IMG_EXTENSION)) {
+			boolean newFileIndexed = indexSingleFile(f);
+			if (newFileIndexed && registerInGPX) {
+				Recording rec = recordingByFileName.get(f.getName());
+				if (rec != null &&
+						(app.getSettings().SAVE_TRACK_TO_GPX.get()
+								|| app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get())
+						&& OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) {
+					String name = f.getName();
+					SavingTrackHelper savingTrackHelper = app.getSavingTrackHelper();
+					savingTrackHelper.insertPointData(rec.lat, rec.lon, System.currentTimeMillis(), name);
+				}
+			}
 
-        }
-    }
+		}
+	}
 
-    public DataTileManager<Recording> getRecordings() {
+	public DataTileManager<Recording> getRecordings() {
 		return recordings;
 	}
 
@@ -1078,7 +1082,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	public Class<? extends Activity> getSettingsActivity() {
 		return SettingsAudioVideoActivity.class;
 	}
-	
+
 
 	@Override
 	public void onMapActivityExternalResult(int requestCode, int resultCode, Intent data) {
@@ -1096,8 +1100,6 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	}
 
 
-
-	
 	public Collection<Recording> getAllRecordings() {
 		return recordingByFileName.values();
 	}
@@ -1215,7 +1217,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 				FileOutputStream fos = new FileOutputStream(pictureFile);
 				fos.write(data);
 				fos.close();
-                indexFile(true, pictureFile);
+				indexFile(true, pictureFile);
 				dlg.dismiss();
 				// play sound after photo - sound file must be loaded at this time:
 				if (AV_PHOTO_PLAY_SOUND.get()) {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
index 01e349d6a5..d0db081520 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
@@ -97,7 +97,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 			LayoutInflater inflater = getActivity().getLayoutInflater();
 			View view = inflater.inflate(R.layout.note, null, false);
 
-			getNoteView(recording, view, getActivity(), plugin);
+			getNoteView(recording, view, getActivity());
 			view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -111,7 +111,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 				public void onClick(View v) {
 					getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, 
 							new PointDescription(PointDescription.POINT_TYPE_NOTE, 
-							(recording.getName() != null) ? recording.getName() : recording.getDescription(getActivity())), true,
+							recording.getName(getActivity())), true,
 							recording); //$NON-NLS-1$
 					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}
@@ -121,18 +121,10 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 	}
 
 	public static void getNoteView(final AudioVideoNotesPlugin.Recording recording, View view,
-								   final Context ctx, final AudioVideoNotesPlugin plugin) {
-		String name = recording.getName();
+								   final Context ctx) {
+		String name = recording.getName(ctx);
 		TextView nameText = ((TextView) view.findViewById(R.id.name));
-		if (!name.isEmpty()) {
-			nameText.setText(name);
-		} else if (recording.isAudio()) {
-			nameText.setText(R.string.audio);
-		} else if (recording.isVideo()) {
-			nameText.setText(R.string.video);
-		} else if (recording.isPhoto()) {
-			nameText.setText(R.string.photo);
-		}
+		nameText.setText(name);
 		((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(ctx));
 
 		ImageView icon = (ImageView) view.findViewById(R.id.icon);
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index 59e82b55ef..8428aa4118 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -92,7 +92,7 @@ public class NotesFragment extends ListFragment {
 			}
 
 			final AudioVideoNotesPlugin.Recording recording = getItem(position);
-			DashAudioVideoNotesFragment.getNoteView(recording, row, getActivity(), plugin);
+			DashAudioVideoNotesFragment.getNoteView(recording, row, getActivity());
 			row.findViewById(R.id.play).setVisibility(View.GONE);
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			options.setOnClickListener(new View.OnClickListener() {
@@ -113,7 +113,7 @@ public class NotesFragment extends ListFragment {
 
 	private void showOnMap(Recording recording) {
 		getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, 
-				new PointDescription(PointDescription.POINT_TYPE_NOTE, recording.getName()), true,
+				new PointDescription(PointDescription.POINT_TYPE_NOTE, recording.getName(getActivity())), true,
 				recording); //$NON-NLS-1$
 		MapActivity.launchMapActivityMoveToTop(getActivity());
 	}
@@ -223,7 +223,7 @@ public class NotesFragment extends ListFragment {
 			hash = fileName.substring(hashInd, fileName.length());
 		}
 
-		editText.setText(recording.getName());
+		editText.setText(recording.getName(getActivity()));
 		InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
 		imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
 		builder.setNegativeButton(R.string.default_buttons_cancel, null);

From 6074bd8576e16aa6e51cd9fb8af6e18fb2a5f378 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 25 Feb 2015 19:16:11 +0200
Subject: [PATCH 21/45] Updated all tracks in my places

---
 OsmAnd/res/layout/available_gpx.xml           |  2 +-
 .../plus/activities/AvailableGPXFragment.java | 71 +++++++++++--------
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index 1de3b2ecab..18b3c01786 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -30,7 +30,7 @@
 
 	</LinearLayout>
 
-	<LinearLayout
+	<LinearLayout android:id="@+id/on_map_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:background="?attr/card_bg"
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 524db90c62..86390b2c2c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -20,8 +20,6 @@ import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.GpxSelectionHelper;
-import net.osmand.plus.NavigationService;
-import net.osmand.plus.OsmAndTaskManager;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
@@ -29,7 +27,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
-import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.util.Algorithms;
@@ -70,7 +67,6 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -83,10 +79,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	//	public static final int ACTION_ID = 0;
 //	protected static final int DELETE_ACTION_ID = 1;
 	private boolean selectionMode = false;
-	private List<GpxInfo> selectedItems = new ArrayList<GpxInfo>();
+	private List<GpxInfo> selectedItems = new ArrayList<>();
 	private ActionMode actionMode;
 	private LoadGpxTask asyncLoader;
 	private GpxIndexesAdapter listAdapter;
+	private ShowedOnMapAdapter showOnMapAdapter;
 	MessageFormat formatMb = new MessageFormat("{0, number,##.#} MB", Locale.US);
 	private LoadLocalIndexDescriptionTask descriptionLoader;
 	private ContextMenuAdapter optionsMenuAdapter;
@@ -122,19 +119,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 
 		updateCurrentTrack(getView());
-		updateShowedOnMapTracks();
-
 	}
 
-	private void updateShowedOnMapTracks() {
-		View v = getView();
-		if (v == null) {
-			return;
-		}
-
+	private void createShowedOnMapsView(View v) {
+		v.findViewById(R.id.on_map_layout).setVisibility(View.GONE);
 		ListView onMap = (ListView)v.findViewById(R.id.gpx_on_map);
-		onMap.setAdapter(new ShowedOnMapAdapter(getActivity(), R.layout.dash_gpx_track_item));
-
+		showOnMapAdapter = new ShowedOnMapAdapter(getActivity(), R.layout.dash_gpx_track_item);
+		onMap.setAdapter(showOnMapAdapter);
 	}
 
 	@Override
@@ -184,6 +175,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				MapActivity.launchMapActivityMoveToTop(getActivity());
 			}
 		});
+
+		createShowedOnMapsView(v);
 		return v;
 	}
 
@@ -641,24 +634,36 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		protected void onPreExecute() {
 			((ActionBarActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(true);
 			listAdapter.clear();
+			if (showOnMapAdapter != null) {
+				showOnMapAdapter.clear();
+			}
 		}
 
 		@Override
 		protected void onProgressUpdate(GpxInfo... values) {
 			for (GpxInfo v : values) {
 				listAdapter.addLocalIndexInfo(v);
+				if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null){
+					showOnMapAdapter.add(v);
+				}
 			}
+			showOnMapAdapter.notifyDataSetChanged();
 			listAdapter.notifyDataSetChanged();
 		}
 
 		public void setResult(List<GpxInfo> result) {
 			this.result = result;
 			listAdapter.clear();
+			showOnMapAdapter.clear();
 			if (result != null) {
 				for (GpxInfo v : result) {
 					listAdapter.addLocalIndexInfo(v);
+					if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null){
+						showOnMapAdapter.add(v);
+					}
 				}
 				listAdapter.notifyDataSetChanged();
+				showOnMapAdapter.notifyDataSetChanged();
 				onPostExecute(result);
 			}
 		}
@@ -685,7 +690,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		private void loadGPXData(File mapPath, List<GpxInfo> result, LoadGpxTask loadTask) {
 			if (mapPath.canRead()) {
-				List<GpxInfo> progress = new ArrayList<GpxInfo>();
+				List<GpxInfo> progress = new ArrayList<>();
 				loadGPXFolder(mapPath, result, loadTask, progress, "");
 				if (!progress.isEmpty()) {
 					loadTask.loadFile(progress.toArray(new GpxInfo[progress.size()]));
@@ -723,8 +728,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 	protected class GpxIndexesAdapter extends OsmandBaseExpandableListAdapter implements Filterable {
 
-		Map<String, List<GpxInfo>> data = new LinkedHashMap<String, List<GpxInfo>>();
-		List<String> category = new ArrayList<String>();
+		Map<String, List<GpxInfo>> data = new LinkedHashMap<>();
+		List<String> category = new ArrayList<>();
 		int warningColor;
 		int okColor;
 		int defaultColor;
@@ -741,11 +746,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 
 		public Set<GpxInfo> getSelectedGpx() {
-			Set<GpxInfo> originalSelectedItems = new HashSet<GpxInfo>();
+			Set<GpxInfo> originalSelectedItems = new HashSet<>();
 			for (List<GpxInfo> l : data.values()) {
 				if (l != null) {
 					for (GpxInfo g : l) {
-						boolean add = false;
+						boolean add;
 						if (g.gpx != null && g.gpx.showCurrentTrack) {
 							add = selectedGpxHelper.getSelectedCurrentRecordingTrack() != null;
 						} else {
@@ -1080,7 +1085,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			int total = 0;
 			for (GpxInfo info : params) {
 				if (!isCancelled() && (info.gpx == null || !info.gpx.showCurrentTrack)) {
-					boolean successfull = false;
+					boolean successfull;
 					successfull = Algorithms.removeAllFiles(info.file);
 					total++;
 					if (successfull) {
@@ -1149,7 +1154,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		@Override
 		protected void onPreExecute() {
-			((ActionBarActivity) getActivity()).setProgressBarIndeterminateVisibility(true);
+			getActivity().setProgressBarIndeterminateVisibility(true);
 		}
 
 		@Override
@@ -1216,7 +1221,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				results.count = 1;
 			} else {
 				String cs = constraint.toString().toLowerCase();
-				List<GpxInfo> res = new ArrayList<GpxInfo>();
+				List<GpxInfo> res = new ArrayList<>();
 				for (GpxInfo r : raw) {
 					if (r.getName().toLowerCase().indexOf(cs) != -1) {
 						res.add(r);
@@ -1234,10 +1239,15 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			if (results.values != null) {
 				synchronized (listAdapter) {
 					listAdapter.clear();
+					showOnMapAdapter.clear();
 					for (GpxInfo i : ((List<GpxInfo>) results.values)) {
 						listAdapter.addLocalIndexInfo(i);
+						if (selectedGpxHelper.getSelectedFileByName(i.getFileName()) != null){
+							showOnMapAdapter.add(i);
+						}
 					}
 				}
+				showOnMapAdapter.notifyDataSetChanged();
 				listAdapter.notifyDataSetChanged();
 				if (constraint != null && constraint.length() > 3) {
 					collapseTrees(10);
@@ -1406,12 +1416,15 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			v.findViewById(R.id.show_on_map).setVisibility(View.GONE);
 			v.findViewById(R.id.stop).setVisibility(View.GONE);
 			v.findViewById(R.id.divider).setVisibility(View.GONE);
-			String description = GpxUiHelper.getDescription(getMyApplication(), gpxInfo.gpx, gpxInfo.file, true);
-			int startindex = description.indexOf(">");
-			int endindex = description.indexOf("</font>");
-			String distnace = description.substring(startindex + 1, endindex);
-			((TextView) v.findViewById(R.id.distance)).
-					setText(distnace);
+			if (gpxInfo.gpx != null) {
+				String description = GpxUiHelper.getDescription(getMyApplication(), gpxInfo.gpx, gpxInfo.file, true);
+				int startindex = description.indexOf(">");
+				int endindex = description.indexOf("</font>");
+				String distnace = description.substring(startindex + 1, endindex);
+				((TextView) v.findViewById(R.id.distance)).
+						setText(distnace);
+
+			}
 
 			CompoundButton check = (CompoundButton)v.findViewById(R.id.check);
 			check.setVisibility(View.VISIBLE);

From 5d86a19383129317be56c72f5c6b6ad89659c1c4 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Wed, 25 Feb 2015 14:13:01 +0100
Subject: [PATCH 22/45] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 377177605b..c13d9b13fd 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1657,7 +1657,7 @@
     <string name="gpx_selection_route_points">%1$s \n路線標點 %2$s</string>
     <string name="gpx_selection_points">%1$s \n個標點</string>
     <string name="gpx_selection_track">%1$s \n軌跡 %2$s</string>
-    <string name="gpx_available_current_track">正在錄制的軌跡</string>
+    <string name="gpx_available_current_track">現在正在錄製軌跡</string>
     <string name="loading_smth">正在載入 %1$s …</string>
     <string name="map_widget_plain_time">目前時間</string>
     <string name="selected_gpx_info_show">\n\n長按在地圖上查看</string>
@@ -1936,6 +1936,6 @@
 
 	<string name="plugin_touringview_descr4">此檢視可以在這裡經由再次取消啟動，或透過 \'地圖式樣\' 之下的 \'組態地圖\' 這兩者中的任何一個更改而恢復它。</string>
 	<string name="rename_failed">重新命名失敗。</string>
-	<string name="currently_recording_track">現在錄制的軌跡</string>
+	<string name="currently_recording_track">現在正在錄製軌跡</string>
 	<string name="back_to_map">返回地圖</string>
 	</resources>

From ebffbdd2cf8b16de18622ba5a37b119a5d8cad42 Mon Sep 17 00:00:00 2001
From: elPresidento <ludek.m@gmail.com>
Date: Wed, 25 Feb 2015 14:02:27 +0100
Subject: [PATCH 23/45] Translated using Weblate (Czech)

Currently translated at 98.6% (1634 of 1656 strings)
---
 OsmAnd/res/values-cs/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index c9be269ee7..9316e6ec5f 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1813,7 +1813,7 @@ s často kladenými otázkami.</string>
     <string name="rendering_value__name">Výchozí</string>
 	<string name="gps_status">GPS stav</string>
     <string name="version_settings_descr">Stáhnout vývojové verze</string>
-    <string name="version_settings">Verze</string>
+    <string name="version_settings">Vývojové verze</string>
     <string name="rendering_attr_streetLighting_name">Pouliční osvětlení</string>
     <string name="proxy_pref_title">Proxy</string>
     <string name="proxy_pref_descr">Nastavit internetové proxy připojení</string>
@@ -1854,4 +1854,5 @@ s často kladenými otázkami.</string>
     <string name="audio">Audio</string>
 	<string name="video">Video</string>
 	<string name="photo">Fotografie</string>
+	<string name="watch">Zobrazit</string>
 	</resources>

From 501e928450488898ecf496e335f9680f4d7cad11 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 25 Feb 2015 14:36:58 +0100
Subject: [PATCH 24/45] Translated using Weblate (Danish)

Currently translated at 100.0% (1656 of 1656 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 94672db692..8981706f44 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1147,7 +1147,7 @@
 	<string name="new_route_calculated_dist">Ny rute beregnet, afstand</string>
 	<string name="arrived_at_destination">Ankommet til destinationen</string>
 	<string name="invalid_locations">Koordinaterne er ugyldige!</string>
-	<string name="go_back_to_osmand">Tilbage til OsmAnd-kort</string>
+	<string name="go_back_to_osmand">Tilbage til OsmAnd-kortet</string>
 	<string name="close">Luk</string>
 	<string name="loading_data">Indlæser data…</string>
 	<string name="reading_indexes">Læser lokale data…</string>

From 640f6995ad26b43cabdf3d71d46624a3e59ac40c Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Wed, 25 Feb 2015 14:12:29 +0100
Subject: [PATCH 25/45] Translated using Weblate (Italian)

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

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index ee14a43284..f869148e45 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2109,4 +2109,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="plugin_touringview_descr2">Questa visualizzazione fornisce, per ogni livello di zoom, il massimo dei dettagli di viaggio disponibili nei dati della mappa (particolari delle strade, sentieri e segni di orientamento). Rappresenta anche chiaramente tutte le strade ambigue tramite la colorazione distintiva, ciò risulta utile per esempio guidando autoveicoli di grandi dimensioni.</string>
 	<string name="plugin_touringview_descr4">Questa visualizzazione può essere ripristinata sia disattivandola nuovamente da qui che cambiando lo \'Stile della mappa\' in \' Configura mappa\' come desiderato.</string>
 	<string name="plugin_touringview_descr1">Attivando questa visualizzazione lo stile della mappa cambierà in \'Vista turistica\', questa è una visualizzazione particolarmente molto dettagliata per i turisti e autisti professionali.</string>
+	<string name="back_to_map">Torna alla mappa</string>
+	<string name="rename_failed">Rinominazione fallita.</string>
 	</resources>

From e63f1f4ee168642c01e561ea870f9bf5a68d78cb Mon Sep 17 00:00:00 2001
From: Jur Kis <atvejis@gmail.com>
Date: Wed, 25 Feb 2015 15:48:25 +0100
Subject: [PATCH 26/45] Translated using Weblate (Lithuanian)

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

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 792436ebde..6acfec0345 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1933,4 +1933,6 @@
 	<string name="export">Eksportuoti</string>
 	<string name="days_behind">dienas atsilikęs</string>
 	<string name="plugin_nautical_descr1">Aktyvavus šį rodinį bus rodomas jūrlapis su jūriniais navigaciniais ženklais ir simboliais.</string>
+	<string name="rename_failed">Nepavyko pervardinti.</string>
+	<string name="back_to_map">Grįžti į žemėlapį</string>
 	</resources>

From afdb2fd88e8f0de48e6a8d15fbdf77b20856b708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D1=88=D0=B0=20=D0=9F=D0=B5=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=9B?= <salepetronije@gmail.com>
Date: Wed, 25 Feb 2015 14:58:29 +0100
Subject: [PATCH 27/45] Translated using Weblate (Serbian)

Currently translated at 22.8% (379 of 1656 strings)
---
 OsmAnd/res/values-sr/strings.xml | 53 ++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 6b8dbf8ff9..32420b2515 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -226,12 +226,12 @@
     <string name="rendering_value__name">Подразумевано</string>
 	<string name="rendering_value_default_name">Подразумевано</string>
     <string name="traffic_warning_pedestrian">Пешачки прелаз</string>
-	<string name="show_pedestrian_warnings">Прикажи пешачке прелазе</string>
-    <string name="dash_download_msg_none">Да ли желите да преузмете мапе за коришћење ван мреже?</string>
-    <string name="dash_download_msg">Преузели сте %1$s мапа</string>
-    <string name="dash_download_new_one">Преузми нову мапу</string>
+	<string name="show_pedestrian_warnings">Приказуј пешачке прелазе</string>
+    <string name="dash_download_msg_none">Да ли желите да преузмете карте за коришћење ван мреже?</string>
+    <string name="dash_download_msg">Преузели сте %1$s карата</string>
+    <string name="dash_download_new_one">Преузми нову карту</string>
     <string name="dash_download_manage">Управљајте</string>
-    <string name="map_locale">Језик мапе</string>
+    <string name="map_locale">Језик карте</string>
     <string name="application_dir_change_warning2">Да ли желите да Османд умножи и своје податке на ново место? Изаберите „Не“ да би Османд само направио и користио нову фасциклу.</string>
     <string name="navigate_point_zone">Област</string>
     <string name="download_tab_downloads">Сва преузимања</string>
@@ -245,13 +245,13 @@
     <string name="osmo_use_https_descr">Користи безбедну везу са сервером</string>
     <string name="osmo_use_https">Користи ХТТПС</string>
 	<string name="advanced_settings">Напредно</string>
-	<string name="map_update">Доступне су надоградње %1$s мапа</string>
+	<string name="map_update">Доступне су надоградње %1$s карата</string>
 	<string name="search_for">Потражи</string>
-	<string name="show_map">ПРИКАЖИ МАПУ</string>
+	<string name="show_map">ПРИКАЖИ КАРТУ</string>
 	<string name="show_all">ПРИКАЖИ СВЕ</string>
 	<string name="coordinates">Координате</string>
 	<string name="wake_on_voice_never">Никад</string>
-    <string name="select_impassable_road">Означи на мапи…</string>
+    <string name="select_impassable_road">Означи на карти…</string>
     <string name="rendering_category_hide">Сакриј</string>
     <string name="rendering_category_details">Појединости</string>
     <string name="hide_all_waypoints">Уклони све</string>
@@ -341,7 +341,7 @@
     <string name="traffic_warning_stop">Знак стоп</string>
     <string name="speak_pedestrian">Најављуј прешачке прелазе</string>
     <string name="rendering_attr_roadStyle_name">Врста пута</string>
-    <string name="avoid_roads_msg">Можете да измените путању избором путева за избегавање</string>
+    <string name="avoid_roads_msg">Можете да изаберете заменску путању избором путева за избегавање</string>
     <string name="navigation_over_track">Да ли започети навођење по стази?</string>
 	<string name="rendering_value_orange_name">Наранџаста</string>
     <string name="traffic_warning_railways">Пружни прелаз</string>
@@ -356,4 +356,39 @@
     <string name="navigate_point_northing">Географска ширина</string>
     <string name="navigate_point_easting">Географска дужина</string>
     <string name="error_avoid_specific_road">Нисам пронашао заобилазнице</string>
+    <string name="rename_failed">Преименовање није успело.</string>
+	<string name="currently_recording_track">Стаза која се тренутно снима</string>
+	<string name="back_to_map">Назад на карту</string>
+	<string name="plugin_nautical_descr1">Прелазак прегледа карте приказује поморски изглед, чиме се приказују све поморске ознаке навођења и графички знаци.</string>
+	<string name="plugin_nautical_descr2">"Датотека карте која садржи све опште поморске знаке је доступна у виду  једног преузимања и назива се „Светске поморске карте“."</string>
+	<string name="plugin_nautical_descr3">Преглед може да се врати на стари његовим искључивањем овде, или изменом „Начина приказа карте“ под „Подесите карту“.</string>
+
+	<string name="plugin_ski_descr1">Покретање ове измене мења преглед карте на „Зима и скијање“, које приказује у положеном погледу особине предела и зимске услове.</string>
+	<string name="plugin_ski_descr2">"Светска карта приказује сва скијалишта и скијашке стазе у овом прегледу је доступна преузимањем  „Светске скијашке карте“."</string>
+	<string name="audio">Звук</string>
+	<string name="video">Видео</string>
+	<string name="photo">Слика</string>
+	<string name="share_note">Дели белешку</string>
+	<string name="rename_recording">Преименуј снимак</string>
+    <string name="location_on_map">Географски положај:\nШирина %1$s↵\nДужина %2$s</string>
+	<string name="watch">Прегледај</string>
+	<string name="notes">Бележница</string>
+	<string name="online_map">Карта са мреже</string>
+	<string name="roads_only">Само путеви</string>
+    <string name="free">"Слободно %1$s "</string>
+	<string name="device_memory">Складиште уређаја</string>
+    <string name="plugin_ski_name">Преглед скијашке карте</string>
+    <string name="plugin_nautical_name">Преглед поморске карте</string>
+    <string name="world_ski_missing">Да би се приказивала скијашка карта, нарочита карта за преглед ван мреже треба да се преузме</string>
+    <string name="nautical_maps_missing">Да би се приказивале поморске карте, нарочита карта за преглед ван мреже треба да се преузме</string>
+	<string name="edit_group">Уреди скуп</string>
+    <string name="remove_the_tag">УКЛОНИ ОЗНАКУ</string>
+    <string name="gps_status">Стање ГПС-а</string>
+    <string name="version_settings_descr">Преузми ноћне изградње</string>
+    <string name="version_settings">Изградње</string>
+    <string name="points">Тачке</string>
+    <string name="tracks">Стазе</string>
+    <string name="my_location">Мој положај</string>
+    <string name="osm_editing_manage">Управљајте</string>
+    <string name="home_button">Матица</string>
     </resources>

From 391eb39cfbdd5c4112d09ba6f21e0fa467aff18e Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Wed, 25 Feb 2015 18:08:33 +0100
Subject: [PATCH 28/45] Translated using Weblate (Slovak)

Currently translated at 99.9% (1655 of 1656 strings)
---
 OsmAnd/res/values-sk/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index b872ccd222..b90f71d7d0 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2090,4 +2090,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="location_on_map">Umiestnenie:\n Šírka %1$s\n Dĺžka %2$s</string>
 	<string name="watch">Zobraziť</string>
 	<string name="days_behind">dní pozadu</string>
+	<string name="rename_failed">Premenovanie zlyhalo.</string>
+	<string name="back_to_map">Späť na mapu</string>
 	</resources>

From b98260821e810d66314c8cfdb2677e0e31109a28 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Wed, 25 Feb 2015 14:00:44 +0100
Subject: [PATCH 29/45] Translated using Weblate (Swedish)

Currently translated at 99.4% (1647 of 1656 strings)
---
 OsmAnd/res/values-sv/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 4813eb558c..1abae6e322 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1835,4 +1835,7 @@
 
 	<string name="days_behind">dagar efter</string>
 	<string name="watch">Visa</string>
+	<string name="rename_failed">Namnbytet misslyckades.</string>
+	<string name="currently_recording_track">Spelar för tillfället in spår</string>
+	<string name="back_to_map">Tillbaka till kartan</string>
 	</resources>

From b3236644072bea6e56eaeb827770e312ee3a73fb Mon Sep 17 00:00:00 2001
From: Nicolas Palix <nicolas.palix@gmail.com>
Date: Wed, 25 Feb 2015 13:56:37 +0100
Subject: [PATCH 30/45] Translated using Weblate (French)

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

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index f41737ed74..6be03ac8fd 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -218,7 +218,7 @@
 	<string name="poi_marketplace">Marché</string>
 	<string name="poi_massage">Massage</string>
 	<string name="poi_memorial">Mémorial</string>
-	<string name="poi_military">Zone militaire</string>
+	<string name="poi_military">Militaire</string>
 	<string name="poi_mine_historic">Mine abandonnée</string>
 	<string name="poi_mineshaft">Puits de mine</string>
 	<string name="poi_miniature_golf">Golf miniature</string>

From fd8402cf18464812fcb8914daddfe00266e4cc3a Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Wed, 25 Feb 2015 18:37:21 +0100
Subject: [PATCH 31/45] Update AudioVideoNotesPlugin.java

---
 .../src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 6f1541153c..2d4310aaee 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -976,9 +976,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		}
 		Recording r = new Recording(f);
 		String encodeName = f.getName();
-		int i = encodeName.indexOf('-');
+		int i = encodeName.lastIndexOf('_');
 		if (i > 0) {
-			encodeName = encodeName.substring(0, i);
+			encodeName = encodeName.substring(i + 1);
 		}
 		i = encodeName.indexOf('.');
 		if (i > 0) {

From 077a8b97a4197492d2c82beee63de7284338721c Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 25 Feb 2015 19:09:18 +0100
Subject: [PATCH 32/45] Translated using Weblate (Danish)

Currently translated at 100.0% (1658 of 1658 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 8981706f44..f31163ad4e 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1946,4 +1946,6 @@
 	<string name="rename_failed">Fejl ved omdøbning.</string>
 	<string name="back_to_map">Tilbage til kortet</string>
 	<string name="currently_recording_track">Aktuelt optagelsesspor</string>
+	<string name="showed_on_map">Vist på kort</string>
+	<string name="turn_off_all">Deaktiver alle</string>
 	</resources>

From a25093290bc9591280b89e59517bde24d73fa513 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Wed, 25 Feb 2015 20:26:28 +0100
Subject: [PATCH 33/45] Translated using Weblate (French)

Currently translated at 100.0% (1658 of 1658 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 eba6d469fc..094fd2b63a 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1962,4 +1962,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="rename_failed">Échec du renommage.</string>
 	<string name="currently_recording_track">Enregistrement de l\'itinéraire en cours</string>
 	<string name="back_to_map">Retour à la carte</string>
+	<string name="turn_off_all">Tout éteindre</string>
+	<string name="showed_on_map">Affiché sur la carte</string>
 	</resources>

From c65be37ad4bfc9836e099295a47ae39f3c68a0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= <chobkwon@gmail.com>
Date: Thu, 26 Feb 2015 00:22:52 +0100
Subject: [PATCH 34/45] Translated using Weblate (Korean)

Currently translated at 100.0% (1658 of 1658 strings)
---
 OsmAnd/res/values-ko/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index c37867f841..d7d3e64d82 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -2174,4 +2174,9 @@
 
 	<string name="location_on_map">위치:
 \n위도 %1$s\n경도 %2$s</string>
+	<string name="turn_off_all">모두 끄기</string>
+	<string name="showed_on_map">지도에서 보기</string>
+	<string name="rename_failed">이름 바꾸기 실패 했습니다.</string>
+	<string name="currently_recording_track">현재 기록중인 트랙</string>
+	<string name="back_to_map">지도로 돌아가기</string>
 	</resources>

From d5cb4e3c005d2986236cf373d47208649eeff3d8 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Thu, 26 Feb 2015 01:19:13 +0100
Subject: [PATCH 35/45] Translated using Weblate (Italian)

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

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index f869148e45..f5de5c0ab2 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2111,4 +2111,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="plugin_touringview_descr1">Attivando questa visualizzazione lo stile della mappa cambierà in \'Vista turistica\', questa è una visualizzazione particolarmente molto dettagliata per i turisti e autisti professionali.</string>
 	<string name="back_to_map">Torna alla mappa</string>
 	<string name="rename_failed">Rinominazione fallita.</string>
+	<string name="turn_off_all">Spegni tutti</string>
+	<string name="showed_on_map">Visualizzato sulla mappa</string>
+	<string name="days_behind">giorni fa</string>
+	<string name="currently_recording_track">Traccia attualmente in registrazione</string>
 	</resources>

From 55194606d05cd504ba6885aedfd3a163abbfd7a3 Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Thu, 26 Feb 2015 02:08:37 +0100
Subject: [PATCH 36/45] Translated using Weblate (Sardinian)

Currently translated at 100.0% (1658 of 1658 strings)
---
 OsmAnd/res/values-sc/strings.xml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 92295f8974..efa12a4487 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -545,8 +545,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="rendering_attr_hideText_name">Cua su testu</string>
     <string name="rendering_attr_hideWoodScrubs_name">Cua padentes e buschedos</string>
     <string name="rendering_attr_buildings15zoom_name">Edifìtzios dae su zoom 15</string>
-    <string name="rendering_attr_moreDetailed_name">Prus detalliau (a sa minuda)</string>
-    <string name="rendering_attr_lessDetailed_name">Detalliau de mancu</string>
+    <string name="rendering_attr_moreDetailed_name">Prus minujas (a sa minuda)</string>
+    <string name="rendering_attr_lessDetailed_name">Minujas de mancu</string>
     <string name="rendering_attr_hideAccess_name">Cua sas restritziones de atzessu</string>
     <string name="rendering_attr_showAccess_name">Ammustra sas restritziones de atzessu</string>
     <string name="rendering_attr_showSurfaceGrade_name">Ammustra sa calidade de sas istradas</string>
@@ -985,7 +985,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="poi_action_succeded_template">Atzione {0} reseddida cumpridamente.</string>
 	<string name="first_time_msg">Gratzias pro s\'impreu de OsmAnd. Pro meda de sas caraterìsticas de s\'àplicu tènes bisongiu de datos locales sena lìnia, chi podent èssere icarrigadas dae \'Impostaduras\'→\'Amministra sos documentos de sas mapas\'. A pustis at a èssere possìbile ammustrare mapas, chircare indirìtzos, PDI, e agatare trasportos pùblicos.</string>    
 	<string name="basemap_was_selected_to_download">Sa mapa de base est pedida pro su funtzionamentu curretu de s\'àplicu e est idada ischertada pro s\'iscarrigamentu.</string>
-	<string name="osmand_extra_settings_description">Ammustra sas impostaduras pro sa cunfiguratzione avantzada de sa mapa (comente aumentare sos minujos) e calicunas de dispositivos dislindados.</string>
+	<string name="osmand_extra_settings_description">Ammustra sas impostaduras pro sa cunfiguratzione avantzada de sa mapa (comente aumentare sas minujas) e calicunas de dispositivos dislindados.</string>
 	<string name="osmand_development_plugin_description">Ammustra impostaduras pro funtzionalidades in isvilupu e debug comente su nàvigu animadu o ammustrare sa prestatzione de su rendering.</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Sas mapas vetoriales diat dèpere apàrrere in manera prus lestra. In carchi dispositivu diat podere funtzionare male.</string>
 	<string name="osmand_parking_warning_text">Pretzdentemente est istada annangada a su tzeravallu/calendàriu tuo sa notìfica pro recuperare sa màchina. At a abarrare finas a cando non l\'as a burrare manualmente.</string>    
@@ -1737,7 +1737,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="traffic_warning_calming">Moderatzione de su tràficu</string>
     <string name="traffic_warning_speed_camera">Autovelox</string>
     <string name="traffic_warning">Avisu de tràficu</string>
-	<string name="local_index_description">Ischerta unu elementu esistente pro bìere prus detallios, carca e mantène carcau pro lu disativare o burrare. Datos como in su dispositivu (%1$s lìberos):</string>
+	<string name="local_index_description">Ischerta unu elementu esistente pro bìere prus minujas, carca e mantène carcau pro lu disativare o burrare. Datos como in su dispositivu (%1$s lìberos):</string>
 	<string name="text_size_descr">Issèbera sa mannària de su testu in sa mapa.</string>
     <string name="text_size">Mannària de su testu</string>
     <string name="fav_point_dublicate_message">Amus cambiau su nùmene de su prefèrridu tuo a %1$s pro evitare nùmenes dòpios.</string>
@@ -1871,10 +1871,23 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="photo">Foto</string>
 	<string name="plugin_nautical_descr1">Ativande custa funtzionalidade s\'istile de sa mapa at a divènnere Nàuticu, e at a èssere disponìbile totu sa simbologia pro su nàvigu.</string>
 	<string name="plugin_nautical_descr2">Sa mapa cun totu sa simbologia nàutica globale est disponìbile comente iscarrigamentu ùnicu cun su nùmene \"World seamarks\".</string>
-	<string name="plugin_nautical_descr3">Custa vista podet èssere furriada siat disativande•la inoghe torra siat cambiande su \'Istile mapa\' in \'Cunfigura sa mapa\' comente boles tue.</string>
+	<string name="plugin_nautical_descr3">Custa vista podet èssere furriada disativande•la inoghe torra siat cambiande s\' \'Istile mapa\' in \'Cunfigura sa mapa\' comente boles tue.</string>
 
 	<string name="plugin_ski_descr1">Ativande custa vista s\'istile mapa at a divènnere \'Ierru e iscì\', ammustrande totu sas caraterìsticas de s\'iscenàriu in sas cunditziones de s\'ierru.</string>
 	<string name="plugin_ski_descr2">Est disponìbile una mapa cun totu sas pistas e s\'àndalas pro iscì de fundu suta de Iscarrigàbiles comente \'World ski map\'.</string>
-	<string name="plugin_ski_descr3">Custa vista podet èssere ripristinada disativande•la inoghe torra o cambiande s\'\'Istile mapa\' in \'Cunfigura mapa\'.</string>
+	<string name="plugin_ski_descr3">Custa vista podet èssere furriada disativande•la inoghe torra o cambiande s\'\'Istile mapa\' in \'Cunfigura mapa\'.</string>
 
+	<string name="plugin_touringview_descr1">Ativande custa vista s\'istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.</string>
+	<string name="plugin_touringview_descr2">Custa vista frunit, pro cada livellu de zoom, su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sas istradas e de sas àndalas e sinnos de orientamentu). Rapresentat fintzas totu sas castas de istrada in manera crara tramite colores diferentes, agiudande meda, pro nàrrere, sos chi ghiant veìculos mannos meda.</string>
+	<string name="plugin_touringview_descr3">No est netzessària una mapa ispetziale, sa vista est creada dae sas mapas istandard.</string>
+	<string name="turn_off_all">Istuda totu</string>
+	<string name="showed_on_map">Ammustradu in sa mapa</string>
+	<string name="days_behind">dies faghet</string>
+	<string name="currently_recording_track">Rasta in registratzione como</string>
+	<string name="back_to_map">Torra a sa mapa</string>
+	<string name="plugin_touringview_name">Vista mapa turìstica</string>
+
+	<string name="location_on_map">Assètiu/Collocassione:\n Lat %1$s\n Lon %2$s</string>
+	<string name="rename_failed">Renumenatzione faddida.</string>
+	<string name="plugin_touringview_descr4">Custa vista podet èssere furriada disativande•la inoghe torra o cambiande s\' \'Istile mapa\' in \'Cunfigura mapa\' comente boles.</string>
 	</resources>

From d25a5a9ba26ed1bac1dfca2c0b88b1677516b925 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Thu, 26 Feb 2015 03:13:37 +0100
Subject: [PATCH 37/45] Translated using Weblate (Chinese (Taiwan))

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

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index c13d9b13fd..ab26210ad5 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1938,4 +1938,6 @@
 	<string name="rename_failed">重新命名失敗。</string>
 	<string name="currently_recording_track">現在正在錄製軌跡</string>
 	<string name="back_to_map">返回地圖</string>
+	<string name="turn_off_all">全部關閉</string>
+	<string name="showed_on_map">在地圖上顯示</string>
 	</resources>

From 494b0c2652dfaa89ab1f144cd34399dcf0772522 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 26 Feb 2015 14:18:55 +0200
Subject: [PATCH 38/45] Returned menu for tracks. Returned delete for search
 hystory

---
 OsmAnd/res/layout/search_history.xml          |  2 --
 .../plus/activities/AvailableGPXFragment.java | 33 ++++++++++++++-----
 .../search/SearchHistoryFragment.java         | 20 ++++++-----
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/OsmAnd/res/layout/search_history.xml b/OsmAnd/res/layout/search_history.xml
index d5eb46208d..b5d817024f 100644
--- a/OsmAnd/res/layout/search_history.xml
+++ b/OsmAnd/res/layout/search_history.xml
@@ -13,8 +13,6 @@
 
     <Button
         android:id="@+id/clearAll"
-        android:layout_marginLeft="@dimen/list_content_padding"
-        android:layout_marginRight="@dimen/list_content_padding"
 		android:background="?attr/downloadButtonBackground"
 		android:textColor="?attr/pstsTextColor"
         android:layout_width="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 86390b2c2c..0978c81a9a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -122,8 +122,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	}
 
 	private void createShowedOnMapsView(View v) {
-		v.findViewById(R.id.on_map_layout).setVisibility(View.GONE);
-		ListView onMap = (ListView)v.findViewById(R.id.gpx_on_map);
+		ListView onMap = (ListView) v.findViewById(R.id.gpx_on_map);
 		showOnMapAdapter = new ShowedOnMapAdapter(getActivity(), R.layout.dash_gpx_track_item);
 		onMap.setAdapter(showOnMapAdapter);
 	}
@@ -136,6 +135,18 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
+	private void setShowedOnMapVisibility(boolean visibility) {
+		View v = getView();
+		if (v == null) {
+			return;
+		}
+		if (visibility) {
+			v.findViewById(R.id.on_map_layout).setVisibility(View.VISIBLE);
+		} else {
+			v.findViewById(R.id.on_map_layout).setVisibility(View.GONE);
+		}
+	}
+
 	private void updateCurrentTrack(View v) {
 		if (v == null) {
 			return;
@@ -163,7 +174,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		if (this.adapter != null) {
 			listView.setAdapter(this.adapter);
 		}
-
+		setHasOptionsMenu(true);
 		((TextView) v.findViewById(R.id.name)).setText(R.string.currently_recording_track);
 		v.findViewById(R.id.time_icon).setVisibility(View.GONE);
 
@@ -643,7 +654,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		protected void onProgressUpdate(GpxInfo... values) {
 			for (GpxInfo v : values) {
 				listAdapter.addLocalIndexInfo(v);
-				if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null){
+				if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null) {
 					showOnMapAdapter.add(v);
 				}
 			}
@@ -658,7 +669,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			if (result != null) {
 				for (GpxInfo v : result) {
 					listAdapter.addLocalIndexInfo(v);
-					if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null){
+					if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null) {
 						showOnMapAdapter.add(v);
 					}
 				}
@@ -677,6 +688,12 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			if (listAdapter.getGroupCount() > 0) {
 				getExpandableListView().expandGroup(0);
 			}
+
+			if (showOnMapAdapter.getCount() > 0) {
+				setShowedOnMapVisibility(true);
+			} else {
+				setShowedOnMapVisibility(false);
+			}
 		}
 
 		private File[] listFilesSorted(File dir) {
@@ -1242,7 +1259,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 					showOnMapAdapter.clear();
 					for (GpxInfo i : ((List<GpxInfo>) results.values)) {
 						listAdapter.addLocalIndexInfo(i);
-						if (selectedGpxHelper.getSelectedFileByName(i.getFileName()) != null){
+						if (selectedGpxHelper.getSelectedFileByName(i.getFileName()) != null) {
 							showOnMapAdapter.add(i);
 						}
 					}
@@ -1394,7 +1411,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
-	class ShowedOnMapAdapter extends ArrayAdapter<GpxInfo>{
+	class ShowedOnMapAdapter extends ArrayAdapter<GpxInfo> {
 
 		public ShowedOnMapAdapter(Context context, int resource) {
 			super(context, resource);
@@ -1426,7 +1443,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 			}
 
-			CompoundButton check = (CompoundButton)v.findViewById(R.id.check);
+			CompoundButton check = (CompoundButton) v.findViewById(R.id.check);
 			check.setVisibility(View.VISIBLE);
 
 			return v;
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index 27d9df3b9c..6e2afda578 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -1,6 +1,5 @@
 package net.osmand.plus.activities.search;
 
-import java.text.MessageFormat;
 import java.util.List;
 
 import net.osmand.data.LatLon;
@@ -10,25 +9,18 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
-import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
 import net.osmand.util.MapUtils;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.media.Image;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.ListFragment;
 import android.support.v7.widget.PopupMenu;
-import android.text.Spannable;
-import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -130,10 +122,22 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 
 	private void selectModel(final HistoryEntry model, View v) {
 		PointDescription name = model.getName();
+		boolean light = ((OsmandApplication) getActivity().getApplication()).getSettings().isLightContent();
 		final PopupMenu optionsMenu = new PopupMenu(getActivity(), v);
 		OsmandSettings settings = ((OsmandApplication) getActivity().getApplication()).getSettings();
 		DirectionsDialogs.createDirectionsActionsPopUpMenu(optionsMenu, new LatLon(model.getLat(), model.getLon()),
 				model, name, settings.getLastKnownMapZoom(), getActivity(), true);
+		MenuItem item = optionsMenu.getMenu().add(
+				R.string.edit_filter_delete_menu_item).setIcon(light ?
+				R.drawable.ic_action_delete_light : R.drawable.ic_action_delete_dark);
+		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				helper.remove(model);
+				historyAdapter.remove(model);
+				return true;
+			}
+		});
 		optionsMenu.show();
 	}
 

From 1b9455e8642903a38c26a048eea8bd39a4890b52 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Thu, 26 Feb 2015 16:12:54 +0200
Subject: [PATCH 39/45] Underlay/Overlay threading

---
 .../core/android/TileSourceProxyProvider.java | 73 +++++++++++++++++--
 .../plus/resources/AsyncLoadingThread.java    |  2 +-
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/core/android/TileSourceProxyProvider.java b/OsmAnd/src/net/osmand/core/android/TileSourceProxyProvider.java
index 32dd427809..d9bba6a567 100644
--- a/OsmAnd/src/net/osmand/core/android/TileSourceProxyProvider.java
+++ b/OsmAnd/src/net/osmand/core/android/TileSourceProxyProvider.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 
 import net.osmand.IndexConstants;
 import net.osmand.core.jni.AlphaChannelPresence;
+import net.osmand.core.jni.IMapDataProvider;
 import net.osmand.core.jni.MapStubStyle;
 import net.osmand.core.jni.SWIGTYPE_p_QByteArray;
 import net.osmand.core.jni.SwigUtilities;
@@ -13,7 +14,9 @@ import net.osmand.core.jni.TileId;
 import net.osmand.core.jni.ZoomLevel;
 import net.osmand.core.jni.interface_ImageMapLayerProvider;
 import net.osmand.map.ITileSource;
+import net.osmand.map.MapTileDownloader;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.resources.AsyncLoadingThread;
 import net.osmand.plus.resources.ResourceManager;
 
 public class TileSourceProxyProvider extends interface_ImageMapLayerProvider {
@@ -49,14 +52,22 @@ public class TileSourceProxyProvider extends interface_ImageMapLayerProvider {
 			String tileFilename = rm.calculateTileId(tileSource, tileId.getX(), tileId.getY(),
 					zoom.swigValue());
 
-			if (!rm.tileExistOnFileSystem(tileFilename, tileSource, tileId.getX(), tileId.getY(),
-					zoom.swigValue())) {
-				Bitmap loadedBitmap = null;
-				while (loadedBitmap == null) {
-					loadedBitmap = rm.getTileImageForMapSync(tileFilename, tileSource,
-							tileId.getX(), tileId.getY(), zoom.swigValue(), true);
+			final TileReadyCallback tileReadyCallback = new TileReadyCallback(tileSource,
+					tileId.getX(), tileId.getY(), zoom.swigValue());
+			rm.getMapTileDownloader().addDownloaderCallback(tileReadyCallback);
+			while (rm.getTileImageForMapAsync(tileFilename, tileSource, tileId.getX(), tileId.getY(),
+					zoom.swigValue(), true) == null) {
+				synchronized (tileReadyCallback.getSync()) {
+					if (tileReadyCallback.isReady()) {
+						break;
+					}
+					try {
+						tileReadyCallback.getSync().wait(250);
+					} catch (InterruptedException e) {
+					}
 				}
 			}
+			rm.getMapTileDownloader().removeDownloaderCallback(tileReadyCallback);
 
 			image = tileSource.getBytes(tileId.getX(), tileId.getY(), zoom.swigValue(),
 					app.getAppPath(IndexConstants.TILES_INDEX_DIR).getAbsolutePath());
@@ -83,4 +94,54 @@ public class TileSourceProxyProvider extends interface_ImageMapLayerProvider {
 	public AlphaChannelPresence getAlphaChannelPresence() {
 		return AlphaChannelPresence.Unknown;
 	}
+
+	@Override
+	public IMapDataProvider.SourceType getSourceType() {
+		return IMapDataProvider.SourceType.NetworkDirect;
+	}
+
+	private static class TileReadyCallback implements MapTileDownloader.IMapDownloaderCallback {
+		private final ITileSource tileSource;
+		private final int x;
+		private final int y;
+		private final int zoom;
+		private boolean ready = false;
+		private final Object sync = new Object();
+
+		public TileReadyCallback(ITileSource tileSource, int x, int y, int zoom) {
+			this.tileSource = tileSource;
+			this.x = x;
+			this.y = y;
+			this.zoom = zoom;
+		}
+
+		public boolean isReady() {
+			return ready;
+		}
+
+		public Object getSync() {
+			return sync;
+		}
+
+		@Override
+		public void tileDownloaded(MapTileDownloader.DownloadRequest request) {
+			if (!(request instanceof AsyncLoadingThread.TileLoadDownloadRequest)) {
+				return;
+			}
+			AsyncLoadingThread.TileLoadDownloadRequest tileLoadRequest =
+					(AsyncLoadingThread.TileLoadDownloadRequest)request;
+
+			if (tileSource != tileLoadRequest.tileSource ||
+					x != tileLoadRequest.xTile ||
+					y != tileLoadRequest.yTile ||
+					zoom != tileLoadRequest.zoom) {
+				return;
+			}
+
+			synchronized (sync) {
+				ready = true;
+				sync.notifyAll();
+			}
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/resources/AsyncLoadingThread.java b/OsmAnd/src/net/osmand/plus/resources/AsyncLoadingThread.java
index e680f7461f..d5d9ccd52f 100644
--- a/OsmAnd/src/net/osmand/plus/resources/AsyncLoadingThread.java
+++ b/OsmAnd/src/net/osmand/plus/resources/AsyncLoadingThread.java
@@ -162,7 +162,7 @@ public class AsyncLoadingThread extends Thread {
 		resourceManger.getMapTileDownloader().requestToDownload(req);
 	}
 
-	protected static class TileLoadDownloadRequest extends DownloadRequest {
+	public static class TileLoadDownloadRequest extends DownloadRequest {
 
 		public final String tileId;
 		public final File dirWithTiles;

From 1cdf0bcf1d06237dd8beba5901f0222cf2ad5780 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 25 Feb 2015 20:31:36 +0100
Subject: [PATCH 40/45] Translated using Weblate (Danish)

Currently translated at 100.0% (1658 of 1658 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 f31163ad4e..a7b1a3ebf4 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1946,6 +1946,6 @@
 	<string name="rename_failed">Fejl ved omdøbning.</string>
 	<string name="back_to_map">Tilbage til kortet</string>
 	<string name="currently_recording_track">Aktuelt optagelsesspor</string>
-	<string name="showed_on_map">Vist på kort</string>
+	<string name="showed_on_map">Vist på kortet</string>
 	<string name="turn_off_all">Deaktiver alle</string>
 	</resources>

From 2dc0174eba8a7867dd8f2c98dc809018a6cca744 Mon Sep 17 00:00:00 2001
From: Max Martin Richter <mmr@fernradler.de>
Date: Thu, 26 Feb 2015 09:43:44 +0100
Subject: [PATCH 41/45] Translated using Weblate (German)

Currently translated at 99.6% (1651 of 1656 strings)
---
 OsmAnd/res/values-de/strings.xml | 52 +++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index fa4912619b..b30ecccea3 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -177,12 +177,12 @@
 	<string name="map_settings">Karten-Einstellungen</string>
 	<string name="map_settings_descr">Konfigurieren der Karten-Anzeige</string>
 	<string name="osmand_rastermaps_plugin_description">Ermöglicht die Verwendung zahlreicher Online Kachel-Kartenquellen (auch als Over- oder Underlay). Online-Karten werden im Unterordner \'tiles\' zwischengespeichert. Karten-Kacheln können auch offline erstellt und in das Unterordner \'tiles\' kopiert werden.</string>
-	<string name="osmand_background_plugin_description">Zeigt Einstellungen für die Standort-Aufzeichnung oder die Navigation während das Gerät im Standby-Modus ist (periodisches Aufwecken des GPS-Empfängers).</string>
-	<string name="osmand_accessibility_description">Zeigt Einstellungen für spezielle Eingabehilfen.</string>
+	<string name="osmand_background_plugin_description">Zeigt die Einstellungen für die Standort-Aufzeichnung oder die Navigation während das Gerät im Standby-Modus ist (periodisches Aufwecken des GPS-Empfängers).</string>
+	<string name="osmand_accessibility_description">Zeigt die Einstellungen für spezielle Eingabehilfen.</string>
 	<string name="extra_settings">Erweiterte Einstellungen</string>
 	<string name="osmand_monitoring_description">Ermöglicht das Aufzeichnen zurückgelegter Strecken als lokale GPX-Datei oder online via Web-Service.</string>
 	<string name="osmand_extra_settings_description">Zeigt Einstellungen für erweiterte Kartenkonfiguration (z.B. mehr Details) und einige Gerätespezifika.</string>
-	<string name="osmand_development_plugin_description">Zeigt Einstellungen für Entwicklungs- und Fehlersuchhilfen wie simulierte Navigation oder die Messung der Render-Leistung.</string>
+	<string name="osmand_development_plugin_description">Zeigt die Einstellungen für Entwicklungs- und Fehlersuchhilfen wie simulierte Navigation oder die Messung der Render-Leistung.</string>
 	<string name="plugins_screen">Plugins</string>
 	<string name="prefs_plugins_descr">Module aktivieren Experteneinstellungen und Zusatzdienste</string>
 	<string name="prefs_plugins">Plugins</string>
@@ -1199,7 +1199,7 @@
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">Park-Position</string>
 	<string name="osmand_parking_plugin_description">Dieses Modul speichert den Standort eines geparkten Fahrzeugs.</string>
-	<string name="osmand_parking_plugin_name">Parkplatz-Standort-Plugin</string>
+	<string name="osmand_parking_plugin_name">Parkplatz-Standort (Externes Plugin)</string>
 	<string name="context_menu_item_add_parking_point">Parkplatz-Standort festlegen</string>
 	<string name="context_menu_item_delete_parking_point">Parkplatz-Standort löschen</string>
 	<string name="gpxup_public">Öffentlich</string>
@@ -1299,7 +1299,7 @@
 	<string name="zxing_barcode_scanner_not_found">Barcode-Scanner-Anwendung nicht installiert. Soll im Play-Store danach gesucht werden?</string>
 	<string name="close_changeset">Änderungssatz schließen</string>
 	<string name="incomplete_locale">unfertig</string>
-	<string name="srtm_plugin_name">Höhenlinien-Plugin</string>
+	<string name="srtm_plugin_name">Höhenlinien (Externes Plugin)</string>
 	<string name="srtm_plugin_description">Ermöglicht das Laden von offline Höhenlinien und Relief-Schattierungen (\'Einstellungen\ -&gt; \'Karten-Management\ -&gt; \'Herunterladen\ -&gt; \'Kartentyp wählen\).</string>
 	<string name="srtm_paid_version_title">Höhenlinien-Plugin</string>
 	<string name="srtm_paid_version_msg">Bitte überlegen Sie, ob Sie durch den Kauf des Höhenlinien-Plugins im Play-Store die weitere Entwicklung unterstützen wollen.</string>
@@ -1816,8 +1816,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="osmo_settings_uuid">Geräte-ID</string>
 	<string name="osmo_settings_descr">Konfigurieren der Überwachungs-Einstellungen und des persönlichen Überwachungs-Kanals</string>
 	<string name="osmo_plugin_description">"Erweiterte OpenStreetMap-basierte Live-Überwachung, siehe http://osmo.mobi … Ermöglicht die Positionsdarstellung in von einzelnen Geräten in Echtzeit. Bei anonym erstellten Gruppen sind die Optionen etwas eingeschränkt: Lebensdauer der Gruppe nur für einige Tage, auch ist keine zentrale Steuerung der Gruppe möglich. Es gibt verschiedene Einstellungen für zeitlich begrenzte oder Dauer-Aufzeichnung. Voll funktionsfähige Gruppen müssen auf der genannten Internetseite erstellt werden, auf die Gruppe haben nur registrierte Nutzer Zugriff. "</string>
-	<string name="osmo_plugin_name">OsMo (Erweiterte Live-Überwachung)</string>
-	<string name="osmo_settings">OsMo OpenStreetMap-Überwachung</string>
+	<string name="osmo_plugin_name">OsMo-Überwachung</string>
+	<string name="osmo_settings">OsMo-Überwachung</string>
 	<string name="osmo_io_error">OsMo Verbindungsproblem: </string>
 	<string name="osmo_mode_on">OsMo-Sitzung beenden</string>
 	<string name="osmo_mode_off">OsMo-Sitzung starten</string>
@@ -1999,7 +1999,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="everything_up_to_date">Alle Daten aktuell</string>
     <string name="use_opengl_render">OpenGL-Renderung verwenden</string>
     <string name="use_opengl_render_descr">Hardware beschleunigtes OpenGL-Rendering verwenden (Funktioniert nicht auf allen Geräten)</string>
-    <string name="no_internet_connection">Herunterladen nicht möglich. Internet-Verbindung prüfen!</string>
+    <string name="no_internet_connection">Herunterladen nicht möglich. Bitte die Internet-Verbindung prüfen!</string>
     <string name="download_tab_downloads">Alle Downloads</string>
     <string name="download_tab_updates">Aktualisierungen</string>
     <string name="download_tab_local">Lokal</string>
@@ -2027,7 +2027,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="rendering_value__name">Standard</string>
     <string name="parking_place">Parkplätze</string>
     <string name="remove_the_tag">TAG ENTFERNEN</string>
-    <string name="gps_status">GPS Status</string>
+    <string name="gps_status">GPS-Status</string>
     <string name="version_settings_descr">Nightly-Builds herunterladen</string>
     <string name="version_settings">Builds</string>
     <string name="rendering_attr_streetLighting_name">Straßenbeleuchtung</string>
@@ -2058,9 +2058,33 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="free">Frei %1$s </string>
     <string name="device_memory">Gerätespeicher</string>
     <string name="rendering_attr_pisteGrooming_name">Pistenpflege</string>
-    <string name="plugin_ski_name">Ski-Karten</string>
-    <string name="plugin_nautical_name">See-Karten</string>
-    <string name="world_ski_missing">Um Ski-Karten anzeigen zu können, muss die spezielle Offline-Karte heruntergeladen werden!</string>
-    <string name="nautical_maps_missing">Um See-Karten anzeigen zu können, muss die spezielle Offline-Karte heruntergeladen werden!</string>
+    <string name="plugin_ski_name">Ski-Karten-Ansicht</string>
+    <string name="plugin_nautical_name">See-Karten-Ansicht</string>
+    <string name="world_ski_missing">Um Ski-Karten anzeigen zu können, muss die entsprechende Offline-Karte heruntergeladen werden</string>
+    <string name="nautical_maps_missing">Um See-Karten anzeigen zu können, muss die entsprechende Offline-Karte heruntergeladen werden</string>
     <string name="get_plugin">Erhalten</string>
-    </resources>
+    <string name="rename_failed">Umbenennen fehlgeschlagen.</string>
+	<string name="currently_recording_track">Derzeit aufnehmender Track</string>
+	<string name="back_to_map">Zurück zur Karte</string>
+	<string name="plugin_nautical_descr1">Das Aktivieren dieser Ansicht ändert den Kartinstil zur See-Karte, es werden dann alle nautischen Navigationsmarken und Kartensymbolde angezeigt.</string>
+	<string name="plugin_nautical_descr2">Eine Karten-Datei, die weltweit alle Seezeichen enthält, ist als einzelne Karte mit dem Namen \'Seezeichen (weltweit)\' herunterladbar.</string>
+	<string name="plugin_ski_descr1">Das Aktivieren dieser Ansicht ändert den Kartinstil zur \'Winter- und Skikarte\', es werden dann alle winterlichen Landschaftselemente angezeigt.</string>
+	<string name="plugin_ski_descr2">Eine Karten-Datei, die weltweit alle Loipen und Abfahrtshänge enthält, ist als einzelne Karte mit dem Namen \'Ski-Karte (weltweit)\' herunterladbar.</string>
+	<string name="plugin_nautical_descr3">Diese Ansicht kann zurückgestellt werden indem sie hier wieder deaktiviert oder in dem der \'Karten-Stil\' unter \'Karte konfigurieren\' wie gewünscht geändert wird.</string>
+
+	<string name="plugin_ski_descr3">Diese Ansicht kann zurückgestellt werden indem sie hier wieder deaktiviert oder in dem der \'Karten-Stil\' unter \'Karte konfigurieren\' wie gewünscht geändert wird.</string>
+
+	<string name="plugin_touringview_descr3">Ein spezieller Kartendownload ist nicht notwendig, die Ansicht wird aus den Standardkarten generiert.</string>
+	<string name="plugin_touringview_descr4">Diese Ansicht kann zurückgestellt werden indem sie hier wieder deaktiviert oder in dem der \'Karten-Stil\' unter \'Karte konfigurieren\' wie gewünscht geändert wird.</string>
+	<string name="audio">Audio</string>
+	<string name="video">Video</string>
+	<string name="photo">Foto</string>
+	<string name="rename_recording">Aufnahme umbenennen</string>
+    <string name="location_on_map">Position:\n Lat %1$s\n Lon %2$s</string>
+	<string name="notes">Notizen</string>
+	<string name="online_map">Online-Karte</string>
+	<string name="roads_only">Nur Straßen</string>
+    <string name="rendering_attr_pisteRoutes_name">Pisten</string>
+	<string name="export">Export</string>
+	<string name="watch">Ansehen</string>
+	</resources>

From a9d05fb9b61496124c3c402b52ca926b2b00644d Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Thu, 26 Feb 2015 03:56:26 +0100
Subject: [PATCH 42/45] Translated using Weblate (Sardinian)

Currently translated at 100.0% (1658 of 1658 strings)
---
 OsmAnd/res/values-sc/strings.xml | 556 +++++++++++++++----------------
 1 file changed, 275 insertions(+), 281 deletions(-)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index efa12a4487..cd767361d6 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -4,7 +4,7 @@
     <string name="misc_pref_title">Mistura</string>
     <string name="localization_pref_title">Localizatzione</string>
     <string name="index_item_nation_addresses">Indiritzos natzionales</string>
-	<string name="index_item_world_altitude_correction">Curretzione de s\'artària mundiale</string>
+	<string name="index_item_world_altitude_correction">Curretzione de s’artària mundiale</string>
 	<string name="index_item_world_seamarks">Pidagnos mundiales</string>
 	<string name="index_item_world_bitcoin_payments">Pagamentos in bitcoins mundiale</string>
 	<string name="index_item_world_basemap">Mapa summarja mundiale</string>
@@ -55,15 +55,15 @@
     <string name="index_name_italy">Europa - Itàlia</string>
     <string name="index_name_gb">Europa - Britannia Manna</string>
     <string name="calculate_osmand_route_without_internet">Càlcula un\'àndala cun OsmAnd sena impreare internet</string>
-    <string name="gpx_option_calculate_first_last_segment">Càlcula un\'àndala cun OsmAnd pro su primu e s\'ùrtimu segmentu de sa caminera</string>
-    <string name="use_displayed_track_for_navigation">Boles impreare s\'àndala ammustrada pro su nàvigu?</string>
+    <string name="gpx_option_calculate_first_last_segment">Càlcula un’àndala cun OsmAnd pro su primu e s’ùrtimu segmentu de sa caminera</string>
+    <string name="use_displayed_track_for_navigation">Boles impreare s’àndala ammustrada pro su nàvigu?</string>
     <string name="keep_and_add_destination_point">Annànghe unu puntu de destinatzione</string>
     <string name="select_gpx">Issèbera GPX…</string>
     <string name="route_descr_select_destination">Issèbera sa destinatzione</string>
     <string name="route_descr_select_on_map">Ischerta in sa mapa…</string>
     <string name="route_descr_favorite">Prefèrridu…</string>
-    <string name="route_preferences">Preferèntzias pro s\'àndala</string>
-    <string name="route_info">Informatziones de s\'àndalas</string>
+    <string name="route_preferences">Preferèntzias pro s’àndala</string>
+    <string name="route_info">Informatziones pro s’àndala</string>
     <string name="routing_attr_prefer_motorway_name">Preferre sas autostradas</string>
 	<string name="routing_attr_prefer_motorway_description">Preferre sas autostradas</string>
 	<string name="routing_attr_short_way_name">Istrada prus curtza</string>
@@ -85,10 +85,10 @@
     <string name="copying_osmand_one_file_descr">Copiande su documentu (%s) in sa destinatzione noa…</string>
     <string name="copying_osmand_files_descr">Copiande sos datos de OsmAnd in (%s), sa destinatzione noa…</string>
     <string name="copying_osmand_files">Copiande sos datos de OsmAnd…</string>
-    <string name="calculate_osmand_route_gpx">Càlcula s\'àndala OsmAnd sena lìnia</string>
+    <string name="calculate_osmand_route_gpx">Càlcula s’àndala OsmAnd sena lìnia</string>
     <string name="app_mode_truck">Càmion</string>
     <string name="guidance_preferences_descr">Preferèntzias de nàvigu</string>
-    <string name="routing_preferences_descr">Preferèntzias de càlculu de s\'àndala</string>
+    <string name="routing_preferences_descr">Preferèntzias de càlculu de s’àndala</string>
     <string name="speech_rate_descr">Imposta sa lestresa de sa boghe (TTS)</string>
     <string name="speech_rate">Lestresa de sa boghe</string>
     <string name="tip_recent_changes_1_7_1_t">"Mudas in sa 1.7:
@@ -97,15 +97,15 @@
 \n\t* Ischermada noa cun Pianificatzione Caminera (prus atuativu e poderosu)
 \n\t** NOTA su nàvigu de sa caminera GPX est disponìbile dae su buttone Impostaduras de sas Àndalas
 \n\t* Iscumparta automàtica de sos buttones in sa modalidade navigu
-\n\t* Càlculu de s\'andala sena lìnia cara a su primu puntu de sa traccia GPX (optzione \'percorri tutta la traccia\')
+\n\t* Càlculu de s’andala sena lìnia cara a su primu puntu de sa traccia GPX (optzione \'sighi totu sa rasta\')
 \n\t* Dispintatzione ativa in sas galerias
-\n\t* Unu muntone de megiorus minores de s\'interfatze utente &amp; corretziones pro s\'usabilitade
-\n\t* Impostaduras pro sa lestresa de sa bogalizzatzione "</string>
-    <string name="complex_route_calculation_failed">Càlculu lestru de s\'àndala faddida (%s), rinviu a su calculu lentu.</string>
-    <string name="disable_complex_routing_descr">Istuda su calculu de s\'àndala in duas fases pro s\'impreu in màchina</string>
-    <string name="disable_complex_routing">Istuta su calculu cumplessu de s\'àndala</string>
+\n\t* Unu muntone de megiorus minores de s’interfatze utente &amp; corretziones pro s’usabilitade
+\n\t* Impostaduras pro sa lestresa de sa vocalizatzione "</string>
+    <string name="complex_route_calculation_failed">Càlculu lestru de s’àndala faddidu (%s), rinviu a su calculu lentu.</string>
+    <string name="disable_complex_routing_descr">Istuda su calculu de s’àndala in duas fases pro s’impreu in màchina</string>
+    <string name="disable_complex_routing">Istuta su calculu cumplessu de s’àndala</string>
     <string name="amenity_type_seamark">Pidagnu</string>
-    <string name="app_modes_choose_descr">Issèbera intre sas modalidades de impreu de s\'aplicu</string>
+    <string name="app_modes_choose_descr">Issèbera intre sas modalidades de impreu de s’aplicu</string>
     <string name="app_modes_choose">Modalidades de impreu</string>
 	<string name="map_widget_appearance">Vàrias:</string>
 	<string name="map_widget_map_rendering">Disinnu de sa mapa</string>
@@ -117,15 +117,14 @@
     <string name="tip_faq">Preguntas fitianas</string>
     <string name="local_osm_changes_delete_all_confirm">Istas pro burrare %1$d mudaduras. Ses seguru?</string>
     <string name="local_osm_changes_delete_all">Burra totu</string>
-    <string name="animate_routing_route_not_calculated">Pro piaghere, càlcula s\'andala in antis</string>
+    <string name="animate_routing_route_not_calculated">Pro piaghere, càlcula s’andala in antis</string>
     <string name="animate_routing_route">Dispinta impreande un\'àndala calculada </string>
     <string name="animate_routing_gpx">Dispinta impreande una caminera GPX</string>
-    <string name="remember_choice">Ammenta s\'issèberu meu</string>
+    <string name="remember_choice">Ammenta s’issèberu meu</string>
     <string name="gps_status_eclipsim">Istadu GPS</string>
     <string name="default_and">e</string>
     <string name="default_or">o</string>
-	<string name="route_is_too_long">Su càlculu de s\'àndala de OsmAnd sena impreare internet  diat pòtere dimandare meda tempus (o a bortas non funtzionare) pro distantzias prus longas de 200 km.
-Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas prestatziones.</string>
+	<string name="route_is_too_long">Su càlculu de s’àndala de OsmAnd sena impreare internet diat pòtere dimandare meda tempus (o a bortas non funtzionare) pro distantzias prus longas de 200 km. Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas prestatziones.</string>
 	<string name="auto_zoom_none">No zoom automàticu</string>
 	<string name="auto_zoom_close">Zoom automàticu mannu</string>
 	<string name="auto_zoom_far">Zoom automàticu mesanu</string>
@@ -135,11 +134,11 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="tip_map_styles">Istiles de sa mapa</string>
 	<string name="default_buttons_no">Nono</string>
 	<string name="default_buttons_yes">Eja</string>
-	<string name="tip_map_styles_t">"OsmAnd suportada sa visualizatzione de sas mapas vettoriales in istiles diferentes pro s\'adatare a sas esigentzias tuas:
+	<string name="tip_map_styles_t">"OsmAnd suportada sa visualizatzione de sas mapas vettoriales in istiles diferentes pro s’adatare a sas esigentzias tuas:
 \n\nDiferentes dae sos istiles balansados preimpostados de sa mapa, los agatas suta \'Menu\' -&gt; \'Cunfigura sa mapa\' -&gt; \'Istile Mapa\' issèbera pro esempru
-\n\t* The \'Touring view\' istile: cuntènnidi sas informatziones prus minujas possìbile pro biagiare e pro visitare, incluidas sas ottimizatziones pro sos ghiadores professionales (contrastu prus distinghìbile pro sas istradas), optzione pro s\'escursionismu Alpinu (iscala SAC), itineràrios tziclìsticos, sìmbolos pro s\'escursionismu, etc.
-\n\t* \'Contrastu istradas artu \' ammustra sas istradas cun una lughentesa de sos colores atzentuata meda pro sas situatziones de illuminadura mala.
-\n\t* \'Ierru e isci\' crea una vista de su paesàgiu ierrale (cucuzau dae su nie), e visione globale de sas pistas de isci e de sos impiantos de artziada (in acrobada cun s\'isgarrigamentu de sa mapa\'World ski\' ) "</string>
+\n\t* The \'Touring view\' istile: cuntènnidi sas informatziones prus minujas possìbile pro biagiare e pro visitare, incluidas sas ottimizatziones pro sos ghiadores professionales (contrastu prus distinghìbile pro sas istradas), optzione pro s’escursionismu Alpinu (iscala SAC), itineràrios tziclìsticos, sìmbolos pro s’escursionismu, etc.
+\n\t* \'Contrastu istradas artu\' ammustrat sas istradas cun una lughentesa de sos colores atzentuata meda pro sas situatziones de illuminadura mala.
+\n\t* \'Ierru e isci\' crea una vista de su paesàgiu ierrale (cucuzau dae su nie), e visione globale de sas pistas de isci e de sos impiantos de artziada (in acrobada cun s’isgarrigamentu de sa mapa \'World ski\' ) "</string>
     <string name="about_version">Versione:</string>
     <string name="about_settings">Informatziones</string>
     <string name="about_settings_descr">Informatziones de sa versione, litzèntzias, membros de su progetu</string>
@@ -151,8 +150,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 \n\t* Documentu de sas lìnias de livellu como incluidas in sos istados o sas regiònes
 \n\t* Mapa mondiale de base noa cun istradas printzipales, ferrovias, e àteras àreas, comente sas padentes
 \n\t* Immaniamentu mapa (tènne carcau su buttone zoom) - Impreàbile siat cun mapas vettoriales siat in lìnia
-\n\t* Impostadura/muda de sas fontes in lìnia pessonalizzadas de sas imbrèstias (e impostadura de s\'iscadentzia issoro)
-\n\t* Suportu pro sos lìmides de lestresa cundissionados dae s\'oràriu (Olanda)
+\n\t* Impostadura/muda de sas fontes in lìnia pessonalizzadas de sas imbrèstias (e impostadura de s’iscadentzia issoro)
+\n\t* Suportu pro sos lìmides de lestresa cundissionados dae s’oràriu (Olanda)
 \n\t* Chirca prus lestra de sos indiritzos
 \n\t* Curretzione de faddinas cun su nàvigu e su disinnu de sa mapa "</string>
     <string name="local_index_tile_data_zooms">Zooms isgarrigados: %1$s</string>
@@ -185,18 +184,17 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="driving_region_japan">Giappone</string>
 	<string name="announce_gpx_waypoints">Annuntzia sos puntos de coladòrgiu GPX</string>
     <string name="speak_title">Annuntzia…</string>
-	<string name="speak_descr">Cunfigura pro annuntziare sos nùmenes de sas istradas, sos avèrtimentos (pasadas fortzadas, dossos), sos annuntzios de s\'autovelox, sos lìmites de lestresa</string>
+	<string name="speak_descr">Cunfigura pro annuntziare sos nùmenes de sas istradas, sos avèrtimentos (pasadas fortzadas, dossos), sos annuntzios de s’autovelox, sos lìmites de lestresa</string>
 	<string name="speak_street_names">Annuntzia sos nùmenes de sas istradas (TTS)</string>
     <string name="speak_speed_limit">Annuntzia sos lìmites de lestresa</string>
     <string name="speak_cameras">Annuntzia sos autovelox</string>
 	<string name="speak_traffic_warnings">Annuntzia avisos de tràfficu</string>
-    <string name="tip_recent_changes_1_5_t">Mudas in sa 1.5:
-	\n\t* Annuntzios bogales pro sos lìmites de lestresa e sos autovelox
-	\n\t* Prus capabilidade de frunire annuntzios bogales (annuntziamentu de sos nùmenes de sas istradas)
-	\n\t* Arta carchidare de sas iconas de sa mapa
-	\n\t* Unu muntone de mudas in s\'interfatze gràfica
-	\n\t* Curretzione de faddinas in sa bisualizatzione de sa distantzia, s\'analizatzione de sos puntos  GPX, s\'impreu de sos puntos de coladòrgiu, sos widget de pianificatzione, su carrigamentu de sos datos in OSM e sa gestione https
-    </string>
+    <string name="tip_recent_changes_1_5_t">"Mudas in sa 1.5:
+\n\t* Annuntzios vocales pro sos lìmites de lestresa e sos autovelox
+\n\t* Prus capabilidade de frunire annuntzios bogales (annuntziamentu de sos nùmenes de sas istradas)
+\n\t* Arta carchidare de sas iconas de sa mapa
+\n\t* Unu muntone de mudas in s’interfatze gràfica
+\n\t* Curretzione de faddinas in sa bisualizatzione de sa distantzia, s’analizatzione de sos puntos GPX, s’impreu de sos puntos de coladòrgiu, sos widget de pianificatzione, su carrigamentu de sos datos in OSM e sa gestione https "</string>
     <string name="osb_author_or_password_not_specified">Pro piaghere dislinda su nùmene impitadore OSM e sa crae (password) in sas Impostaduras</string>
     <string name="clear_intermediate_points">Burra sos puntos mesanos</string>
     <string name="keep_intermediate_points">Mantènne sos puntos mesanos</string>
@@ -216,7 +214,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="settings_preset_descr">Issèbera unu profilu de impreu cun impostaduras pessonalizadas pro sa mapa e su nàvigu.</string>
     <string name="destination_point">Destinatzione %1$s</string>
     <string name="context_menu_item_destination_point">Imposta comente destinatzione</string>
-    <string name="please_select_address">Issèbera in antis sa citade o s\'istrada</string>
+    <string name="please_select_address">Issèbera in antis sa citade o s’istrada</string>
     <string name="tip_recent_changes_1_4_t">Mudas in sa 1.4:
 	\n\t* Cusserta sos puntos de colaròrgiu pro los visitare totus in manèra primorosa (cummessu biagiadore, ghenna-a-ghenna)
 	\n\t* Chirca sas carreras impreande su nùmene (in sos bighinados) 
@@ -227,7 +225,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	\n\t* Suportu a sas notas de OSM 
     </string>
     <string name="search_street_in_neighborhood_cities">Chirca sas istradas in sas citades prus a curtzu</string>
-    <string name="intermediate_items_sort_return">Puntos mesanos cussertaos pro perfetzionare s\'andala pro sa destinatzione.</string>
+    <string name="intermediate_items_sort_return">Puntos mesanos cussertaos pro perfetzionare s’andala pro sa destinatzione.</string>
     <string name="intermediate_items_sort_by_distance">Cusserta (ghenna a ghenna)</string>
     <string name="local_osm_changes_backup_successful">Creatzione documentu de muda OSM %1$s acabada</string>
     <string name="local_osm_changes_backup_failed">Creatzione de sa còpia locale de seguràntzia (backup) de sas modìficas faddida</string>
@@ -254,7 +252,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="distance_measurement_save_gpx">Sarba comente GPX</string>
     <string name="distance_measurement_load_gpx">Aberi GPX esistente</string>
     <string name="wait_current_task_finished">Pro piaghere iseta sa fine de su traballu presente</string>
-    <string name="use_kalman_filter_compass_descr">Minimat s\'abbolotu de sa bùssola ma annanghet inèrtzia/preìtia</string>
+    <string name="use_kalman_filter_compass_descr">Minimat s’abbolotu de sa bùssola ma annanghet inèrtzia/preìtia</string>
     <string name="use_kalman_filter_compass">Impreu de su filtru de Kalman</string>
     <string name="access_mark_final_location_first">Modalidade de atzessu fatzilidadu: issebera in antis sa destinatzione</string> 
     <string name="use_magnetic_sensor_descr">Imprea su sensore magneticu pro determinare su balore de sa bùssola imbetzes de su sensore de orientamentu</string>
@@ -263,7 +261,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="files_limit">tenes galu %1$d documentos</string>
     <string name="available_downloads_left">Disponìbiles %1$d documentos da isgarrigare</string>
     <string name="install_paid">Versione cumprida</string>
-    <string name="cancel_route">Burra s\'àndala</string>
+    <string name="cancel_route">Burra s’àndala</string>
     <string name="cancel_navigation">Firma su nàvigu</string>
     <string name="clear_destination">Burra sa destinatzione</string>
     <string name="download_using_mobile_internet">Sa connessione WiFi non est ativa. Boles sighire a iscarrigare impreande sa connessione internet atuale?</string>
@@ -271,45 +269,43 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="hno">Nùmeru tzivicu</string>
     <string name="website">Giassu web</string>
 	<string name="phone">Telèfonu</string>
-    <string name="tip_recent_changes_1_3_t">Mudas in sa 1.3:
-        \n\t* Torrau a pònnere su suportu pro tauleddas (tablets) e ischermos mannos
-        \n\t* Tema Holo (personalizatzione)
-        \n\t* Prus impostaduras pro s\'istabilizatzione de sa bùssola
-        \n\t* Su butone a manca in s\'ischermada de sa mapa remplesa su butone "Menu"
-    </string>
+    <string name="tip_recent_changes_1_3_t">"Mudas in sa 1.3:
+\n\t* Torradu a pònnere su suportu pro tauleddas (tablets) e ischermos mannos
+\n\t* Tema Holo (personalizatzione)
+\n\t* Prus impostaduras pro s’istabilizatzione de sa bùssola
+\n\t* Su butone a manca in s’ischermada de sa mapa remplesat su butone Menu "</string>
     <string name="monitoring_settings">Registratzione biàgios</string>
     <string name="monitoring_settings_descr">Cunfigura comente registrare sos biàgios tuos</string>
     <string name="osmo_settings_uuid">ID ùnicu de su dispositivu</string>
     <string name="osmo_settings_descr">Cunfigura sas impostaduras de compidada de su dispositivu e imposta su canale de compidada pessonale</string>
-    <string name="osmo_plugin_description">"Compidada OsMo - Compidada avantzada in dereta, bie http://osmo.mobi. Sighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comunica. Sunt disponìbiles meda impostaduras pro sa compidada, pro sa sessione in corso o permanentes. Sos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, ad es. non b\'est su controllu remotu e nemmancu s\'amministradore de su grupu.Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. Pro àteras informatziones: http://osmo.mobi. "</string>
+    <string name="osmo_plugin_description">"Compidada OsMo - Compidada avantzada in dereta, bie http://osmo.mobi. Sighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comunica. Sunt disponìbiles meda impostaduras pro s’arrastamentu, pro sa sessione in cursu o permanentes. Sos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, ad es. non b’est su controllu remotu e nemmancu s’amministradore de su grupu.Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. Pro àteras informatziones: http://osmo.mobi. "</string>
     <string name="osmo_plugin_name">Compidada OsMo</string>
     <string name="osmo_settings">Compidada OsMo</string>
    	<string name="osmand_monitoring_plugin_description">Ativa sa compidada e su nàvigu in sa modalidade "a reposu" (ischermu istudau)impreande ischidaduras periòdicas de su dispositivu GPS.
         Ammustra sas impostaduras chi fatzititana sa regitratzione de sos biàgios in documentos GPX locales o in lìnia, impreande unu servitziu in retza.</string>
     <string name="osmand_monitoring_plugin_name">Servitzios de registratzione</string>
-    <string name="osmand_background_plugin_description">Ammustrat sas impostaduras pro abilitare sa compidada e su nàvigu in modalidade a reposu (ischermu istudau) pro mèdiu de ischidaduras periòdicas de su GPS.</string>
+    <string name="osmand_background_plugin_description">Ammustrat sas impostaduras pro abilitare s’arrastamentu e su nàvigu in modalidade a reposu (ischermu istudadu) pro mèdiu de ischidaduras periòdicas de su GPS.</string>
     <string name="contribution_activity">Installa sa versione</string>
-    <string name="choose_osmand_theme_descr">Issèbera su tema de s\'aplicu</string>
-    <string name="choose_osmand_theme">Tema de s\'aplicu</string>
-    <string name="accessibility_options">Optziones pro s\'atzessibilidade</string>
-    <string name="select_address_activity">Issèbera s\'indiritzu</string>
+    <string name="choose_osmand_theme_descr">Issèbera su tema de s’aplicu</string>
+    <string name="choose_osmand_theme">Tema de s’aplicu</string>
+    <string name="accessibility_options">Optziones pro s’atzessibilidade</string>
+    <string name="select_address_activity">Issèbera s’indiritzu</string>
     <string name="favourites_list_activity">Issèbera preferridu</string>
     <string name="local_openstreetmap_act_title">Modìficas OSM</string>
     <string name="default_buttons_other_actions">Àteras atziones</string>
     
-	<string name="tip_recent_changes_1_2_t">Curretziones in sa 1.2.1:
-	    \n\t*Currettu Geo Intent (Foursquare, c:geo)
-	    \n\t*Currettu sa tremuledda de s\'ischermu durante su nàvigu
-	    \n\t*Àteros errores minores
-	    \n\nMudas in sa 1.2:
-		\n\t* Curretzione de errores (perfessionados su nàvigu, sa chirca, sa registratzione AV, sas indicatziones bogales, carchi mezzoramentu pro sa bisualizzatzione)
-		\n\t* Cuffiguratzione prus fàtzile de sas umbraduras (rechedidi su Plugin Lìnias de Inghìriu)
-		\n\t* Como atzetada sos ligòngios de localizatzione maps.google.com
-		\n\t* Widgets novos (informatziones GPS) 
-		\n\t* Annangau su suportu pro sas bentanas mùltiplas pro dispositivos Samsung reghentes
-		\n\t* Filtru Kalman pro sa bùssola
-		\n\t* Suportu de su relògiu Pebble
-	</string>
+	<string name="tip_recent_changes_1_2_t">"Curretziones in sa 1.2.1:
+\n\t*Currettu Geo Intent (Foursquare, c:geo)
+\n\t*Currettu sa tremuledda de s’ischermu durante su nàvigu
+\n\t*Àteros errores minores
+\n\nMudas in sa 1.2:
+\n\t* Curretzione de errores (perfessionados su nàvigu, sa chirca, sa registratzione AV, sas indicatziones bogales, carchi mezzoramentu pro sa bisualizzatzione)
+\n\t* Cuffiguratzione prus fàtzile de sas umbraduras (rechedidi su Plugin Lìnias de Inghìriu)
+\n\t* Como atzetada sos ligòngios de localizatzione maps.google.com
+\n\t* Widgets novos (informatziones GPS)
+\n\t* Annangau su suportu pro sas bentanas mùltiplas pro dispositivos Samsung reghentes
+\n\t* Filtru Kalman pro sa bùssola
+\n\t* Suportu de su relògiu Pebble "</string>
     <string name="layer_hillshade">Istratu umbradura rilievos</string>
     <string name="map_widget_gps_info">Informatziones GPS</string>
     <string name="tip_recent_changes_1_1_4_t">"Modìficas in sa 1.1.4:
@@ -339,43 +335,42 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="stop_routing_confirm">Ses seguru de bòlere firmare su nàvigu?</string>
     <string name="clear_dest_confirm">Ses seguru de bòlere burrare sa destinatzione (e sos puntos mesanos)?</string>
     <string name="precise_routing_mode_descr">Abìlita pro calculare àndalas pretzisas sena attoppos. Est lentu e limitadu in sa distantzia.</string>
-    <string name="precise_routing_mode">Calculu pretzisu de s\'àndala (alfa)</string>
+    <string name="precise_routing_mode">Calculu pretzisu de s’àndala (alfa)</string>
     <string name="recording_context_menu_show">Ammustra</string>
     <string name="recording_photo_description">Foto %1$s %2$s</string>
     <string name="av_def_action_picture">Iscata una foto</string>
     <string name="recording_context_menu_precord">Iscata una foto</string>
-    <string name="av_use_external_camera_descr">Imprea s\'aplicu de sistema pro sas fotos</string>
-    <string name="dropbox_plugin_description">Su plugin Dropbox permìttidi de sincronizare sas camineras e sas notas audio/video cun s\'acontu tuo de Dropbox.</string>
+    <string name="av_use_external_camera_descr">Imprea s’aplicu de sistema pro sas fotos</string>
+    <string name="dropbox_plugin_description">Su plugin Dropbox permìttidi de sincronizare sas camineras e sas notas audio/video cun su contu tuo de Dropbox.</string>
     <string name="dropbox_plugin_name">Plugin Dropbox</string>
-    <string name="intermediate_points_change_order">Muda s\'òrdine</string>
-    <string name="srtm_paid_version_msg">Pro piaghere lea a cunsideru s\'acuistu de su plugin pro sas lìnias de livellu in su Market, pro sostènnere s\'isvilupu imbeniente.</string>
+    <string name="intermediate_points_change_order">Muda s’òrdine</string>
+    <string name="srtm_paid_version_msg">Pro piaghere lea a cunsideru s\'acuistu de su plugin pro sas lìnias de livellu in su Market, pro sostènnere s’isvilupu imbeniente.</string>
     <string name="srtm_paid_version_title">Pugin lìnias de livellu</string>
     <string name="av_def_action_choose">Issèbera su rechesta</string>
     <string name="av_def_action_video">Registra video</string>
     <string name="av_def_action_audio">Registra audio</string>
-    <string name="av_widget_action_descr">Issèbera s\'atzione predefinida de su widget</string>
+    <string name="av_widget_action_descr">Issèbera s’atzione predefinida de su widget</string>
     <string name="av_widget_action">Azione predefinida de su widget</string>
     <string name="av_video_format_descr">Issèbera su formadu de essida video</string>
     <string name="av_video_format">Formadu de essida video</string>
     <string name="av_use_external_recorder_descr">Imprea su registratore de sistema pro sos videos</string>
     <string name="av_use_external_recorder">Imprea su registratore de sistema</string>
-    <string name="av_use_external_camera">Imprea s\'app fotocàmera</string>
+    <string name="av_use_external_camera">Imprea s’app fotocàmera</string>
     <string name="av_settings_descr">Cunfigura sas impostaduras àudio e vìdeo</string>
     <string name="av_settings">Impostaduras àudio/vìdeo </string>
     <string name="recording_error">Errore durante sa registratzione </string>
     <string name="recording_camera_not_available">Sa fotocamera non est disponibile</string>
-    <string name="recording_is_recorded">S\'àudio/vìdeo istat pro èssere registrau. Pro lu firmare carca su widget AV.</string>
-    <string name="recording_playing">S\'àudio de sa registratzione isseberada istat pro èssere reprodotu.\n%1$s</string>
+    <string name="recording_is_recorded">S’àudio/vìdeo istat pro èssere registrau. Pro lu firmare carca su widget AV.</string>
+    <string name="recording_playing">S’àudio de sa registratzione isseberada istat pro èssere reprodotu.\n%1$s</string>
     <string name="recording_open_external_player">Abèri reprodutòre esternu</string>
     <string name="recording_delete_confirm">Bòles burrare custa registratzione?</string>
-    <string name="tip_recent_changes_1_1_0_t">Mudas in sa 1.1.0:
-		\n\t* Plugin pro calculare sa distantzia
-		\n\t* Plugin pro sas notas àudio/vìdeo
-		\n\t* Plugin pro sas lìnias de livellu
-		\n\t* Curretziones de errores
-		\n\t* Optzione \'Touring view\' de istile mapa, cun prus minujas, prus istiles pro sas istradas, prus cuntrastu, e optzione escursionismu alpinu (iscala SAC)
-		\n\t* Curretzione EGM96 de s\'iscostamentu de sas leghiduras de s\'artària GPS
-    </string>
+    <string name="tip_recent_changes_1_1_0_t">"Mudas in sa 1.1.0:
+\n\t* Plugin pro calculare sa distantzia
+\n\t* Plugin pro sas notas àudio/vìdeo
+\n\t* Plugin pro sas lìnias de livellu
+\n\t* Curretziones de errores
+\n\t* Optzione \'Touring view\' de istile mapa, cun prus minujas, prus istiles pro sas istradas, prus cuntrastu, e optzione escursionismu alpinu (iscala SAC)
+\n\t* Curretzione EGM96 de s’iscostamentu de sas leghiduras de s’artària GPS "</string>
     <string name="recording_unavailable">non disponìbile</string>
     <string name="recording_context_menu_arecord">Registra una nota àudio</string>
     <string name="recording_context_menu_vrecord">Registra una nota vìdeo</string>
@@ -389,7 +384,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="av_control_start">Avia/Inghitza</string>
     <string name="map_widget_av_notes">Notas àudio/vìdeo</string>
     <string name="osmand_srtm_short_description_80_chars">Plugin OsmAndfor pro sas lìnias de livellu sena lìnia</string>
-    <string name="osmand_srtm_long_description_1000_chars">Custu plugin frunidi sas lìnias de livellu chi podent èssere bisualizatas in sas mapas sena lìnia de OsmAnd. Sos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s\'ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un\'aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un\'isfortzu de coperassione intre NASA, su Ministeru de s\'Economia Commercio e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems).</string>
+    <string name="osmand_srtm_long_description_1000_chars">Custu plugin frunidi sas lìnias de livellu chi podent èssere bisualizatas in sas mapas sena lìnia de OsmAnd. Sos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems).</string>
     <string name="map_widget_distancemeasurement">Medidura de sa distantzia</string>
     <string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione ...\" pro assinzare una nota a sa positzione dislindada</string>
     <string name="monitoring_control_stop">Stop</string>
@@ -398,7 +393,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="audionotes_plugin_name">Plugin notas àudio/vìdeo</string>
     <string name="index_srtm_parts">partes</string>
     <string name="index_srtm_ele">Lìnias de livellu</string>
-    <string name="srtm_plugin_description">Fatzìlita s\'isgarrigamentu de sas lìnias de livellu e s\'umbradura de sos rilievos (\'Impostaduras\' → \'Gestione documentos mapa\' → \'Isgarrigamentu\' → Issèbera su tipu de mapa disigiatu).</string>
+    <string name="srtm_plugin_description">Plugin esternu (iscarrigamentu a banda) chi fatzìlitat s’isgarrigamentu de sas lìnias de livellu e s’umbradura de sos rilievos (\'Impostaduras\' → \'Gestione documentos mapa\' → \'Isgarrigamentu\' → Issèbera su tipu de mapa disigiatu). Custos podent èssere ammustrados in cumbinatzione cun sas mapas OsmAnd non in lìnia.</string>
     <string name="srtm_plugin_name">Plugin lìnias de livellu</string>
     <string name="download_select_map_types">Àteras mapas</string>
     <string name="download_roads_only_item">Petzi istradas</string>
@@ -409,12 +404,12 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="rendering_attr_noAdminboundaries_name">Cua sas làcanas</string>
 	<string name="rendering_attr_noAdminboundaries_description">Non bisualizzare sas làcanas regionales (livellos amministrativos 5-9)</string>
     <string name="osmodroid_plugin_old_ver_not_supported">Su plugin OsMoDroid est in una versione disusada e depet èssere postu a die.</string>
-    <string name="osmodroid_plugin_description">Su plugin OsMoDroid est un estensione OsmAnd pro s\'aplicu pro sas tareas de compidada in tempus reale OsModroid. Sas informatziones sunt disponìbiles in su giassu http://esya.ru.</string>
+    <string name="osmodroid_plugin_description">Su plugin OsMoDroid est un estensione OsmAnd pro s’aplicu pro sas tareas de arrastamentu in tempus reale OsModroid. Sas informatziones sunt disponìbiles in su giassu http://esya.ru.</string>
     <string name="osmodroid_plugin_name">Plugin OsMoDroid</string>
 	<string name="tip_altitude_offset">Curretzione artària</string>
-	<string name="tip_altitude_offset_t">"Sa majoria de sos dispositivos GPS marcana sa medida de s\'artaria in su sistema de referèntzia WGS84 basadu in supra de un ellissoide. Pro custu una conversione in sos sistemas de referèntzia impreados localmente rechedidi una curretzione dipendente dae sa positzione.
-\n\nUna aprossimassione a custos sistemas de referèntzia locales est su EGM96. OsmAnd como suportada sa bisualizzatzione automàtica de s\'artaria in su sistema EGM96.
-\n\nPro l\'ativare, isgàrriga su documentu WW15MGH.DAC impreande sa \'Gestione documentos mapa\' (su documentu orizinale s\'agatat a s\'indiritzu http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC) "</string>
+	<string name="tip_altitude_offset_t">"Sa majoria de sos dispositivos GPS marcana sa medida de s’artaria in su sistema de referèntzia WGS84 basadu in supra de un ellissoide. Pro custu una conversione in sos sistemas de referèntzia impreados localmente rechedidi una curretzione dipendente dae sa positzione.
+\n\nUna aprossimassione a custos sistemas de referèntzia locales est su EGM96. OsmAnd como suportada sa bisualizzatzione automàtica de s’artaria in su sistema EGM96.
+\n\nPro l’ativare, isgàrriga su documentu WW15MGH.DAC impreande sa \'Gestione documentos mapa\' (su documentu orizinale s’agatat a s\'indiritzu http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC) "</string>
     <string name="map_widget_max_speed">Lìmite de lestresa</string>
     <string name="monitoring_control_start">GPX</string>
     <string name="no_buildings_found">Perunu edifìtziu agatau.</string>
@@ -425,9 +420,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="voice_stream_music">Àudio media/mùsica</string>
 	<string name="rendering_attr_showRoadMaps_description">Issèbera cando ammustrare mapas cun petzi sas istradas:</string>
 	<string name="rendering_attr_showRoadMaps_name">Mapas cun petzi istradas</string>
-    <string name="safe_mode_description">Avia s\'aplicu in modalidade segura (impreande Android, prus lentu, imbetzes de su còdighe nativu).</string>
+    <string name="safe_mode_description">Avia s’aplicu in modalidade segura (impreande Android, prus lentu, imbetzes de su còdighe nativu).</string>
     <string name="safe_mode">Modalidade segura</string>
-    <string name="native_library_not_running">S\'aplicu est traballande in modalidade segura (la podes disabilitare in sas Impostaduras).</string>
+    <string name="native_library_not_running">S’aplicu est traballande in modalidade segura (la podes disabilitare in sas Impostaduras).</string>
     <string name="background_service_is_enabled_question">Su servitziu OsmAnd in modalidade "a reposu" est galu in esecutzione. Lu boles firmare?</string>
     <string name="tip_recent_changes_1_0_0_t">Mudas in sa 1.0.0:
 	\n\t* Nàvigu megiorau: prus lestru, prus pretzisu, finas a 250 km
@@ -441,20 +436,19 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	\n\t* Abilitatzione de sa modalidade "a reposu" durante su nàvigu.
     </string>
     <string name="close_changeset">Serra sas modìficas</string>
-	<string name="zxing_barcode_scanner_not_found">S\'aplicu ZXing Barcode Scanner non est installada. La boles chircare in su Market?</string>
+	<string name="zxing_barcode_scanner_not_found">S’aplicu ZXing Barcode Scanner non est installadu. Lu boles chircare in su Market?</string>
 	<string name="rendering_attr_roadColors_description">Issèbera una cumbinatzione de colores pro sas istradas:</string>
 	<string name="rendering_attr_roadColors_name">Ischema de colores de sas istradas</string>
     <string name="map_widget_show_destination_arrow">Ammustra sa diretzione de sa destinatzione</string>
-    <string name="enable_plugin_monitoring_services">Abìlita su plugin de compidada pro impreare sos servitzios de registratzione de sa positzione (registratzione GPX, compidada in lìnia)</string>
-    <string name="non_optimal_route_calculation">Càlcula, s\'in casu mai, un\'àndala non primorosa pro sas distantzias longas</string>
+    <string name="enable_plugin_monitoring_services">Abìlita su plugin de arrastamentu pro impreare sos servitzios de registratzione de sa positzione (registratzione GPX, compidada in lìnia)</string>
+    <string name="non_optimal_route_calculation">Càlcula un’àndala, s’in casu mai fintzas non primorosa, pro sas distantzias longas</string>
 	<string name="gps_not_available">Ativa su GPS in sas impostaduras</string>
-    <string name="tip_recent_changes_0_8_3_t">Mudas in sa 0.8.3:
-	\n\t* Puntos mesanos
-	\n\t* Ghia de sa caminera megiorada
-	\n\t* Annangada un\'impostadura chi permittidi de istransire sas autostradas durante sa costrutzione de s\'àndala.
-	\n\t* Annangau una noa casta de istradas pro sas bitzicletas (Cycleway=track)
-	\n\t* Curretzione de errores
-	</string>
+    <string name="tip_recent_changes_0_8_3_t">"Mudas in sa 0.8.3:
+\n\t* Puntos mesanos
+\n\t* Ghia de sa caminera megiorada
+\n\t* Annangada un’impostadura chi permittit de istransire sas autostradas durante sa costrutzione de s’àndala.
+\n\t* Annangau una noa casta de istradas pro sas bitzicletas (Cycleway=track)
+\n\t* Curretzione de errores "</string>
 	<string name="map_widget_monitoring_services">Servitzios de registratzione</string>
 	<string name="no_route">Peruna àndala</string>
 	<string name="delete_target_point">Burra puntu mesanu</string>
@@ -468,11 +462,11 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="replace_destination_point">Remplasa sa desinatzione</string>
     <string name="new_destination_point_dialog">Tenes giai una destinatzione impostada.</string>
     <string name="target_points">Puntos mesanos</string>
-    <string name="intermediate_point_too_far">Su puntu mesanu %1$s est tropu indedda dae s\'istrada prus a curtzu.</string>
+    <string name="intermediate_point_too_far">Su puntu mesanu %1$s est tropu indedda dae s’istrada prus a curtzu.</string>
     <string name="arrived_at_intermediate_point">Ses arribau a su puntu mesanu tuo</string>
     <string name="context_menu_item_intermediate_point">Annanghelu comente puntu mesanu</string>
     <string name="map_widget_intermediate_distance">Puntu mesanu</string>
-    <string name="ending_point_too_far">Puntu finale tropu indedda dae s\'istrada prus a curtzu.</string>
+    <string name="ending_point_too_far">Puntu finale tropu indedda dae s’istrada prus a curtzu.</string>
     <string name="btn_add_tag">Annanghe etichetta</string>
     <string name="btn_advanced_mode">Modalidade avantzada…</string>
     <string name="poi_filter_parking">Parchezu</string>
@@ -498,9 +492,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="interrupt_music_descr">Firma sa mùsica pro fàghere sos annùntzios</string>
 	<string name="interrupt_music">Firma sa mùsica</string>
 	<string name="tip_recent_changes_0_8_2_t">"Mudas in sa 0.8.2:
-\n\t* Megiorau su calculu de sas àndalas
+\n\t* Megioradu su calculu de sas àndalas
 \n\t* Widgets dinàmicos pro sas mapas
-\n\t* Impostaduras de sa mapa iscostiadas in s\'ischermu de sa mapa
+\n\t* Impostaduras de sa mapa iscostiadas in s’ischermu de sa mapa
 \n\t* Butone firma ischermu cun servitzios de registratzione
 \n\t* Megiorada s\'iscritura in àrabu, kannada e limbas RTL "</string>
 	<string name="osmand_play_title_30_chars">OsmAnd Mapas &amp; Nàvigu</string>
@@ -526,17 +520,17 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="enable_sleep_mode">Abìlita sa modalidade GPS \"a reposu\"</string>
 	<string name="gps_wake_up_timer">Intervallu ischidada GPS</string>
 	<string name="sleep_mode_stop_dialog">Firmare sa modalidade GPS \"a reposu\"?</string>
-	<string name="map_preferred_locale_descr">Limba preferida pro sas etichettas de sa mapa (si no est disponìbile at a colare a s\'inglesu o sos nùmenes locales)</string>
+	<string name="map_preferred_locale_descr">Limba preferida pro sas etichettas de sa mapa (si no est disponìbile at a colare a s’inglesu o sos nùmenes locales)</string>
     <string name="map_preferred_locale">Limba prefèrrida de sa mapa</string>
     <string name="local_map_names">Nùmenes locales</string>
     <string name="lang_sw">Swahili</string>
     <string name="lang_he">Ebràicu</string>
     <string name="forward">In antis</string>
     <string name="home">Domo</string>
-    <string name="live_monitoring_m_descr">Imbia s\'arrasta a unu servìtziu web dislindadu si sa registratzione GPX est abilitada.</string>
+    <string name="live_monitoring_m_descr">Imbia s’arrastamentu a unu servìtziu web dislindadu si sa registratzione GPX est abilitada.</string>
 	<string name="live_monitoring_m">Arrastamentu in lìnia (GPX rechestu)</string>
-    <string name="live_monitoring_start">Inghitza s\'arrastamentu in lìnia</string>
-	<string name="live_monitoring_stop">Firma s\'arrastamentu in lìnia</string>
+    <string name="live_monitoring_start">Inghitza s’arrastamentu in lìnia</string>
+	<string name="live_monitoring_stop">Firma s’arrastamentu in lìnia</string>
 	<string name="gpx_monitoring_start">Inghitza sa registratzione GPX</string>
 	<string name="gpx_monitoring_stop">Firma sa registratzione GPX</string>
     <string name="gpx_start_new_segment">Inghitza unu segmentu nou</string>
@@ -555,7 +549,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="osmo_auth_error_short">Autorizatzione fallida</string>
     <string name="osmo_auth_error">Errore de autorizatzione OsMo: %1$s.\nDiat podet èssere unu disservitziu temporaneu o sa registratzione tua est iscadia.\nBoles protzèdere cun una registratzione noa?</string>
     <string name="osmo_group_by_invite">Atzèdere pro mèdiu de invitu</string>
-    <string name="osmo_group_information_desc">" - Totu sos grupos creados sunt pùblicos! Si bolies abarrare anònimos connettìe sos dispositìvos a manera dereta pro mèdiu de sos id de arrastamentu.\n- A su grupu podent èssere registradas finas a 16 pessones.\n- In su casu de inatividade o de atividade de una pessone sola pro duas chidas, su grupu at a èssere burrau.\n- Est possìbile limidare s\'atzèssu a su grupu, petzi prò mèdiu de invitu, pro nàrrere, pro amministrare su grupu depies andare a su pannellu di amministratzione.\n- Si tenies bisòngiu de creare unu grupu ad àteras cunditziones pro piaghere visitae http://osmo.mobi"</string>
+    <string name="osmo_group_information_desc">" - Totu sos grupos creados sunt pùblicos! Si bolies abarrare anònimos connettìe sos dispositìvos a manera dereta pro mèdiu de sos id de arrastamentu.\n- A su grupu podent èssere registradas finas a 16 pessones.\n- In su casu de inatividade o de atividade de una pessone sola pro duas chidas, su grupu at a èssere burrau.\n- Est possìbile limidare s’atzèssu a su grupu, petzi prò mèdiu de invitu, pro nàrrere, pro amministrare su grupu depies andare a su pannellu di amministratzione.\n- Si tenies bisòngiu de creare unu grupu ad àteras cunditziones pro piaghere visitae http://osmo.mobi"</string>
     <string name="osmo_group_information">Pro piaghere leghide in antis de creare unu grupu!</string>
     <string name="osmo_gpx_points_downloaded">Igarrigados puntos %1$s de OsMo.</string>
     <string name="osmo_start_service">Servìtziu OsMo</string>
@@ -563,7 +557,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="no_index_file_to_download">Nudda de isgarrigare, pro piaghere compida sa connessione internet.</string>
     <string name="select_index_file_to_download">No est istadu agatau nudda. Si no agatades sa zona vostra la podies ingendrare bois (bie http://osmand.net).</string>
     <string name="none_selected_gpx">Perunu documentu GPX ischertau. Pro ischertare tene carcau in supra de una de sas rastas disponìbiles.</string>
-    <string name="local_index_unselect_gpx_file">Boga s\'ischerta</string>
+    <string name="local_index_unselect_gpx_file">Boga s’ischerta</string>
     <string name="local_index_select_gpx_file">Ischerta pro l\'ammustrare</string>
     <string name="gpx_split_interval">Intervallu partidura</string>
     <string name="sort_by_distance">Òrdina pro distàntzia</string>
@@ -582,7 +576,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="selected">ischertau</string>
     <string name="local_index_gpx_info_show">\n\ntene carcau pro sas optziones</string>
 	<string name="gpx_info_subtracks">"Suta-rastas: %1$s "</string>
-	<string name="gpx_info_waypoints">"Tapas de s\'àndala: %1$s "</string>
+	<string name="gpx_info_waypoints">"Tapas de s’àndala: %1$s "</string>
 	<string name="gpx_info_distance">"Distàntzia: %1$s (%2$s points) "</string>
 	<string name="gpx_info_start_time">"Oràriu de tzuccada: %1$tF, %1$tT "</string>
 	<string name="gpx_info_end_time">"Oràriu de lòmpida: %1$tF, %1$tT "</string>
@@ -610,18 +604,18 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="my_favorites">Prefèrridos meos</string>
     <string name="my_data_Button">Logos meos</string>
     <string name="my_data_activity">Logos meos</string>
-    <string name="osmo_user_joined">S\'impitadore %1$s est intrau in su grupu %2$s</string>
-    <string name="osmo_user_left">S\'impitadore %1$s at lassau su grupu %2$s</string>
+    <string name="osmo_user_joined">S’impitadore %1$s est intradu in su grupu %2$s</string>
+    <string name="osmo_user_left">S’impitadore %1$s at lassadu su grupu %2$s</string>
     <string name="osmo_show_group_notifications">Ammustra sas notìficas de su grupu</string>
-    <string name="osmo_show_group_notifications_descr">Ammustra unu messàgiu cando s\'impitadore adèridi o lassada su grupu</string>
+    <string name="osmo_show_group_notifications_descr">Ammustra unu messàgiu cando s’impitadore adèridi o lassada su grupu</string>
     <string name="osmo_follow">Sighi</string>
     <string name="osmo_sign_in">Autènticadi</string>
     <string name="osmo_create_groups_confirm">Pro creare grupos est netzessàriu èssere impitadores registrados de OsMo.</string>
     <string name="osmo_credentials_not_valid">Sas credenziales de OsMo tuas non sunt vàlidas.</string>
     <string name="osmo_regenerate_login_ids_confirm">Ses seguru de bòlere reingendrare sos id pessonales? Totu sos dispositivos collegaos a tie non ant a èssere prus capassios de t\'arrastare.</string>
-    <string name="osmo_regenerate_login_ids">Reingendra s\'id</string>
-    <string name="osmo_cancel_moving_target">Burra s\'obietivu mòbile</string>
-    <string name="osmo_center_location">Tzentra in s\'ischermu</string>
+    <string name="osmo_regenerate_login_ids">Torra a ingendrare s’id</string>
+    <string name="osmo_cancel_moving_target">Burra s’obietivu mòbile</string>
+    <string name="osmo_center_location">Tzentra in s’ischermu</string>
     <string name="osmo_set_moving_target">Imposta comente obietivu mòbile</string>
     <string name="osmo_use_server_name">Nùmene registrau</string>
     <string name="osmo_connect_to_my_nickname">Zistru meu</string>
@@ -635,19 +629,19 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="color_blue">blu</string>
 	<string name="color_green">birde</string>
 	
-    <string name="osmo_edit_device">Muda sas propriedades de s\'impitadore</string>
+    <string name="osmo_edit_device">Muda sas propriedades de s’impitadore</string>
     <string name="osmo_edit_color">Colore visualizzau</string>
     <string name="osmo_group_info">Informatziones</string>
     <string name="osmo_group">Grupu OsMo</string>
-    <string name="osmo_group_share">Pro si collegare a su grupu %2$s, dislindare s\'id de su grupu (%1$s) o carcare %3$s.</string>
+    <string name="osmo_group_share">Pro si collegare a su grupu %2$s, dislindare s’id de su grupu (%1$s) o carcare %3$s.</string>
     <string name="osmo_share_connect_device">Permìti de sighire permanentemente custu dispositivu</string>
     <string name="osmo_share_current_session">Cumpartzi custa sessione in su browser</string>
     <string name="osmo_session_not_available">Sessione non disponìbile, pro piaghere controlla chi \'Imbia positziones\' siat ativu.</string>
     <string name="osmo_share_session">Cumpartzi sessione</string>
     <string name="osmo_session_id_share">Url de sa sessione pro arrastare su dispositivu (%1$s)</string>
-    <string name="osmo_tracker_id_share">Pro si collegare a su dispositivu disigiau %2$s, carcare su ligòngiu %3$s o dislindare s\'id de compidada (%1$s)</string>
+    <string name="osmo_tracker_id_share">Pro si collegare a su dispositivu disigiadu %2$s, carcare su ligòngiu %3$s o dislindare s’id de arrastamentu (%1$s)</string>
     <string name="osmo_track_interval">Intervallu de registratzione</string>
-	<string name="osmo_track_interval_descr">Issèbera s\'intervallu de tempus pro s\'imbiu de sa positzione</string>
+	<string name="osmo_track_interval_descr">Issèbera s’intervallu de tempus pro s’imbiu de sa positzione</string>
     <string name="int_days">dies</string>
     <string name="osmo_connect_menu">Connete</string>
     <string name="osmo_expire_group">Iscadidi intre</string>
@@ -670,25 +664,25 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="seconds_ago">secundos àchede</string>
     <string name="osmo_connected_devices">Dispositivos cullegaos</string>
     <string name="osmo_groups">Grupos/Dispositivos OsMo</string>
-    <string name="osmo_auto_send_locations_descr">Avia/Inghitza automaticamente sa registratzione de sa sessione e imbia sa localizatzione a pustis de s\'aviu de s\'aplicu</string>
+    <string name="osmo_auto_send_locations_descr">Avia/Inghitza automaticamente sa registratzione de sa sessione e imbia sa localizatzione a pustis de s\'aviu de s’aplicu</string>
     <string name="osmo_auto_send_locations">Avia automaticamente sa sessione de arrastamentu</string>
     <string name="osmo_tracker_id">Id pessonale arrastamentu</string>
-    <string name="osmo_tracker_id_descr">Carca pro visualizzare o cumpartzire s\'id de arrastamentu. Impreande s\'id de arrastamentu sos dispositivos connessos ant a èssere capatzes de sighire totu sos movimentos de custu dispositivu! Pro ti disconnèttere ischerta s\'optzione Reingendra.</string>
+    <string name="osmo_tracker_id_descr">Carca pro visualizzare o cumpartzire s’id de arrastamentu. Impreande s’id de arrastamentu sos dispositivos connessos ant a èssere capatzes de sighire totu sos movimentos de custu dispositivu! Pro ti disconnèttere ischerta s’optzione \"Torra a ingendrare\".</string>
     <string name="osmo_session_token">Token de sa sessione: %1$s</string>
-    <string name="osmo_auth_pending">Isetande pro s\'autorizatzione…</string>
+    <string name="osmo_auth_pending">Isetande pro s’autorizatzione…</string>
     <string name="osmo_locations_sent">"Localizatziones imbiadas %1$d (in su buffer %2$d) "</string>
     <string name="osmo_conn_successfull">"Connessione istabilida: %1$s "</string>
-    <string name="tip_recent_changes_1_8_alpha">"Mudas in sa 1.8: * Càlcula s\'àndala intre duos puntos de una rasta GPX * Mudada s\'aspetu pro s\'isgarrigamentu de sos istados (suportu pro sa chirca cun nùmenes locales) * Suportu pro s\'importatzione GPX/KML (cunvertere dae KML a GPX) * Sas rastas GPX sunt istadas mòvidas in \'Datos meos\' * Como podes partzire sas rastas GPX pro distantzia e compidare sa diferèntzia de artària/ lestresa * Aviu automàticu de su nàvigu a pustis de un isetu curtzu "</string>
-    <string name="use_points_as_intermediates">Càlcula s\'àndala intre sos puntos</string>
+    <string name="tip_recent_changes_1_8_alpha">"Mudas in sa 1.8: * Càlcula s’àndala intre duos puntos de una rasta GPX * Mudadu s’aspetu pro s’isgarrigamentu de sos istados (suportu pro sa chirca cun nùmenes locales) * Suportu pro s’importatzione GPX/KML (cunvertere dae KML a GPX) * Sas rastas GPX sunt istadas mòvidas in \'Datos meos\' * Como podes partzire sas rastas GPX pro distantzia e compidare sa diferèntzia de artària/ lestresa * Aviu automàticu de su nàvigu a pustis de un isetu curtzu "</string>
+    <string name="use_points_as_intermediates">Càlcula s’àndala intre sos puntos</string>
     <string name="osmo_mode_restart">Reavia sa sessione OsMo</string>
     <string name="osmo_settings_debug">Informatziones de debug</string>
     <string name="lang_fa">Persianu</string>
 	<string name="route_descr_destination">Destinatzione</string>
     <string name="osmo_not_signed_in">Atzessu ad OsMo falliu</string>
-    <string name="osmo_auto_connect_descr">Connèttidi automaticamente a su servìtziu a pustis de s\'allughinzu</string>
+    <string name="osmo_auto_connect_descr">Connèttidi automaticamente a su servìtziu a pustis de s’allughinzu</string>
     <string name="osmo_auto_connect">Connessione automàtica</string>
     <string name="map_widget_renderer">Istile de sa mapa</string>
-	<string name="layer_map_appearance">Cunfigura s\'ischermu</string>
+	<string name="layer_map_appearance">Cunfigura s’ischermu</string>
 	<string name="show_lanes">Visualizza sas corsias</string>
 	<string name="avoid_unpaved">Instransi sas istradas no asfaltadas</string>
 	<string name="avoid_ferries">Istransi sos traghetos</string>
@@ -702,17 +696,17 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="bg_service_sleep_mode_on">Firma\n modalidade \"a reposu\"</string>
 	<string name="gps_wakeup_interval">Intervallu de ischidada GPS: %s</string>
 	<string name="int_continuosly">Sighidu</string>
-	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. OsmAnd offridi fintzas sa funtzionalidade de su càlculu de s\'àndala in lìnia (online) e sena lìnia (offline) cumpresa sa boghe de ghia curva pro curva. Calicunas de sas caraterìsticas printzipales: - Funtzionalidade cumprida sena lìnia (Sarba sas mapas vetoriales o a tasseddos in sa memòria de su dispositivu) - Mapas sena lìnia cumpatas isgarrigàbiles pro totu su mundu - Igariiramentu de sas mapas de regiones o istados deretamente dae sa mapa - Possibilidade de sovrapposizione de diferentes istratos, comente rastas GPX o de nàvigu, puntos de interesse, preffèrridos, curvas de livellu, firmadas de sos mezos pùblicos, mapas annangàbiles cun trasparentzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (PDI) - Càlculu de s\'àndala pro distàntzias curtzas (isperimentale) - Modalidades màchina, bitzicleta, e pedone cun: - Muda automàtica optzionale de sa vista die/note - Zoom automàticu optzionale basau in supra de sa lestresa - Allineamentu de sa mapa basandesi in supra de sa diretzione o de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS  -  Limitatziones de custa versione gratùita de OsmAnd: - Nùmeru limitadu de isgarrigamentu de mapas - Atzessu a Wikipedia pro sos PDI sena lìnia fartante- OsmAnd est totora in fase de isvilupu e su progetu nostru e su  progressu suo si basada in supra de sos contributos finantziarios pro s\'isvilupu e s\'iscumprou (sa prova) de funtzionalidades noas. Pro piaghere cunsidera s\'optzione de comporare OsmAnd+, de finantziare novas funtziones didlindadas o de fàghere una donatzione generale a osmand.net. "</string>
+	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un aplicu pro su nàvigu chi impreat sa cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s’ischeda de su telèfono pro èssere impreadas sena lìnia. OsmAnd offridi fintzas sa funtzionalidade de su càlculu de s’àndala in lìnia (online) e sena lìnia (offline) cumpresa sa boghe de ghia curva pro curva. Calicunas de sas caraterìsticas printzipales: - Funtzionalidade cumprida sena lìnia (Sarba sas mapas vetoriales o a tasseddos in sa memòria de su dispositivu) - Mapas sena lìnia cumpatas isgarrigàbiles pro totu su mundu - Igariiramentu de sas mapas de regiones o istados deretamente dae sa mapa - Possibilidade de sovrapposizione de diferentes istratos, comente rastas GPX o de nàvigu, puntos de interesse, preffèrridos, curvas de livellu, firmadas de sos mezos pùblicos, mapas annangàbiles cun trasparentzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (PDI) - Càlculu de s’àndala pro distàntzias curtzas (isperimentale) - Modalidades màchina, bitzicleta, e pedone cun: - Muda automàtica optzionale de sa vista die/note - Zoom automàticu optzionale basau in supra de sa lestresa - Allineamentu de sa mapa basandesi in supra de sa diretzione o de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS  -  Limitatziones de custa versione gratùita de OsmAnd: - Nùmeru limitadu de isgarrigamentu de mapas - Atzessu a Wikipedia pro sos PDI sena lìnia fartante- OsmAnd est totora in fase de isvilupu e su progetu nostru e su  progressu suo si basada in supra de sos contributos finantziarios pro s’isvilupu e s’iscumprou (sa prova) de funtzionalidades noas. Pro piaghere cunsidera s’optzione de comporare OsmAnd+, de finantziare novas funtziones didlindadas o de fàghere una donatzione generale a osmand.net. "</string>
 	<string name="lang_al">Albanesu</string>
 	<string name="lang_ar">Àrabu</string>
 	<string name="lang_sc">Sardu</string>
 	<string name="lang_sr">Serbu</string>
 	<string name="lang_zh_CN">Tzinesu semplificau</string>
 	<string name="lang_zh_TW">Tzinesu traditzionale</string>
-	<string name="osmand_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions) est un aplicu pro su nàvigu chi impreat sa  cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. Impreande su GPS de su dispositivu OsmAnd ofèrridi su nàvigu cun, s\'in casu, sa ghia vocale, pro sa màchina, sa bitzicleta e a pedes. Totu sas funtzionalidades sunt disponìbiles siat in lìnia chi sena lìnia (non serbit connessione ad ìnternet).↵ ↵ Calicuna de sas caraterìsticas printzipales: Nàvigu - Funtziònada in lìnia (lestru) o sena lìnia (sena costos candu ses in s\'èstero) - Ghia bogale bortada pro bortada(boghes registradas e sintetizzadas) - Indicatzione de corsia optzionale, indicatzione de su nùmene de s\'istrada, indicatzione de su tempus de lòmpida istimadu - Suportada puntos mesanos in s\'àndala - Recàlculu automàticu cada borta chi èssis dae s\'àndala - Chirca pro indiritzu, pro gasta (es.: ristorante, albergu, istatzione de servìtziu, museu) e pro coordinatas geogràficas de sos locos Visualizatzione de sa mapa - Ammustra sa positzione e s\'orientamentu tuo in sa mapa - Allìnia optzionalmente sa mapa sighinde sa bùssola o sa diretzione de movimentu - Sarba sos locos prus importantes pro tie in sos Prefèrridos - Ammustra sos PDI (puntos de interesse) inghìriu a tie - Podet ammustrare mapas spetzializadas a tasseddos in lìnia - Podet ammustrare vistas satellitares (dae Bing) - Podet ammustrare istratos subraponìbiles diferentes, comente rastas GPX pro nàvigu e mapas additzionales cun trasparentzia pessonalizzàbile - Ammustra sos nùmenes in inglesu, limba locale, o pronùntzia fonètica Imprea datos OpenStreetMap e Wikipedia: - Datos de arta calidade dae sos mègius progetos collaborativos de su mundu - Mapas globales pro OpenStreetMap, disponìbiles pro istadu o regione - Wikipedia PDI, òtimos pro giros turìsticos (non disponìbiles in sa versione gratùita) - Isgarrigamentos gratuitos sena lìmites, diretamente dae s\'aplicu (lìmite de isgarrigamentu de 16 documentos de sa mapa in sa versione gratùita) - Mapas sèmpere agiornadas (a su mancu una borta a su mese) - Mapas vetoriales compatas sena lìnia - Issèbera intre mapas cumpridas e petzi istradales (es: totu su Giapone est 700 MB, o 200 MB pro petzi sas istradas) - Suportada fintzas mapas a tasseddos in lìnia o in sa cache Carateristicas pro sa segurantzia - Muda automàtica optzionale de sa vista die/note - Ammustradura optzionale de su lìmite de lestresa, cun avisos si lu barigas - Zoom automàticu optzionale basau in supra de sa lestresa - Cumpartzi sa positzione tua pro permìtere a sos amicos tuos de t\'agatare Funtziones pro sa bitzicleta e a pede - Sa mapa inclùidi àndalas prp bitzicleta, escursionimu e pedonales, òtimas pro sas atividades a s\'àera aberta - Modalidades ispetziales pro sa bitzicleta e a pedes - Firmadas de su trasportu pùblicu (postales, trams, trenos) optzionales, cun sos nùmenes de sas lìnias incluidos  - Registratzione optionales in documentos GPX locales o servìtzios in lìnia - Ammustradura optzionale de sa lestresa e de s\'artaria - Ammustradura de sas lìnias de livellu e de sas umbraduras de su rilievu (impreande unu componente agiuntivu, o plugin, apòsitu) Contributzione dereta ad OpenStreetMap - Sinnala errores in sa mapa - Càrriga rastas GPX in OSM dderetamente dae s\'aplicu - Annanghe PDI e càrrigalos deretamente in OSM (o prus a tardu si ses sena lìnia) - Registratzione optzionale fintzas in modalidade \"in s\'isfondu\" (cando su dispositivu est in modalidade \"a reposu\") OsmAnd est unu progetu a mitza aberta e est ativamente isvilupau. Cadaunu podet cuntribuire a s\'aplicu marcande errores, megiorande sas bortaduras, o programmande funtzionalidades noas. Su progetu est totora in unu istadu sighidu e vitale de megioramentu pro mèdiu de totu custas formas de interatziones intre impitadores e isvilupadores. Su progetu andada in antis gràtzias fintzas a sas cuntributziones finantziarias, pro titu s\'isvilupu e s\'isperimentatzione de caraterìsticas noas. Comporande OsmAnd+ podes agiudare s\'aplicu a divènnere fintzas prus ispantosu! Est fintzas possìbile finantziare funtziones dislindadas, o fàghere una donatzione generale in osmand.net. Calidade e cubertura aprosimativa: - Western Europe: **** - Eastern Europe: *** - Russia: *** - North America: *** - South America: ** - Asia: ** - Japan &amp; Korea: *** - Middle East: ** - Africa: ** - Antarctica: * Lista de sa regiones suportadas (praticamente totu su mundu!): 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_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions) est un aplicu pro su nàvigu chi impreat sa  cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s’ischeda de su telèfono pro èssere impreadas sena lìnia. Impreande su GPS de su dispositivu OsmAnd ofèrridi su nàvigu cun, s’in casu, sa ghia vocale, pro sa màchina, sa bitzicleta e a pedes. Totu sas funtzionalidades sunt disponìbiles siat in lìnia chi sena lìnia (non serbit connessione ad ìnternet).↵ ↵ Calicuna de sas caraterìsticas printzipales: Nàvigu - Funtziònada in lìnia (lestru) o sena lìnia (sena costos candu ses in s’èstero) - Ghia bogale bortada pro bortada(boghes registradas e sintetizzadas) - Indicatzione de corsia optzionale, indicatzione de su nùmene de s’istrada, indicatzione de su tempus de lòmpida istimadu - Suportada puntos mesanos in s’àndala - Recàlculu automàticu cada borta chi èssis dae s’àndala - Chirca pro indiritzu, pro gasta (es.: ristorante, albergu, istatzione de servìtziu, museu) e pro coordinatas geogràficas de sos locos Visualizatzione de sa mapa - Ammustra sa positzione e s’orientamentu tuo in sa mapa - Allìnia optzionalmente sa mapa sighinde sa bùssola o sa diretzione de movimentu - Sarba sos locos prus importantes pro tie in sos Prefèrridos - Ammustra sos PDI (puntos de interesse) inghìriu a tie - Podet ammustrare mapas spetzializadas a tasseddos in lìnia - Podet ammustrare vistas satellitares (dae Bing) - Podet ammustrare istratos subraponìbiles diferentes, comente rastas GPX pro nàvigu e mapas additzionales cun trasparentzia pessonalizzàbile - Ammustra sos nùmenes in inglesu, limba locale, o pronùntzia fonètica Imprea datos OpenStreetMap e Wikipedia: - Datos de arta calidade dae sos mègius progetos collaborativos de su mundu - Mapas globales pro OpenStreetMap, disponìbiles pro istadu o regione - Wikipedia PDI, òtimos pro giros turìsticos (non disponìbiles in sa versione gratùita) - Isgarrigamentos gratuitos sena lìmites, diretamente dae s’aplicu (lìmite de isgarrigamentu de 16 documentos de sa mapa in sa versione gratùita) - Mapas sèmpere agiornadas (a su mancu una borta a su mese) - Mapas vetoriales compatas sena lìnia - Issèbera intre mapas cumpridas e petzi istradales (es: totu su Giapone est 700 MB, o 200 MB pro petzi sas istradas) - Suportada fintzas mapas a tasseddos in lìnia o in sa cache Carateristicas pro sa segurantzia - Muda automàtica optzionale de sa vista die/note - Ammustradura optzionale de su lìmite de lestresa, cun avisos si lu barigas - Zoom automàticu optzionale basau in supra de sa lestresa - Cumpartzi sa positzione tua pro permìtere a sos amicos tuos de t’agatare Funtziones pro sa bitzicleta e a pede - Sa mapa inclùidi àndalas prp bitzicleta, escursionimu e pedonales, òtimas pro sas atividades a s’àera aberta - Modalidades ispetziales pro sa bitzicleta e a pedes - Firmadas de su trasportu pùblicu (postales, trams, trenos) optzionales, cun sos nùmenes de sas lìnias incluidos  - Registratzione optionales in documentos GPX locales o servìtzios in lìnia - Ammustradura optzionale de sa lestresa e de s’artaria - Ammustradura de sas lìnias de livellu e de sas umbraduras de su rilievu (impreande unu componente agiuntivu, o plugin, apòsitu) Contributzione dereta ad OpenStreetMap - Sinnala errores in sa mapa - Càrriga rastas GPX in OSM dderetamente dae s’aplicu - Annanghe PDI e càrrigalos deretamente in OSM (o prus a tardu si ses sena lìnia) - Registratzione optzionale fintzas in modalidade \"in s’isfundu\" (cando su dispositivu est in modalidade \"a reposu\") OsmAnd est unu progetu a mitza aberta e est ativamente isvilupau. Cadaunu podet cuntribuire a s’aplicu marcande errores, megiorande sas bortaduras, o programmande funtzionalidades noas. Su progetu est totora in unu istadu sighidu e vitale de megioramentu pro mèdiu de totu custas formas de interatziones intre impitadores e isvilupadores. Su progetu andada in antis gràtzias fintzas a sas cuntributziones finantziarias, pro titu s’isvilupu e s’isperimentatzione de caraterìsticas noas. Comporande OsmAnd+ podes agiudare s’aplicu a divènnere fintzas prus ispantosu! Est fintzas possìbile finantziare funtziones dislindadas, o fàghere una donatzione generale in osmand.net. Calidade e cubertura aprosimativa: - Western Europe: **** - Eastern Europe: *** - Russia: *** - North America: *** - South America: ** - Asia: ** - Japan &amp; Korea: *** - Middle East: ** - Africa: ** - Antarctica: * Lista de sa regiones suportadas (praticamente totu su mundu!): 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="rendering_attr_subwayMode_name">Àndalas metropolitana</string>
- 	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est unu aplicu a mitza aberta pro su nàvigu chi tènet atzessu a sa variedade manna de datos globales de Openstreetmap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in sa memòria de su telèfono pro èssere impreadas sena lìnia. OsmAnd ofèrridi fintzas una funtzione de nàvigu cun ghia vocale in lìnia e sena lìnia. OsmAnd+ est sa versione a pagamentu, comporandela suportas su progetu, finantzias s\'isvilupu de funtzionalidades noas, e retzives totu sos ùrtimos agiornamentos. Calicuna de sas funtziones printzipales: - Funtzionalidade cumprida sena lìnia (sarba mapas vetoriales o a tasseddos in sa memòria de su dispositivu) - Mapas compatas sena lìnia disponìbiles pro totu su mundu - Isgarrigamentu sena lìmites de mapas de regiones e istados deretamente dae s\'aplicu - Funtzionalidade sena lìnia de Wikipedia (isgàrriga PDI Wikipedia), òtima pro giros turìsticos - Possibilidade de subraporre diferentes istratos de mapas, comente rastas GPX o de nàvigu, Puntos De Interesse, prefèrridos, lìnias de livellu, firmadas de sos trasportos pùblicos, mapas addizionales cun trasparèntzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (PDI) - Càlculu de s\'àndala sena lìnia pro distantzias curtzas (isperimentale) - Modalidades in màchina, bitzicleta, e a pede cun: - muda automàtica optzionale de sa vista die/note - zoom automàticu optzionale basau in supra de sa lestresa - allineamentu de sa mapa basandesi in supra de sa diretzione o de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS "</string>
-	<string name="osmand_plus_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions) est un aplicu pro su nàvigu chi impreat sa  cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s\'ischeda de su telèfono pro èssere impreadas sena lìnia. Impreande su GPS de su dispositivu OsmAnd ofèrridi su nàvigu cun, s\'in casu, sa ghia vocale, pro sa màchina, sa bitzicleta e a pedes. Totu sas funtzionalidades sunt disponìbiles siat in lìnia chi sena lìnia (non serbit connessione ad ìnternet).↵ ↵ Calicuna de sas caraterìsticas printzipales: Nàvigu - Funtziònada in lìnia (lestru) o sena lìnia (sena costos candu ses in s\'èstero) - Ghia bogale bortada pro bortada(boghes registradas e sintetizzadas) - Indicatzione de corsia optzionale, indicatzione de su nùmene de s\'istrada, indicatzione de su tempus de lòmpida istimadu - Suportada puntos mesanos in s\'àndala - Recàlculu automàticu cada borta chi èssis dae s\'àndala - Chirca pro indiritzu, pro gasta (es.: ristorante, albergu, istatzione de servìtziu, museu) e pro coordinatas geogràficas de sos locos Visualizatzione de sa mapa - Ammustra sa positzione e s\'orientamentu tuo in sa mapa - Allìnia optzionalmente sa mapa sighinde sa bùssola o sa diretzione de movimentu - Sarba sos locos prus importantes pro tie in sos Prefèrridos - Ammustra sos PDIs (puntos de interesse) inghìriu a tie - Podet ammustrare mapas spetzializadas a tasseddos in lìnia - Podet ammustrare vistas satellitares (dae Bing) - Podet ammustrare istratos subraponìbiles diferentes, comente rastas GPX pro nàvigu e mapas additzionales cun trasparentzia pessonalizzàbile - Ammustra sos nùmenes in inglesu, limba locale, o pronùntzia fonètica Imprea datos OpenStreetMap e Wikipedia: - Datos de arta calidade dae sos mègius progetos collaborativos de su mundu - Mapas globales pro OpenStreetMap, disponìbiles pro istadu o regione - Wikipedia PDI, òtimos pro giros turìsticos (non disponìbiles in sa versione gratùita) - Isgarrigamentos gratuitos sena lìmites, diretamente dae s\'aplicu (lìmite de isgarrigamentu de 16 documentos de sa mapa in sa versione gratùita) - Mapas sèmpere agiornadas (a su mancu una borta a su mese) - Mapas vetoriales compatas sena lìnia - Issèbera intre mapas cumpridas e petzi istradales (es: totu su Giapone est 700 MB, o 200 MB pro petzi sas istradas) - Suportada fintzas mapas a tasseddos in lìnia o in sa cache Carateristicas pro sa segurantzia - Muda automàtica optzionale de sa vista die/note - Ammustradura optzionale de su lìmite de lestresa, cun avisos si lu barigas - Zoom automàticu optzionale basau in supra de sa lestresa - Cumpartzi sa positzione tua pro permìtere a sos amicos tuos de t\'agatare Funtziones pro sa bitzicleta e a pede - Sa mapa inclùidi àndalas prp bitzicleta, escursionimu e pedonales, òtimas pro sas atividades a s\'àera aberta - Modalidades ispetziales pro sa bitzicleta e a pedes - Firmadas de su trasportu pùblicu (postales, trams, trenos) optzionales, cun sos nùmenes de sas lìnias incluidos  - Registratzione optionales in documentos GPX locales o servìtzios in lìnia - Ammustradura optzionale de sa lestresa e de s\'artaria - Ammustradura de sas lìnias de livellu e de sas umbraduras de su rilievu (impreande unu componente agiuntivu, o plugin, apòsitu) Contributzione dereta ad OpenStreetMap - Sinnala errores in sa mapa - Càrriga rastas GPX in OSM dderetamente dae s\'aplicu - Annanghe PDI e càrrigalos deretamente in OSM (o prus a tardu si ses sena lìnia) - Registratzione optzionale fintzas in modalidade \"in s\'isfondu\" (cando su dispositivu est in modalidade \"a reposu\") OsmAnd est unu progetu a mitza aberta e est ativamente isvilupau. Cadaunu podet cuntribuire a s\'aplicu marcande errores, megiorande sas bortaduras, o programmande funtzionalidades noas. Su progetu est totora in unu istadu sighidu e vitale de megioramentu pro mèdiu de totu custas formas de interatziones intre impitadores e isvilupadores. Su progetu andada in antis gràtzias fintzas a sas cuntributziones finantziarias, pro titu s\'isvilupu e s\'isperimentatzione de caraterìsticas noas. Comporande OsmAnd+ podes agiudare s\'aplicu a divènnere fintzas prus ispantosu! Est fintzas possìbile finantziare funtziones dislindadas, o fàghere una donatzione generale in osmand.net. Calidade e cubertura aprosimativa: - Western Europe: **** - Eastern Europe: *** - Russia: *** - North America: *** - South America: ** - Asia: ** - Japan &amp; Korea: *** - Middle East: ** - Africa: ** - Antarctica: * Lista de sa regiones suportadas (praticamente totu su mundu!): 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_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est unu aplicu a mitza aberta pro su nàvigu chi tènet atzessu a sa variedade manna de datos globales de Openstreetmap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in sa memòria de su telèfono pro èssere impreadas sena lìnia. OsmAnd ofèrridi fintzas una funtzione de nàvigu cun ghia vocale in lìnia e sena lìnia. OsmAnd+ est sa versione a pagamentu, comporandela suportas su progetu, finantzias s’isvilupu de funtzionalidades noas, e retzives totu sos ùrtimos agiornamentos. Calicuna de sas funtziones printzipales: - Funtzionalidade cumprida sena lìnia (sarba mapas vetoriales o a tasseddos in sa memòria de su dispositivu) - Mapas compatas sena lìnia disponìbiles pro totu su mundu - Isgarrigamentu sena lìmites de mapas de regiones e istados deretamente dae s’aplicu - Funtzionalidade sena lìnia de Wikipedia (isgàrriga PDI Wikipedia), òtima pro giros turìsticos - Possibilidade de subraporre diferentes istratos de mapas, comente rastas GPX o de nàvigu, Puntos De Interesse, prefèrridos, lìnias de livellu, firmadas de sos trasportos pùblicos, mapas addizionales cun trasparèntzia pessonalizzàbile - Chirca sena lìnia pro indiritzos e locos (PDI) - Càlculu de s’àndala sena lìnia pro distantzias curtzas (isperimentale) - Modalidades in màchina, bitzicleta, e a pede cun: - muda automàtica optzionale de sa vista die/note - zoom automàticu optzionale basau in supra de sa lestresa - allineamentu de sa mapa basandesi in supra de sa diretzione o de sa bùssola - indicatore de corsia optzionale, segnalatzione de su lìmite de lestresa, boghes registradas e TTS "</string>
+	<string name="osmand_plus_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions) est un aplicu pro su nàvigu chi impreat sa  cantidade manna de datos a mitza aberta de OpenStreetMap (OSM). Totu sas mapas (vetoriales o a tasseddos) podent èssere sarbadas in s’ischeda de su telèfono pro èssere impreadas sena lìnia. Impreande su GPS de su dispositivu OsmAnd ofèrridi su nàvigu cun, s’in casu, sa ghia vocale, pro sa màchina, sa bitzicleta e a pedes. Totu sas funtzionalidades sunt disponìbiles siat in lìnia chi sena lìnia (non serbit connessione ad ìnternet).↵ ↵ Calicuna de sas caraterìsticas printzipales: Nàvigu - Funtziònada in lìnia (lestru) o sena lìnia (sena costos candu ses in s’èstero) - Ghia bogale bortada pro bortada(boghes registradas e sintetizzadas) - Indicatzione de corsia optzionale, indicatzione de su nùmene de s’istrada, indicatzione de su tempus de lòmpida istimadu - Suportada puntos mesanos in s’àndala - Recàlculu automàticu cada borta chi èssis dae s’àndala - Chirca pro indiritzu, pro gasta (es.: ristorante, albergu, istatzione de servìtziu, museu) e pro coordinatas geogràficas de sos locos Visualizatzione de sa mapa - Ammustra sa positzione e s’orientamentu tuo in sa mapa - Allìnia optzionalmente sa mapa sighinde sa bùssola o sa diretzione de movimentu - Sarba sos locos prus importantes pro tie in sos Prefèrridos - Ammustra sos PDIs (puntos de interesse) inghìriu a tie - Podet ammustrare mapas spetzializadas a tasseddos in lìnia - Podet ammustrare vistas satellitares (dae Bing) - Podet ammustrare istratos subraponìbiles diferentes, comente rastas GPX pro nàvigu e mapas additzionales cun trasparentzia pessonalizzàbile - Ammustra sos nùmenes in inglesu, limba locale, o pronùntzia fonètica Imprea datos OpenStreetMap e Wikipedia: - Datos de arta calidade dae sos mègius progetos collaborativos de su mundu - Mapas globales pro OpenStreetMap, disponìbiles pro istadu o regione - Wikipedia PDI, òtimos pro giros turìsticos (non disponìbiles in sa versione gratùita) - Isgarrigamentos gratuitos sena lìmites, diretamente dae s’aplicu (lìmite de isgarrigamentu de 16 documentos de sa mapa in sa versione gratùita) - Mapas sèmpere agiornadas (a su mancu una borta a su mese) - Mapas vetoriales compatas sena lìnia - Issèbera intre mapas cumpridas e petzi istradales (es: totu su Giapone est 700 MB, o 200 MB pro petzi sas istradas) - Suportada fintzas mapas a tasseddos in lìnia o in sa cache Carateristicas pro sa segurantzia - Muda automàtica optzionale de sa vista die/note - Ammustradura optzionale de su lìmite de lestresa, cun avisos si lu barigas - Zoom automàticu optzionale basau in supra de sa lestresa - Cumpartzi sa positzione tua pro permìtere a sos amicos tuos de t’agatare Funtziones pro sa bitzicleta e a pede - Sa mapa inclùidi àndalas prp bitzicleta, escursionimu e pedonales, òtimas pro sas atividades a s’àera aberta - Modalidades ispetziales pro sa bitzicleta e a pedes - Firmadas de su trasportu pùblicu (postales, trams, trenos) optzionales, cun sos nùmenes de sas lìnias incluidos  - Registratzione optionales in documentos GPX locales o servìtzios in lìnia - Ammustradura optzionale de sa lestresa e de s’artària - Ammustradura de sas lìnias de livellu e de sas umbraduras de su rilievu (impreande unu componente agiuntivu, o plugin, apòsitu) Contributzione dereta ad OpenStreetMap - Sinnala errores in sa mapa - Càrriga rastas GPX in OSM dderetamente dae s’aplicu - Annanghe PDI e càrrigalos deretamente in OSM (o prus a tardu si ses sena lìnia) - Registratzione optzionale fintzas in modalidade \"in s’isfondu\" (cando su dispositivu est in modalidade \"a reposu\") OsmAnd est unu progetu a mitza aberta e est ativamente isvilupau. Cadaunu podet cuntribuire a s’aplicu marcande errores, megiorande sas bortaduras, o programmande funtzionalidades noas. Su progetu est totora in unu istadu sighidu e vitale de megioramentu pro mèdiu de totu custas formas de interatziones intre impitadores e isvilupadores. Su progetu andada in antis gràtzias fintzas a sas cuntributziones finantziarias, pro titu s’isvilupu e s’isperimentatzione de caraterìsticas noas. Comporande OsmAnd+ podes agiudare s’aplicu a divènnere fintzas prus ispantosu! Est fintzas possìbile finantziare funtziones dislindadas, o fàghere una donatzione generale in osmand.net. Calidade e cubertura aprosimativa: - Western Europe: **** - Eastern Europe: *** - Russia: *** - North America: *** - South America: ** - Asia: ** - Japan &amp; Korea: *** - Middle East: ** - Africa: ** - Antarctica: * Lista de sa regiones suportadas (praticamente totu su mundu!): 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="local_index_poi_data">Datos PDI</string>
 	<string name="local_indexes_cat_poi">Datos PDI</string>
 	<string name="poi_context_menu_modify">Muda PDI</string>
@@ -723,20 +717,20 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="poi">PDI</string>
 	<string name="local_openstreetmap_settings">PDI/Errores sarbados in locale</string>
 	<string name="index_name_wiki">PDI Wikipedia mondiale</string>
-	<string name="update_poi_is_not_available_for_zoom">S\'agiornamentu de sos PDI non est disponìbile pro livellos de zoom bassos</string>
+	<string name="update_poi_is_not_available_for_zoom">S’agiornamentu de sos PDI non est disponìbile pro livellos de zoom bassos</string>
 	<string name="tip_update_index_t">"Mapas agiorndas sunt fundamentales pro sa visione sena lìnia, pro sa chirca tramite PDI/indiritzu, e pro su nàvigu sena lìnia. OsmAnd frunidi unu gestore de sas mapas pro las isgarrigare e pro chircare pro agiornamentos.
 \n\nPro isgarrigare mapas bae in \'Impostaduras\' → \'Amministra documentos de sas mapas\' → \'Isgàrriga\'.
-\n\nA pustis chi sa lista globale de sas regiones at a èssere istada isgarrigada, carca in supra de unu ogetu pro isgarrigare o carrigare unu documentu. Pro piaghere nota s\'isseberadore de tiou de documentu in sa parte arta de s\'ischermu pro ischertare su tipu de isgarrigamentu chi boles (mapas regulares, umbraduras de sos rilievos, etc.).
-\n\nPodes filtrare sa lista de sas regiones iscrivende carchi lètera, o  ischertande s\'optzione \'Impostaduras\' → \'Filtra isgarrigadas \' pro bìere agiornamentos pro petzi sos datos chi tenes giai in su dispositivu.
+\n\nA pustis chi sa lista globale de sas regiones at a èssere istada isgarrigada, carca in supra de unu ogetu pro isgarrigare o carrigare unu documentu. Pro piaghere nota s’isseberadore de tipu de documentu in sa parte arta de s\'ischermu pro ischertare su tipu de isgarrigamentu chi boles (mapas regulares, umbraduras de sos rilievos, etc.).
+\n\nPodes filtrare sa lista de sas regiones iscrivende carchi lètera, o  ischertande s’optzione \'Impostaduras\' → \'Filtra isgarrigadas \' pro bìere agiornamentos pro petzi sos datos chi tenes giai in su dispositivu.
 \n\n\t* Boghes in \'birde\' indicana documentos de datos identicos in su dispositivu e in su server
 \n\t* Boghes in \'blu\' indicana agioramentos disponìbiles in su server
 \n\t* Boghes in corsivu indicana datos deativados in su dispositivu "</string>
 	<string name="map_widget_vector_attributes">Caraterìsticas de su disinnu</string>
-	<string name="screen_is_locked">Pro dearreere s\'ischermu carca s\'icona de su luchete</string>
-	<string name="map_widget_top_text">Nùmene de s\'istrada</string>
-	<string name="map_widget_config">Cunfigura s\'ischermu</string>
+	<string name="screen_is_locked">Pro disarreare s’ischermu carca s’icona de su luchete</string>
+	<string name="map_widget_top_text">Nùmene de s’istrada</string>
+	<string name="map_widget_config">Cunfigura s’ischermu</string>
 	<string name="map_widget_back_to_loc">In ue so</string>
-	<string name="map_widget_lock_screen">Areea s\'ischermu</string>
+	<string name="map_widget_lock_screen">Arrea s’ischermu</string>
 	<string name="map_widget_compass">Bùssola</string>
 	<string name="map_widget_top_stack">Barra de istadu:</string>
 	<string name="map_widget_reset">Reimposta sos valores predefinidos</string>
@@ -751,34 +745,34 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="map_widget_next_turn">Bortada imbeniente</string>
 	<string name="map_widget_next_turn_small">Bortada imbeniente (minore)</string>
 	<string name="map_widget_next_next_turn">Segunda bortada imbeniente</string>
-	<string name="map_widget_mini_route">Minimapa de s\'àndala</string>
-	<string name="bg_service_screen_lock">Areea s\'ischermu</string>
-	<string name="bg_service_screen_unlock">Deareea s\'ischermu</string>
-	<string name="bg_service_screen_lock_toast">S\'ischermu est areeau</string>
-	<string name="bg_service_interval">Imposta s\'intervallu de ischidada:</string>
+	<string name="map_widget_mini_route">Minimapa de s’àndala</string>
+	<string name="bg_service_screen_lock">Arrea s’ischermu</string>
+	<string name="bg_service_screen_unlock">Disarrea s’ischermu</string>
+	<string name="bg_service_screen_lock_toast">S’ischermu est arreadu</string>
+	<string name="bg_service_interval">Imposta s’intervallu de ischidada:</string>
 	<string name="show_cameras">Ammustra autovelox</string>
 	<string name="show_traffic_warnings">Ammustra lìmites de lestresa</string>
 	<string name="avoid_toll_roads">Istansi sas istradas a pedàgiu</string>
 	<string name="continue_follow_previous_route_auto">Su nàvigu pretzedente no est istadu cumpridu. Sighire cun cussu? (%1$s segundos)</string>
-	<string name="route_updated_loc_found">S\'àndala at a èssere calculada a positzione achirida</string>
+	<string name="route_updated_loc_found">S’àndala at a èssere calculada a positzione achirida</string>
 	<string name="osmand_parking_hours">Oras</string>
 	<string name="osmand_parking_minutes">Minutos</string>
 	<string name="osmand_parking_position_description_add_time">Sa màchina est istada parchegiada a sas:</string>
 	<string name="tip_recent_changes_0_8_1_t">"Mudas in sa 0.8.1:
 \n\t* Àndalas prus pretzisas (unu pagu prus lentas)
-\n\t* Ricalculu de s\'àndala intelligente e lestru
+\n\t* Ricalculu de s’àndala intelligente e lestru
 \n\t* Diretzione basadas in supra de sas corsias
 \n\t* Informaztiones in supra de lìmites de lestresa, autovelox, e dossos rallentadores
 \n\t* Boghe de ghia in sas autostradas megiorada
 \n\t* Cumponente agiuntivu (plugin) pro su parchègiu (\'In ue est sa màchina mea?\')
 \n\t* Abìlita/disabìlita su widget pro sa compidada "</string>
-	<string name="select_animate_speedup">Issèbera sa lestresa de s\'animatzione de s\'àndala</string>
+	<string name="select_animate_speedup">Issèbera sa lestresa de s’animatzione de s’àndala</string>
     	<string name="global_app_allocated_memory_descr">Memòria allocata %1$s MB (lìmite de Android %2$s MB, Dalvik %3$s MB).</string>
 	<string name="global_app_allocated_memory">Memòria allocata</string>
-	<string name="native_app_allocated_memory_descr">Memòria nativa totale allocada dae s\'aplicu %1$s MB (Dalvik %2$s MB, àteru %3$s MB). Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</string>
+	<string name="native_app_allocated_memory_descr">Memòria nativa totale allocada dae s’aplicu %1$s MB (Dalvik %2$s MB, àteru %3$s MB). Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</string>
 	<string name="native_app_allocated_memory">Memòria nativa locale</string>
-	<string name="update_downlod_list">Torra a carrigare s\'elencu</string>
-	<string name="starting_point_too_far">Puntu de mòida tropu distante dae s\'istrada prus a curtzu.</string>
+	<string name="update_downlod_list">Torra a carrigare s’elencu</string>
+	<string name="starting_point_too_far">Puntu de mòida tropu distante dae s’istrada prus a curtzu.</string>
 	<string name="shared_location">Positzione cumpartzida</string>
 	<string name="osmand_parking_event">Piga sa màchina dae su parchègiu</string>
 	<string name="osmand_parking_warning">Atentzione</string>
@@ -786,10 +780,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="osmand_parking_choose_type">Issèbera su tipu de parchègiu</string>
 	<string name="osmand_parking_lim_text">A tempus</string>
 	<string name="osmand_parking_no_lim_text">Sena lìmites de tempus</string>
-	<string name="osmand_parking_add_event">Annanghe una notìfica a s\'aplicu Calendariu</string>
+	<string name="osmand_parking_add_event">Annanghe una notìfica a s’aplicu Calendàriu</string>
 	<string name="osmand_parking_time_limit">Parchègiu a tempus</string>
 	<string name="osmand_parking_time_no_limit">Parchègiu sena lìmites de tempus</string>
-	<string name="osmand_parking_position_description">Sa positzione de s\'auto parchegiada tua. %1$s</string>
+	<string name="osmand_parking_position_description">Sa positzione de sa màchina parchegiada tua. %1$s</string>
 	<string name="osmand_parking_pm">PM</string>
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">Puntu de parchègiu</string>
@@ -801,8 +795,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="gpxup_trackable">Arrastàbile</string>
 	<string name="gpxup_private">Privadu</string>
 	<string name="asap">ASAP</string>
-	<string name="save_route_as_gpx">Sarba s\'àndala comente documentu GPX</string>
-	<string name="share_route_as_gpx">Cumpartzi s\'àndala comente documentu GPX</string>
+	<string name="save_route_as_gpx">Sarba s’àndala comente documentu GPX</string>
+	<string name="share_route_as_gpx">Cumpartzi s’àndala comente documentu GPX</string>
 	<string name="share_route_subject">Àndala cumpartzida tràmite OsmAnd</string>
 	<string name="route_kl">Mantène sa manca e sighi</string>
 	<string name="route_kr">Mantène sa destra e sighi</string>
@@ -822,16 +816,16 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<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="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="confirm_interrupt_download">Boles firmare s’isgarrigamentu de sos documentos?</string>
 	<string name="local_indexes_cat_tile">Mapas in lìnia a tasseddos</string>
 	<string name="local_indexes_cat_map">Mapas non in lìnia (vetoriales)</string>
 	<string name="map_online_data">Mapas in lìnia e a tasseddos</string>
-	<string name="map_online_data_descr">Imprea sas mapas in lìnia (iscàrriga e archìvia sos tasseddos in s\'ischeda SD)</string>
+	<string name="map_online_data_descr">Imprea sas mapas in lìnia (iscàrriga e archìvia sos tasseddos in s’ischeda SD)</string>
 	<string name="online_map_settings">Mapas in lìnia</string>
 	<string name="online_map_settings_descr">Cunfigura sas mitzas de sas mapas in lìnia o de sos tasseddos in cache</string>
 	<string name="map_settings">Impostaduras mapas</string>
 	<string name="map_settings_descr">Cunfigura sa visualizatzione de sa mapa</string>
-	<string name="osmand_accessibility_description">Ammustra sas impostaduras pro funtzionalidades ispetziales pro s\'atzessibilidade.</string>
+	<string name="osmand_accessibility_description">Ammustra sas impostaduras pro funtzionalidades ispetziales pro s’atzessibilidade.</string>
 	<string name="extra_settings">Impostaduras avantzadas</string>
 	<string name="plugins_screen">Plugins</string>
 	<string name="select_plugin_to_activate">Issèbera unu plugin pro l\'ativare o lu disativare. (Diat pòdere serbire su reaviu de OsmAnd.)</string>
@@ -846,12 +840,12 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="validate_gpx_upload_name_pwd">Imposta impitadore e crae (password) de OSM pro carrigare documentos GPX.</string>
     	<string name="default_buttons_support">Sustènne</string>
 	<string name="support_new_features">Sustènne caraterìsticas noas</string>
-	<string name="show_ruler_level">Visualizza s\'iscala gràfica</string>	
+	<string name="show_ruler_level">Ammustra s’iscala gràfica</string>	
 	<string name="info_button">Info</string>
 	<string name="back_to_location">Torra a sa positzione</string>
 	<string name="help">Agiudu</string>
 	<string name="accessibility_mode">Modalidade atzessìbile</string>
-	<string name="accessibility_mode_descr">Abìlita sas funtziones chi pertocant a s\'atzessibilidade</string>
+	<string name="accessibility_mode_descr">Abìlita sas funtziones chi pertocant a s’atzessibilidade</string>
 	<string name="accessibility_on">Ativau</string>
 	<string name="accessibility_off">Deativau</string>
 	<string name="backToMenu">Torra a su Menù</string>
@@ -883,7 +877,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="settings_direction_style">Istile de sa diretzione</string>
 	<string name="i_am_here">Deo so inoghe</string>
 	<string name="use_short_object_names">Imprea sos nùmenes de sos ogetos</string>
-	<string name="accessibility_preferences_descr">Preferèntzias relatas a s\'atzessibilidade</string>
+	<string name="accessibility_preferences_descr">Preferèntzias ligadas a s’atzessibilidade</string>
 	<string name="accessibility_preferences">Atzessibilidade</string>
     <string name="local_openstreetmap_uploading">Carrigamentu …</string>
 	<string name="local_openstreetmap_uploadall">Carriga totu</string>
@@ -910,7 +904,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="global_settings">Impostaduras globales</string>
 	<string name="general_settings">Impostaduras generales</string>
 	<string name="general_settings_descr">Cunfigura sas impostaduras globales</string>
-	<string name="global_app_settings">Impostaduras globales de s\'aplicu</string>
+	<string name="global_app_settings">Impostaduras globales de s’aplicu</string>
 	<string name="user_name">Nùmene impitadore in OSM</string>
 	<string name="user_password">Crae (password) in OSM</string>
 	<string name="tip_rotation_switching">Orientamentu de sa mapa</string>
@@ -941,7 +935,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="search_position_favorites">Prefèrridos…</string>
 	<string name="select_search_position">Chirca a curtzu de:</string>
 	<string name="context_menu_item_search">Chirca a curtzu de inoghe</string>
-	<string name="save_route_dialog_title">Sarba s\'àndala comente rasta GPX</string>
+	<string name="save_route_dialog_title">Sarba s’àndala comente rasta GPX</string>
 	<string name="route_successfully_saved_at">Àndala sarbada comente \'%1$s\'.</string>
 	<string name="filename_input">"Nùmene documentu: "</string>
 	<string name="file_with_name_already_exist">Esistit giai unu documentu cun su matessi numene.</string>
@@ -950,11 +944,11 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="rendering_attr_coloredBuildings_name">Edifìtzios colorados pro casta</string>
     <string name="osmo_invite">Invita…</string>
     <string name="osmo_leave_confirmation_msg">Boles essire dae su grupu %1$s?</string>
-    <string name="osmo_specify_tracker_id">Pro piaghere dislinda s\'id</string>
+    <string name="osmo_specify_tracker_id">Pro piaghere dislinda s’id</string>
     <string name="continue_navigation">Sighi cun su nàvigu</string>
     <string name="pause_navigation">Pone in pasu su nàvigu</string>
-    <string name="rendering_attr_alpineHiking_name">Iscala pro s\'alpinismu (SAC)</string>
-    <string name="rendering_attr_alpineHiking_description">Disinna sas camineras basandeti in supra de s\'iscala SAC</string>
+    <string name="rendering_attr_alpineHiking_name">Iscala pro s’alpinismu (SAC)</string>
+    <string name="rendering_attr_alpineHiking_description">Disinna sas camineras basande•ti in supra de s’iscala SAC</string>
     <string name="rendering_attr_osmcTraces_name">Istratu sìmbulos escursionisticos</string>
     <string name="rendering_attr_osmcTraces_description">Disinna sas camineras sighinde sas rastas OSMC</string>
     
@@ -981,10 +975,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="poi_dialog_comment">Cummentu</string>
 	<string name="poi_dialog_name">Nùmene</string>
 	<string name="poi_error_info_not_loaded">Informatziones relatas a su nodu non carrigadas</string>
-	<string name="poi_error_io_error_template">Errore de I/O durante s\'esecutzione de s\'atzione {0}.</string>
+	<string name="poi_error_io_error_template">Errore de I/O durante s’esecutzione de s’atzione {0}.</string>
 	<string name="poi_action_succeded_template">Atzione {0} reseddida cumpridamente.</string>
-	<string name="first_time_msg">Gratzias pro s\'impreu de OsmAnd. Pro meda de sas caraterìsticas de s\'àplicu tènes bisongiu de datos locales sena lìnia, chi podent èssere icarrigadas dae \'Impostaduras\'→\'Amministra sos documentos de sas mapas\'. A pustis at a èssere possìbile ammustrare mapas, chircare indirìtzos, PDI, e agatare trasportos pùblicos.</string>    
-	<string name="basemap_was_selected_to_download">Sa mapa de base est pedida pro su funtzionamentu curretu de s\'àplicu e est idada ischertada pro s\'iscarrigamentu.</string>
+	<string name="first_time_msg">Gratzias pro s’impreu de OsmAnd. Pro meda de sas caraterìsticas de s’àplicu tènes bisongiu de datos locales sena lìnia, chi podent èssere icarrigadas dae \'Impostaduras\'→\'Amministra sos documentos de sas mapas\'. A pustis at a èssere possìbile ammustrare mapas, chircare indirìtzos, PDI, e agatare trasportos pùblicos.</string>    
+	<string name="basemap_was_selected_to_download">Sa mapa de base est netzessària pro su funtzionamentu curretu de s’àplicu e est istada ischertada pro s’iscarrigamentu.</string>
 	<string name="osmand_extra_settings_description">Ammustra sas impostaduras pro sa cunfiguratzione avantzada de sa mapa (comente aumentare sas minujas) e calicunas de dispositivos dislindados.</string>
 	<string name="osmand_development_plugin_description">Ammustra impostaduras pro funtzionalidades in isvilupu e debug comente su nàvigu animadu o ammustrare sa prestatzione de su rendering.</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Sas mapas vetoriales diat dèpere apàrrere in manera prus lestra. In carchi dispositivu diat podere funtzionare male.</string>
@@ -995,11 +989,11 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	
 	<string name="tip_recent_changes_0_8_0_t">"Mudas in sa 0.8.0:
 \n\t- *Funtzionalidade a plugin*
-\n\t - Medas de sas funtzionalidades sunt afiotadas pro carateristicas e podent èssere abilitadas/disabilitadas in sas impostaduras de su plugin. Podes abilitare mitzas pro mapas a tasseddos (in lìnia o in cache), impostaduras pro s\'arrastamentu, e meda àteras funtziones noas e giai esistentes.
+\n\t - Medas de sas funtzionalidades sunt afiotadas pro carateristicas e podent èssere abilitadas/disabilitadas in sas impostaduras de su plugin. Podes abilitare mitzas pro mapas a tasseddos (in lìnia o in cache), impostaduras pro s’arrastamentu, e meda àteras funtziones noas e giai esistentes.
 \n\t- *Suportu nou pro sas mapas sena lìnia*
 \n\t - Su rendering de sas mapas diventada prus lestru e prus pretzisu (sos problemas pro sas lìnias de costa e sas areas allagadas sunt istados acontzados).
 \n\t - Depes icarrigare totu datos sena lìnia novos (sos betzos no ant a èssere prus suportados)
-\n\t- *Càlculu de s\'àndala sena lìnia*
+\n\t- *Càlculu de s’àndala sena lìnia*
 \n\t - Su càlculu de sas àndala divènnidi prus sòlidu\n\t *Megioramentos impreabilidade e UI*
 \n\t - Megioramentos in medas àreas "</string>
 	<string name="osm_editing_plugin_description">Ammustra sasimpostaduras netzessàrias pro cuntribuire ad OSM comente sa regorta/muda de sos PDI de OSM, apèrrere/cummentare errores de OSM e inviare documentos GPX registrados (rechedet sas credentziales de OSM).</string>
@@ -1011,9 +1005,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 \n\t- Creatzione sena lìnia de sos PDI
 \n\t- Atzessibilidade
 \n\t- Medas curretziones de errores "</string>
-	<string name="support_new_features_descr">Faghe una donatzione pro tènnere funtzionalidades noas inmplementadas in s\'àplicu</string>
-	<string name="accessibility_extensions_descr">Estensiones pro s\'atzessibilidade pro versiones bècias de Android</string>
-	<string name="accessibility_extensions">Estensiones pro s\'atzessibilidade</string>
+	<string name="support_new_features_descr">Faghe una donatzione pro tènnere funtzionalidades noas implementadas in s’àplicu</string>
+	<string name="accessibility_extensions_descr">Estensiones pro s’atzessibilidade pro versiones bècias de Android</string>
+	<string name="accessibility_extensions">Estensiones pro s’atzessibilidade</string>
 	<string name="accessibility_default">Basada in supra de sas impostaduras globales de sistema</string>
 	<string name="zoomOut">Zoom in segus</string>
 	<string name="zoomIn">Zoom in antis</string>
@@ -1024,10 +1018,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="back_left">A manca in segus</string>
 	<string name="front_left">A manca in antis</string>
 	<string name="towards">cara a</string>
-	<string name="settings_direction_style_descr">Issèbera s\'istile in cui benint espressadas in movimentu sas diretziones relativas</string>
-	<string name="auto_announce_on">Incumentza s\'autosinnalatzione</string>
-	<string name="auto_announce_off">Firma s\'autosinnalatzione</string>
-	<string name="scroll_map_by_gestures_descr">Move sa mapa cun sos gestos in s\'ischermu tàtile</string>
+	<string name="settings_direction_style_descr">Issèbera s’istile in su cale benint espressadas in movimentu sas diretziones relativas</string>
+	<string name="auto_announce_on">Incumentza s’autosinnalatzione</string>
+	<string name="auto_announce_off">Firma s’autosinnalatzione</string>
+	<string name="scroll_map_by_gestures_descr">Move sa mapa cun sos gestos in s’ischermu tàtile</string>
 	<string name="scroll_map_by_gestures">Iscurrimentu naturale de sa mapa</string>
 	<string name="zoom_by_trackball_descr">Muda su zoom de sa mapa cun movimentos orizontales de sa trackball</string>
 	<string name="zoom_by_trackball">Imprea sa trackball pro controllare su zoom</string>
@@ -1037,8 +1031,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="arrival_distance_factor_late">Tardu</string>
     <string name="arrival_distance_factor_at_last">A sos ùrtimos metros</string>
     <string name="arrival_distance">Annuntziu lòmpida</string>
-    <string name="arrival_distance_descr">Cantu in antis lu boles s\'annuntziu de sa lòmpida?</string>
-    <string name="rendering_out_of_memory">Memoria menguante (non bastante) pro visualizzare s\'àrea ischertada</string>
+    <string name="arrival_distance_descr">Cantu in antis lu boles s’annuntziu de sa lòmpida?</string>
+    <string name="rendering_out_of_memory">Memoria menguante (non bastante) pro visualizzare s’àrea ischertada</string>
 	<string name="use_fluorescent_overlays">Subrapositziones fluorescentes</string>
 	<string name="use_fluorescent_overlays_descr">Imprea colores fluorescentes pro visualizzare rastas e àndalas</string>
 	<string name="offline_edition">Mudaduras sena lìnia</string>
@@ -1047,21 +1041,21 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 \n\t- Acòntzu sena lìnia de sos PDI
 \n\t- Optzione arrastamentu in lìnia - imbia a manera periòdica coordinadas a su servìtziu web  (leghe comente impostare su servìtziu tuo in sos artìculos HowTo)
 \n\t- Ammustra rastas registradas in sa mapa
-\n\t- Individuatzione diretzione: \'Faghe borta ad U\' est indicadu e annuntziadu cando b\'est movimentu in sa diretzione opposta o si est istada brincada una borta
+\n\t- Individuatzione diretzione: \'Faghe borta ad U\' est indicadu e annuntziadu cando b’est movimentu in sa diretzione opposta o si est istada brincada una borta
 \n\t- Avisu vocale nou: \'Àndala torrada a calculare\'
 \n\t- Indicatzione visiva, tramite muda de su colore de sa fritza, de bortada imbeniente intre 100m
-\n\t- Como fintzas sos documentos deativados benint visualizzados in s\'ischermada de icarrigamentu, in birde e blu iscuru
+\n\t- Como fintzas sos documentos deativados benint visualizzados in s’ischermada de icarrigamentu, in birde e blu iscuru
 \n\t- Àteras mudas "</string>
-	<string name="update_poi_does_not_change_indexes">Sa modìficas de sos PDI intre s\'aplicu non tenent efetos in sas mapas iscarrigadas, sunt imbetzes sarbadas in unu documentu locale.</string>
+	<string name="update_poi_does_not_change_indexes">Sa modìficas de sos PDI intre s’aplicu non tenent efetos in sas mapas iscarrigadas, sunt imbetzes sarbadas in unu documentu locale.</string>
 	<string name="local_openstreetmap_were_uploaded">{0} PDI/sos errores sunt istados carrigados</string>
 	<string name="local_openstreetmap_upload">Càrriga sa modìfica in OSM</string>
 	<string name="local_openstreetmap_delete">Burra sa modìfica</string>
 	<string name="local_openstreetmap_descr_title">Muda asìncrona de OSM:</string>
 	<string name="local_openstreetmap_settings_descr">Ammustra e amministra sos PDI/errores OSM in intro de su database locale</string>
-	<string name="live_monitoring_interval_descr">Dislinda s\'intervallu de s\'arrastamentu in lìnia</string>
-	<string name="live_monitoring_interval">Intervallu de s\'arrastamentu in dereta (in lìnia)</string>
-	<string name="live_monitoring_url_descr">Dislinda s\'indiritzu ìnternet cun sa sintassi de sos paràmetros: lat={0}, lon={1}, data/ora={2}, hdop={3}, artària={4}, lestresa={5}, àngulu={6}</string>
-	<string name="live_monitoring_url">Indiritzu ìnternet pro s\'arrastamentu in dereta</string>
+	<string name="live_monitoring_interval_descr">Dislinda s’intervallu de s’arrastamentu in lìnia</string>
+	<string name="live_monitoring_interval">Intervallu de s’arrastamentu in dereta (in lìnia)</string>
+	<string name="live_monitoring_url_descr">Dislinda s’indiritzu ìnternet cun sa sintassi de sos paràmetros: lat={0}, lon={1}, data/ora={2}, hdop={3}, artària={4}, lestresa={5}, àngulu={6}</string>
+	<string name="live_monitoring_url">Indiritzu ìnternet pro s’arrastamentu in dereta</string>
 	<string name="gpx_monitoring_disabled_warn">Registra sa rasta impreande su widget GPX o sas impostaduras \'Registratzione biàgios\'.</string>
 	<string name="tip_recent_changes_0_7_0_t">"Modìficas in sa 0.7.0:
 \n\t- Artìculos de Wikipeda atzessìbiles sena lìnia
@@ -1070,27 +1064,27 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="free_version_message">Custa versione gratùita de OsmAnd est limitada a %1$s iscarrigamentos e non suportada sos artìculos sena lìnia de Wikipedia.</string>
 	<string name="index_name_voice">Indicatziones vocales (registradas, funtzionalidades limitadas)</string>
 	<string name="index_name_tts_voice">Indicatziones vocales (TTS-sintetizadas, preferìbiles)</string>
-	<string name="amenity_type_user_defined">Definidu dae s\'impitadore</string>
+	<string name="amenity_type_user_defined">Definidu dae s’impitadore</string>
 	<string name="fav_export_confirmation">Esistint documentos cun prefèrridos esportados giai. Los boles remplasare?</string>
 	<string name="index_settings">Amministra sos documentos de sas mapas</string>
 	<string name="user_name_descr">Netzessàriu pro imbiare contributos a openstreetmap.org</string>
 	<string name="user_password_descr">Netzessària pro imbiare contributos a openstreetmap.org</string>
 	<string name="osmand_service">Servìtziu \"a reposu\"</string>
-	<string name="osmand_service_descr">Impreadu pro esecutare OsmAnd cun s\'ischermu mortu</string>
-	<string name="tip_rotation_switching_t_v2">"Podes mudare comente boles sa rotatzione de s\'immàgine de sa mapa carcande in s\'icona de sa bùssola in s\'ischermu de sa mapa.
+	<string name="osmand_service_descr">Impreadu pro esecutare OsmAnd cun s’ischermu mortu</string>
+	<string name="tip_rotation_switching_t_v2">"Podes mudare comente boles sa rotatzione de s’immàgine de sa mapa carcande in s’icona de sa bùssola in s’ischermu de sa mapa.
 \n\nSas optziones sunt:
 \n\t* \'Non rotare (nord in supra)\': Sa mapa no at a èssere rotada. Su nord at a èssere semper in artu
 \n\t* \'In sa diretzione de su movimentu\': Sa mapa at a èssere aliniada cun sa diretzione tua
 \n\t* \'Cun sa bùssola\': Sa mapa at a èssere alliniada cun sa bùssola de su dispositivu "</string>
 	<string name="binary_map_download_success">"Iscarrigamentu cumpridu.
 \n\t\n\tPro las impreare ativare \'Menù\' → \'Cunfigura sa mapa\' → \'Mitza mapa…\' → \'Mapas vetoriales non in lìnia\'. "</string>
-	<string name="tip_day_night_mode_t_v2">"S\'aparèntzia de sa mapa podet èssere, pro calicuna de sas mapas vetoriales, mudada intre die (lugherosa) e note (iscura). Sos colores noturnos sunt prus seguros e de mancu infadosos pro sa ghia noturna.
+	<string name="tip_day_night_mode_t_v2">"S’aparèntzia de sa mapa podet èssere, pro calicuna de sas mapas vetoriales, mudada intre die (lugherosa) e note (iscura). Sos colores noturnos sunt prus seguros e de mancu infadosos pro sa ghia noturna.
 \n\nPodes impostare una règula pro su càmbiu da die a note in \'Menu\' → \'Cunfigura sa mapa\' → \'Mapa die/note\'.
 \n\nSas optziones sunt:
 \n\t* \'Arbèschida/Intrinada\': modalidade automàtica, cuntrollada dae sa positzione de su sole (preimpostada)
 \n\t* \'Die\': imprea semper sa modalidade diurna
 \n\t* \'Note\': imprea semper sa modalidade noturna
-\n\t* \'Sensore de lughentesa\': s\'aparèntzia de sa mapa est cuntrollada dae su sensore de lughentesa de su dispositivu (petzi si est disponìbile) "</string>	
+\n\t* \'Sensore de lughentesa\': s’aparèntzia de sa mapa est cuntrollada dae su sensore de lughentesa de su dispositivu (petzi si est disponìbile) "</string>	
 	<string name="download_files_not_enough_space">Non b\'est memòria bastante pro iscarrigare %1$s MB (lìberos: %2$s).</string>
 	<string name="download_files_question_space">Sa memòria disponìbile est de {2} MB! Iscarrigare {0} documentu(os) ({1} MB)?</string>
 	<string name="use_transparent_map_theme">Tema transparente</string>
@@ -1102,25 +1096,25 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="rendering_value_pedestrian_name">A pedes</string>
     <string name="tip_osm_improve_t">"OsmAnd imprea mapas basadas in supra de datos Openstreetmap.org (OSM) e podet èssere impreau pro megiorare sa calidade de datos OSM. Podes creare e carrigare PDI novos o sinnalatziones de errores in OSM in una manera simple meda.
 \n\nPro lu fàghere depes ativare in antis su plugin \'Mudas OSM\' dae \'Impostaduras\' → \'Gestore plugins\', e a pustis pònnere sas credentziales tuas de atzessu in \'Impostaduras\' → \'Mudas OSM\'.
-\n\nPro annànghere unu PDI nou imprea s\'optzione \'Crea PDI\' in su menù contestuale. Sighi iscriende sas informatziones chi petocant su PDI in sa setzione \'Create POI\' e imbia.
-\n\nFintzas sos errores in sas mapas podent èssere sinnalados, gasi sa comunidade OSM los podet currègere. Imprea s\'optzione \'Sinnala errore OSM\' in su menù contestuale. Pustis pone una descritzione a sa minuda de su problema e imbia carcande \'Annanghe\'.
+\n\nPro annànghere unu PDI nou imprea s’optzione \'Crea PDI\' in su menù contestuale. Sighi iscriende sas informatziones chi petocant su PDI in sa setzione \'Create POI\' e imbia.
+\n\nFintzas sos errores in sas mapas podent èssere sinnalados, gasi sa comunidade OSM los podet currègere. Imprea s’optzione \'Sinnala errore OSM\' in su menù contestuale. Pustis pone una descritzione a sa minuda de su problema e imbia carcande \'Annanghe\'.
 \n\nOsmAnd suportada sa possibilidade de sarbare sas cuntributziones tuas in su telèfono, ma sa connessione ìnternet est netzessària pro carrigare sos PDI e sas sinnalatziones in OSM. "</string>
 	<string name="gpx_option_reverse_route">Furria diretzione GPX</string>
 	<string name="rotate_map_bearing_opt">In sa diretzione de sa mòvida</string>
 	<string name="show_view_angle">Ammustra diretzione de osservatzione de abbaidadura</string>
 	<string name="tip_navigation_t">"Pro otènnere indicatziones, mantène carcau in supra de su logu de destinatzione (pustis carca sa descritzione sua e ischerta \'Indicatziones pro\'), o ischerta \'Indicatziones\' a pustis de àere carcau unu resurtau o unu prefèrridu.
-\n\nSa destinatzione est sinnada in sa mapa cun una bandera e OsmAnd at a ammustrare sa distàntzia de lòmpida e sa diretzione pro la segudare in lìnia d\'àera (cun unu triàngulu arantzu).
+\n\nSa destinatzione est sinnada in sa mapa cun una bandera e OsmAnd at a ammustrare sa distàntzia de lòmpida e sa diretzione pro la segudare in lìnia d’àera (cun unu triàngulu arantzu).
 \n\nPodes ischertare \'Avia nàvigu\' pro pedire ad OsmAnd de ti ghiare finas a sa destinatzione impreande avisos vocales (si sunt abilitados), etc. Si nono ischerta \'Ammustra àndala\' pro otènnere una ghia fissa sena agiornamentos.
-\n\nPro ammustrare un\'àndala pro sa destinatzione ischertada dae unu puntu diferente dae su in su cale ses, ischerta su puntu in sa mapa e carca \'Diretziones dae\'.
-\n\nSi as a impreare \'Diretziones dae\' paris cun \'Avia nàvigu\', OsmAnd at a colare a sa positzione tua in pessu de l\'àere agatada (custu permìtidi de aviare su nàvigu fintzas prima de connòschere sa positzione in ue ses), mentres \'Diretziones dae\' paris cun \'Ammustra àndala\' at a ammustrare petzi s\'àndala dae unu puntu calechisiat sena agiornamentos imbenientes. "</string>
+\n\nPro ammustrare un’àndala pro sa destinatzione ischertada dae unu puntu diferente dae su in su cale ses, ischerta su puntu in sa mapa e carca \'Diretziones dae\'.
+\n\nSi as a impreare \'Diretziones dae\' paris cun \'Avia nàvigu\', OsmAnd at a colare a sa positzione tua in pessu de l’àere agatada (custu permìtidi de aviare su nàvigu fintzas prima de connòschere sa positzione in ue ses), mentres \'Diretziones dae\' paris cun \'Ammustra àndala\' at a ammustrare petzi s’àndala dae unu puntu calechisiat sena agiornamentos imbenientes. "</string>
 	<string name="tip_recent_changes_0_6_9_t">"Mudas in sa 0.6.9 :
-\n\t- Megiorau su disinnu de sas mapas non in lìnia
+\n\t- Megioradu su disinnu de sas mapas non in lìnia
 \n\t- Disinnu lestru de sas mpas non in lìnia nativas - abbàida in sas funtziones isperimentales (diat pòdere non funtzionare in carchi dispositivu)
 \n\t- Mudas mannas de aparèntzia
-\n\t- Informatziones de s\'artària
+\n\t- Informatziones de s’artària
 \n\t- Bortaduras noas (Vietnamita, Polacu)\n\t- Àteras funtzionalidades minores "</string>
 	<string name="choose_auto_follow_route">Tzentra automaticamente sa mapa</string>
-	<string name="choose_auto_follow_route_descr">Issèbera s\'intervallu de tempus pro sa sincronizatzione de sa bisura de sa mapa cun sa positzione atuale</string>
+	<string name="choose_auto_follow_route_descr">Issèbera s’intervallu de tempus pro sa sincronizatzione de sa bisura de sa mapa cun sa positzione atuale</string>
 	<string name="keep_informing_descr">Torra ad annutziare a intervallos regolares sas indicatziones de nàvigu</string>
     <string name="auto_follow_route_navigation">Tzentra automaticamente petzi durante su nàvigu</string>
 	<string name="auto_follow_route_navigation_descr">Tzentra automaticamente sa bisura de sa mapa petzi durante su nàvigu.</string>
@@ -1132,7 +1126,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="tip_recent_changes_0_6_8_t">"Mudas in sa 0.6.8:
 \n\t- Menù de chirca torrau a disinnare (PDI, Indiritzos)! Como sa chirca de sos tzìvicos est meda prus lestra e funztionada mègius. Interfàtzia cun medas optziones diferentes creada.
 \n\t- Posta sa chirca pro nùmene de sos PDI in àreas mannas (istados)
-\n\t- Curretu s\'istenterju de s\'ischermada de sa mapa in sos tablets (Problema 641)
+\n\t- Curretu s’istenterju de s’ischermada de sa mapa in sos tablets (Problema 641)
 \n\t- Optzione de tzentradura automàtica de sa mapa (Problema 356)
 \n\t- GPX navigation moved to \'Directions\' and \'Save Directions\' moved to \'About route\'
 \n\t- Sos datos de sos PDI sunt insertaos in unu documentu .obf (iscarrigados a pustis de su 01/10/11)
@@ -1143,7 +1137,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="data_to_search_poi_not_available">Datos locales cuntenentes PDI non presentes.</string>
 	<string name="old_poi_file_should_be_deleted">Su documentu de datos PDI \'%1$s\' est bundajolu e podet èssere burrau.</string>
 	<string name="update_poi_file_not_found">Su documentu pro registrare sas modìficas de sos PDI no est istadu ne agatadu nen creadu.</string>
-	<string name="map_version_changed_info">In su server bi sunt documentos de mapas non compatìbiles cun sa versione atuale de su programma. Pro los iscarrigare e impreare agiorna s\'aplicu a s\'ùritma versione.</string>
+	<string name="map_version_changed_info">In su server bi sunt documentos de mapas non compatìbiles cun sa versione atuale de su programma. Pro los iscarrigare e impreare agiorna s’aplicu a s\'ùritma versione.</string>
 	<string name="local_index_mi_rename">Torra a numenare</string>
 	<string name="search_position_undefined">Non dessinidu</string>
 	<string name="search_position_fixed"/>
@@ -1160,7 +1154,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="favourites_edit_dialog_category">Categoria</string>
 	<string name="vector_map_not_needed">No, gràtzias</string>
 	<string name="basemap_missing">Fartat sa mapa de base de su mundu (totu su mundu pro zoom bassos). Podes iscarrigare World_basemap_x.obf pro unu sistema cumpridu.</string>
-	<string name="vector_data_missing">Fartant sos datos (\'non in lìnia\') in s\'ischeda SD. Ti cussigiamus de los iscarrigare pro poder impreare sas mapas sena lìnia.</string>
+	<string name="vector_data_missing">Fartant sos datos (\'non in lìnia\') in s’ischeda SD. Ti cussigiamus de los iscarrigare pro poder impreare sas mapas sena lìnia.</string>
 	<string name="local_index_installed">Editzione</string>
 	<string name="local_index_items_backuped">%1$d de %2$d ogetu/os deativados curretamente.</string>
 	<string name="local_index_items_deleted">%1$d de %2$d ogetu/os burradu curretamente.</string>
@@ -1172,7 +1166,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="local_index_mi_backup">Deativa</string>
 	<string name="local_index_mi_delete">Burra</string>
 	<string name="local_index_mi_export">Esporta</string>
-	<string name="local_index_mi_reload">Torra a carrigare dae s\'ischeda SD</string>
+	<string name="local_index_mi_reload">Torra a carrigare dae s’ischeda SD</string>
 	<string name="local_index_download">Iscàrriga</string>
 	<string name="local_index_address_data">Datos indiritzos</string>
 	<string name="local_index_transport_data">Datos trasportos pùblicos</string>
@@ -1203,7 +1197,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="vector_data">Mapas vetoriales non in lìnia</string>
 	<string name="choose_audio_stream">Canale d\'essida de sa boghe de ghia</string>
 	<string name="choose_audio_stream_descr">Issèbera su canale pro sa ghia vocale (dipendet dae su sistema)</string>
-	<string name="warning_tile_layer_not_downloadable">S\'aplicu non resessit a iscarrigare s\'istratu de sa mapa %1$s, proa a lu torrare a installare.</string>
+	<string name="warning_tile_layer_not_downloadable">S’aplicu non resessit a iscarrigare s’istratu de sa mapa %1$s, proa a lu torrare a installare.</string>
 	<string name="overlay_transparency_descr">Muda trasparèntzia suprapositzione</string>
 	<string name="overlay_transparency">Trasparèntzia subrapositzione</string>
 	<string name="map_transparency_descr">Muda trasparèntzia de sa mapa de base</string>
@@ -1288,10 +1282,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="poi_filter_custom_filter">Filtru pessonalizadu</string>
 	<string name="poi_filter_namefinder">Chirca nùmenes in lìnia</string>
 	<string name="reading_cached_tiles">Leghidura anteprimas dae sa cache…</string>
-	<string name="version_index_is_big_for_memory">S\'ìnditze \'\'{0}\'\' est tropu mannu pro sa memòria atuale</string>
-	<string name="version_index_is_not_supported">Sa versione de s\'ìnditze \'\'{0}\'\' no est suportada</string>
+	<string name="version_index_is_big_for_memory">S’ìnditze \'\'{0}\'\' est tropu mannu pro sa memòria atuale</string>
+	<string name="version_index_is_not_supported">Sa versione de s’ìnditze \'\'{0}\'\' no est suportada</string>
 	<string name="use_osmand_routing_service">Nàvigu OsmAnd &gt;20km</string>
-	<string name="use_osmand_routing_service_descr">S\'impreu de su nàvigu sena lìnia OsmAnd s\'aplicat petzi a sas àndalas&gt;20 km (isperimentale)</string>
+	<string name="use_osmand_routing_service_descr">S’impreu de su nàvigu sena lìnia OsmAnd s’aplicat petzi a sas àndalas&gt;20 km (isperimentale)</string>
 	<string name="specified_dir_doesnt_exist">Impossìbile agatare sa cartella dislindada.</string>
 	<string name="application_dir">Cartella datos</string>
 	
@@ -1321,7 +1315,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="renderer_load_sucess">Disinnu carrigadu</string>
 	<string name="renderer_load_exception">Errore: disinnu non carrigadu</string>
 	<string name="renderers">Disinnu de sos vetores</string>
-	<string name="renderers_descr">Issèbera s\'aparèntzia de sa mapa vetoriale (sena lìnia)</string>
+	<string name="renderers_descr">Issèbera s’aparèntzia de sa mapa vetoriale (sena lìnia)</string>
 	<string name="poi_context_menu_website">Ammustra giassos web PDI</string>
 	<string name="poi_context_menu_call">Ammustra telèfonos PDI</string>
 	<string name="download_type_to_filter">Crae filtru</string>
@@ -1342,7 +1336,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="poi_context_menu_delete">Burra PDI</string>
 	<string name="rotate_map_compass_opt">Cun bùssola</string>
 	<string name="rotate_map_none_opt">Peruna rotatzione (nord in artu)</string>
-	<string name="rotate_map_to_bearing_descr">Isseberare s\'alliniamentu de sa mapa a s\'ischermu</string>
+	<string name="rotate_map_to_bearing_descr">Isseberare s’alliniamentu de sa mapa a s’ischermu</string>
 	<string name="rotate_map_to_bearing">Orientamentu de sa mapa</string>
 	<string name="fav_imported_sucessfully">Importatzione de sos prefèrridos cumprida</string>
 	<string name="import_file_favourites">Sarbare comente documentu GPX o importare in sos prefèrridos?</string>
@@ -1379,7 +1373,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="hide_poi_filter">Cua filtru</string>
 	<string name="show_poi_filter">Ammustra filtru</string>
 	<string name="search_poi_filter">Filtru</string>
-	<string name="menu_mute_off">S\'àudio est deativadu</string>
+	<string name="menu_mute_off">S’àudio est disativadu</string>
 	<string name="menu_mute_on">Àudio deativadu</string>
 	<string name="download_additional_maps">Iscarrigare sas mapas fartantes %1$s (%2$d MB)?</string>
     <string name="more">Àteru…</string>
@@ -1389,26 +1383,26 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 \n\nA pustis issèbera una manera pro cumpartzire sa posiztione tua. Sas optziones sunt: E-Mail, SMS, o petzi copiare sas coordinadas in sos apuntos. "</string>
 	<string name="old_map_index_is_not_supported">Su formadu datos mapa \'\'{0}\'\' est isputziau e no est suportadu</string>
 	<string name="osmand_routing_experimental">"Su nàvigu sena lìnia de OsmAnd est isperimentale e non funtzionada pro distàntzias prus mannas de  20 km.\n\nSu servìtziu de nàvigu benit furnidu intertantu tramite CloudMade in lìnia."</string>
-	<string name="osmand_net_previously_installed">B\'est installada una versione pretzedente de OsmAnd. Totu sos datos ant a èssere suportados dae s\'aplicu nou. Sos prefèrridos depent èssere esportados dae s\'aplicu bètzu e importados a manuda in su nou.</string>
+	<string name="osmand_net_previously_installed">B’est installada una versione pretzedente de OsmAnd. Totu sos datos ant a èssere suportados dae s’aplicu nou. Sos prefèrridos depent èssere esportados dae s’aplicu bètzu e importados a manuda in su nou.</string>
 	<string name="gps_status_app_not_found">Aplicu istadu GPS no installada. La boles chircare in su Market?</string>
 	<string name="voice_is_not_available_msg">Boghe de ghia non disponìbile. Intra in \'Impostaduras\' → \'Impostaduras generales\' → \'Ghia vocale\', issèbera su pachete prefèrridu e/o iscàrrigalu.</string>
 	<string name="daynight_descr">Issèbera sas règulas pro sa muda de sa modalidade die/note</string>
 	<string name="download_files_question">Iscarrigare {0} documentu/os ({1} MB)?</string>
 	<string name="reload">Torra a carrigare</string>
-	<string name="fast_route_mode_descr">"Abìlita pro calculare s\'àndala prus lestra o disabìlita pro s\'àndala prus curtza "</string>
+	<string name="fast_route_mode_descr">"Abìlita pro calculare s’àndala prus lestra o disabìlita pro s’àndala prus curtza "</string>
 	<string name="select_max_zoom_preload_area">Ischerta su zoom màssimu da precarrigare</string>
 	<string name="continuous_rendering">Disinnu sighidu</string>
 	<string name="continuous_rendering_descr">Ammustra unu disinnu (rendering) sighidu imbetzes de una immàgine istantànea</string>
-	<string name="rendering_exception">Errore in su disinnu de s\'àrea ischertada</string>
+	<string name="rendering_exception">Errore in su disinnu de s’àrea ischertada</string>
 	<string name="transport_searching_transport">Resurtadu trasportos pùblicos (destinatzione peruna):</string>
 	<string name="transport_searching_route">Resurtadu trasportos pùblicos ({0} a destinatzione):</string>
 	<string name="transport_search_again">Reimposta sa chirca de sos trasportos pùblicos</string>
-	<string name="none_region_found">No est istadu agatadu datu perunu pro sas regione in s\'ischeda SD. Iscàrriga sas regiones dae ìnternet.</string>
+	<string name="none_region_found">No est istadu agatadu datu perunu pro sas regione in s’ischeda SD. Iscàrriga sas regiones dae ìnternet.</string>
 	<string name="poi_namefinder_query_empty">Inserta sos paràmetros de chirca pro agatare unu PDI</string>
-	<string name="background_service_wait_int_descr">Ischerta s\'intervallu de tempus pro determinare sa positzione</string>
+	<string name="background_service_wait_int_descr">Ischerta s’intervallu de tempus pro determinare sa positzione</string>
 	<string name="background_service_wait_int">Isetu màssimu pro sa determinatzione</string>
 	<string name="service_stop_background_service">Istuda su servìtziu de nàvigu a reposu</string>
-	<string name="background_service_int_descr">Ischerta s\'intervallu de tempus pro s\'ischidada de su servìtziu a reposu</string>
+	<string name="background_service_int_descr">Ischerta s’intervallu de tempus pro s’ischidada de su servìtziu a reposu</string>
 	<string name="background_service_provider_descr">Issèbera su frunidore de positzione finas a cando si est impreande sa modalidade \"a reposu\"</string>
 	<string name="background_service_provider">Frunidore de positzionamentu</string>
 	<string name="voice_provider_descr">Ischerta sa boghe da impreare pro su nàvigu</string>
@@ -1436,9 +1430,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="map_orientation_default">Orientamentu predefinidu</string>
 	<string name="map_orientation_portrait">Verticale</string>
 	<string name="map_orientation_landscape">Orizontale</string>
-	<string name="map_screen_orientation">Orientamentu de s\'ischermu</string>
+	<string name="map_screen_orientation">Orientamentu de s’ischermu</string>
 	<string name="map_screen_orientation_descr">Verticale, orizontale, o predefinidu (dispositivu)</string>
-	<string name="opening_hours_not_supported">Su formatu de s\'oràriu pro abèrrere no est suportadu pro sa muda</string>
+	<string name="opening_hours_not_supported">Su formatu de s’oràriu pro abèrrere no est suportadu pro sa muda</string>
 	<string name="add_new_rule">Annanghe una regula noa</string>
 	<string name="transport_Routes">Àndalas</string>
 	<string name="transport_Stop">Firmada</string>
@@ -1457,7 +1451,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="show_transport_over_map">Ammustra sas firmadas de su trasportu pùblicu</string>
 	<string name="hello">Aplicu de nàvigu OsmAnd</string>
 	<string name="update_poi_success">Sos datos PDI sunt istados agiornados ({0} sunt istados carrigados)</string>
-	<string name="update_poi_error_local">Errore in s\'agiornamentu locale de sos PDI</string>
+	<string name="update_poi_error_local">Errore in s’agiornamentu locale de sos PDI</string>
 	<string name="update_poi_error_loading">Errore durante su carrigamentu de sos datos dae su server</string>
 	<string name="update_poi_no_offline_poi_index">Non sunt disponìbiles datos non in lìnia de sos PDI de cust\'àrea</string>
 	<string name="context_menu_item_update_map_confirm">Agiornare sos datos locales tràmite Ìnternet?</string>
@@ -1482,7 +1476,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="route_general_information">Distàntzia totale %1$s, durada de su biàgiu %2$d h %3$d m.</string>
 	<string name="router_service_descr">Issèbera unu servìtziu in lìnia o sena lìnia de nàvigu</string>
 	<string name="router_service">Servìtziu de nàvigu</string>
-	<string name="sd_dir_not_accessible">Sa cartella de sarbamentu in s\'ischeda SD no est atzessiva!</string>
+	<string name="sd_dir_not_accessible">Sa cartella de sarbamentu in s’ischeda SD no est atzessiva!</string>
 	<string name="download_question">Iscarrigare {0} - {1} ?</string>
 	<string name="download_question_exist">Sos datos non in lìnia pro {0} esistint giai ({1}). Los boles agiornare ({2}) ?</string>
 	<string name="address">Indiritzu</string>
@@ -1500,7 +1494,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="follow">Avia nàvigu</string>
 	<string name="mark_final_location_first">Ischerta in antis una destinatzione</string>
 	<string name="get_directions">Indicatziones</string>
-	<string name="show_gps_status">Ammustra s\'istadu de su GPS</string>
+	<string name="show_gps_status">Ammustra s’istadu de su GPS</string>
 	<string name="opening_hours">Oràrios pro abèrrere</string>
 	<string name="opening_changeset">Abertura modìficas…</string>
 	<string name="closing_changeset">Serradura modìficas…</string>
@@ -1511,9 +1505,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="loading_streets">Carrigamentu istradas…</string>
 	<string name="loading_cities">Carrigamentu tzitades…</string>
 	<string name="error_occurred_saving_gpx">Errore durante su sarbamentu de su GPX</string>
-	<string name="error_calculating_route">Errore de càlculu de s\'àndala</string>
-	<string name="error_calculating_route_occured">S\'est verificadu un\'errore durante su càlculu de s\'àndala</string>
-	<string name="empty_route_calculated">Errore: s\'àndala calculada est bòida</string>					
+	<string name="error_calculating_route">Errore de càlculu de s’àndala</string>
+	<string name="error_calculating_route_occured">S’est verificadu un\'errore durante su càlculu de s’àndala</string>
+	<string name="empty_route_calculated">Errore: s’àndala calculada est bòida</string>					
 	<string name="new_route_calculated_dist">Àndala noa calculada, distàntzia</string>
 	<string name="arrived_at_destination">Seis arribaos a sa destinatzione bostra</string>
 	<string name="invalid_locations">Sas coordinatas non sunt bàlidas!</string>
@@ -1521,15 +1515,15 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="close">Serra</string>
 	<string name="loading_data">Carrigamentu datos…</string>
 	<string name="reading_indexes">Leghidura de sos datos locales…</string>
-	<string name="previous_run_crashed">S\'aviu antepostu de s\'aplicu s\'est interrùmpidu. Su documentu de su registru est disponìbile in {0}. Imbia una sinnalatzione alliongiande du documentu de su registru.</string>
-	<string name="saving_gpx_tracks">Sarbamentu rastas GPX in s\'ischeda SD…</string>
+	<string name="previous_run_crashed">S’aviu antepostu de s’aplicu s’est interrùmpidu. Su documentu de su registru est disponìbile in {0}. Imbia una sinnalatzione alliongiande du documentu de su registru.</string>
+	<string name="saving_gpx_tracks">Sarbamentu rastas GPX in s’ischeda SD…</string>
 	<string name="finished_task">Cumpridu</string>
-	<string name="reload_indexes_descr">Torra a lèghere sas mapas vetoriales non in lìnia e sos datos dae s\'ischeda SD</string>
+	<string name="reload_indexes_descr">Torra a lèghere sas mapas vetoriales non in lìnia e sos datos dae s’ischeda SD</string>
 	<string name="reload_indexes">Carriga sos ìnditzes dae nou</string>
-	<string name="download_indexes_descr">Iscàrriga o agiorna sos datos dae Ìnternet pro s\'impreau sena lìnia</string>
+	<string name="download_indexes_descr">Iscàrriga o agiorna sos datos dae Ìnternet pro s’impreu sena lìnia</string>
 	<string name="download_indexes">Iscàrriga datos non in lìnia</string>
-	<string name="use_online_routing_descr">Imprea ìnternet pro calculare s\'àndala</string>
-	<string name="use_online_routing">Imprea s\'ingendradore de àndalas in lìnia</string>
+	<string name="use_online_routing_descr">Imprea ìnternet pro calculare s’àndala</string>
+	<string name="use_online_routing">Imprea s’ingendradore de àndalas in lìnia</string>
 	<string name="osm_settings_descr">Dislinda sas impostaduras Openstreetmap.org (OSM) netzessàrias pro contribuire a OSM</string>
 	<string name="data_settings_descr">Dislinda sa limba, iscàrriga/torra a carrigare sos datos</string>
 	<string name="data_settings">Datos</string>
@@ -1537,10 +1531,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="osm_settings">Modìficas OSM</string>
 	<string name="additional_settings">Impostaduras annativas</string>
 	<string name="settings">Impostaduras</string>
-	<string name="save_current_track_descr">Sarba como sa rasta currente in s\'ischeda SD</string>
+	<string name="save_current_track_descr">Sarba como sa rasta currente in s’ischeda SD</string>
 	<string name="save_current_track">Sarba sa rasta currente</string>
 	<string name="save_track_interval">Intervallu de sarbamentu durante su nàvigu</string>
-	<string name="save_track_interval_descr">Issèbera s\'intervallu de positzionamentu pro sa registratzione de sas rastas durante su nàvigu</string>
+	<string name="save_track_interval_descr">Issèbera s’intervallu de positzionamentu pro sa registratzione de sas rastas durante su nàvigu</string>
 	<string name="save_track_to_gpx_descrp">Sas rastas ant a èssere sarbadas in sa cartella apòsita durante su nàvigu</string>
 	<string name="save_track_to_gpx">Sarba rasta in GPX durante su nàvigu</string>
 	<string name="update_tile">Agiorna mapa</string>
@@ -1550,17 +1544,17 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="show_osm_bugs">Ammustra OpenStreetBugs</string>
 	<string name="favourites_activity">Prefèrridos</string>
 	<string name="add_to_favourite">Annanghe a sos Prefèrridos</string>
-	<string name="use_english_names_descr">Ischerta s\'impreu de nùmenes locales o inglesos</string>
+	<string name="use_english_names_descr">Ischerta s’impreu de nùmenes locales o inglesos</string>
 	<string name="use_english_names">Imprea nùmenes inglesos in sas mapas</string>
 	<string name="app_settings">Impostaduras aplicu</string>
 	<string name="search_address">Chirca indiritzu</string>
 	<string name="choose_building">Issèbera nùmeru tzìvicu</string>
-	<string name="choose_street">Issèbera s\'istrada</string>
+	<string name="choose_street">Issèbera s’istrada</string>
 	<string name="choose_city">Issèbera sa tzitade</string>
-	<string name="ChooseCountry">Issèbera s\'istadu</string>
+	<string name="ChooseCountry">Issèbera s’istadu</string>
 	<string name="map_view_3d_descr">Abìlita sa bisura 3D de sa mapa</string>
 	<string name="map_view_3d">Bisura mapa 3D</string>
-	<string name="show_poi_over_map_description">Ammustra PDI in sa mapa (imprea s\'ùrtimu filtru isseberadu)</string>
+	<string name="show_poi_over_map_description">Ammustra PDI in sa mapa (imprea s’ùrtimu filtru isseberadu)</string>
 	<string name="show_poi_over_map">Ammustra PDI</string>
 	<string name="map_tile_source_descr">Issèbera sa mitza pro sos tasseddos in lìnia o in cache</string>
 	<string name="map_tile_source">Mitza de sos tasseddos in lìnia</string>
@@ -1598,7 +1592,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
 	<string name="search_shown_on_map">Ammustra in sa mapa</string>
 	<string name="navigate_point_cancel">Burra</string>
-	<string name="search_address_top_text">Ischerta s\'indiritzu</string>
+	<string name="search_address_top_text">Ischerta s’indiritzu</string>
 	<string name="search_address_region">Regione</string>
 	<string name="search_address_city">Tzitade</string>
 	<string name="search_address_street">Istrada</string>
@@ -1620,30 +1614,30 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="favourites_context_menu_delete">Burra prefèrridu</string>
 	<string name="favourites_remove_dialog_msg">Burrare su puntu prefèrridu \'%s\'?</string>
 	<string name="favourites_remove_dialog_success">Su puntu prefèrridu {0} est istadu burradu.</string>
-	<string name="osb_add_dialog_title">Inserta sa descritzione de s\'errore</string>
-	<string name="osb_add_dialog_success">S\'errore est istadu creadu</string>
-	<string name="osb_add_dialog_error">S\'est verificadu un afrancu: su bug no est istadu creadu</string>
+	<string name="osb_add_dialog_title">Inserta sa descritzione de s’errore</string>
+	<string name="osb_add_dialog_success">S’errore est istadu creadu</string>
+	<string name="osb_add_dialog_error">S’est verificadu un’afrancu: su bug no est istadu creadu</string>
 	<string name="osb_author_dialog_password">Crae (passw) OSM (optzionale)</string>
 	<string name="osb_comment_menu_item">Annanghe unu cummentu</string>
 	<string name="osb_comment_dialog_message">Messàgiu</string>
 	<string name="osb_comment_dialog_author">Nùmene autore</string>
-	<string name="osb_comment_dialog_title">Annanghe unu cummentu a s\'errore</string>
+	<string name="osb_comment_dialog_title">Annanghe unu cummentu a s’errore</string>
 	<string name="osb_comment_dialog_add_button">Annanghe cummentu</string>
 	<string name="osb_comment_dialog_success">Su cummentu est istadu annantu curretamente</string>
-	<string name="osb_comment_dialog_error">S\'est verificadu un afrancu: su cummentu no est istadu annantu</string>
-	<string name="osb_close_menu_item">Serra s\'errore</string>
+	<string name="osb_comment_dialog_error">S’est verificadu un’afrancu: su cummentu no est istadu annantu</string>
+	<string name="osb_close_menu_item">Serra s’errore</string>
 	<string name="osb_close_dialog_title">Serradura errore</string>
-	<string name="osb_close_dialog_close_button">Serra s\'errore</string>
-	<string name="osb_close_dialog_success">S\'errore est istadu serradu curretamente</string>
-	<string name="osb_close_dialog_error">S\'est verificadu un afrancu: s\'errore no est istadu serradu</string>
+	<string name="osb_close_dialog_close_button">Serra s’errore</string>
+	<string name="osb_close_dialog_success">S’errore est istadu serradu curretamente</string>
+	<string name="osb_close_dialog_error">S’est verificadu un afrancu: s’errore no est istadu serradu</string>
 	<string name="poi_edit_title">Muda PDI</string>
 	<string name="poi_create_title">Crea PDI</string>
-	<string name="poi_error_poi_not_found">Su nodu no est istadu agatadu o s\'amenidade no est unu nodu sìngulu</string>
+	<string name="poi_error_poi_not_found">Su nodu no est istadu agatadu o s’amenidade no est unu nodu sìngulu</string>
 	<string name="poi_remove_confirm_template">Burrare {0} (insertare unu cummentu)?</string>
 	<string name="poi_remove_title">Burradura PDI</string>
 	<string name="default_buttons_delete">Burra</string>
 	<string name="poi_remove_success">PDI burradu curretamente</string>
-	<string name="poi_error_unexpected_template">Errore ispessadu durante s\'esecutzione de s\'atzione {0}.</string>
+	<string name="poi_error_unexpected_template">Errore ispessadu durante s’esecutzione de s’atzione {0}.</string>
 	<string name="default_buttons_commit">Esegui</string>
 	<string name="default_buttons_reset">Burra</string>
 	<string name="edit_filter_delete_dialog_title">Burrare su filtru ischertadu?</string>
@@ -1653,12 +1647,12 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="av_camera_focus">Tipu de messa a fogu</string>
 	<string name="av_camera_focus_descr">Issèbera su tipu de messa a fogu de sa fotocàmera integrada</string>
 	<string name="av_camera_focus_auto">Fogu automàticu</string>
-	<string name="av_camera_focus_hiperfocal">Fogu a s\'iperfocale</string>
+	<string name="av_camera_focus_hiperfocal">Fogu a s’iperfocale</string>
 	<string name="av_camera_focus_edof">Profundidade de campu estesa (EDOF)</string>
-	<string name="av_camera_focus_infinity">Fogu impostadu a s\'infinitu</string>
+	<string name="av_camera_focus_infinity">Fogu impostadu a s’infinitu</string>
 	<string name="av_camera_focus_macro">Modalidade de fogu macro (particulare)</string>
 	<string name="av_camera_focus_continuous">Sa fotocàmera est proande a pònnere a fogu a sighidura</string>
-	<string name="av_photo_play_sound">Reprodui su sonu a s\'iscatu</string>
+	<string name="av_photo_play_sound">Reprodui su sonu a s’iscatu</string>
 	<string name="av_photo_play_sound_descr">Issèbera si reprodurre unu sonu cando benint iscatadas sas fotos</string>
 	<string name="av_camera_pic_size">Dimensione foto</string>
 	<string name="av_camera_pic_size_descr">Ischerta sa dimensione in sa foto iscatadas</string>
@@ -1669,16 +1663,16 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="show_more_map_detail_descr">Ammustra carchi minuja de sas mapas vetoriales (istradas etc.) fintzas a sos zoom prus bassos</string>
 	<string name="show_route">Minujas àndala</string>
 	<string name="tip_initial_t">"OsmAnd est un aplicu de nàvigu cun meda funtziones.
-\n\nUn\'introduida base, cussigios de impreu e agiudu avantzadu sunt cullegados tramite \'Menù\' → \'Impòsitos\' dae s\'ischermu mapa. "</string>
+\n\nUn’introduida base, cussigios de impreu e agiudu avantzadu sunt cullegados tramite \'Menù\' → \'Impòsitos\' dae s’ischermu mapa. "</string>
 	<string name="use_high_res_maps_descr">Non allonghiare (ne inghelare) sos tasseddos de sa mapa in sos dispositivos a carchesa arta</string>
-	<string name="background_router_service_descr">Allughe su servìtziu a reposu de OsmAnd pro s\'arrastamentu de sa positzione cando s\'ischermu est istudau</string>
+	<string name="background_router_service_descr">Allughe su servìtziu a reposu de OsmAnd pro s’arrastamentu de sa positzione cando s’ischermu est istudadu</string>
 	<string name="off_router_service_no_gps_available">Su servìtziu de nàvigu a reposu de OsmAnd netzèssitat de su sistema de positzionamentu ativadu.</string>
 	<string name="tip_recent_changes_0_6_7_t">"Mudas in sa 0.6.7:
 \n\t- Gestore datos non in lìnia (iscàrriga, burra, ativa / deativa datos sena lìnia deretamente dae OsmAnd)
 \n\t- Puntos prefèrridos e grupos (categoriza, burra, amministra sos prefèrridos)
-\n\t- GPX Explorer in s\'aplicu (bie minujas de sas rastas, distantzia, lestresa, artària, etc.)
+\n\t- GPX Explorer in s’aplicu (bie minujas de sas rastas, distantzia, lestresa, artària, etc.)
 \n\t- Nàvigu GPX (prus optziones, sighi su nàvigu a pustis de un errore (crash), suportu pro sas rutundas)
-\n\t- Funtzione pro sarbare s\'àndala in formatu GPX e l\'impreare sena lìnia\n\t- Megiorada sa compidada GPX (logos non pretzisos filtrados e datos pro cuidadu/artària/lestresa sarbados)
+\n\t- Funtzione pro sarbare s’àndala in formatu GPX e l’impreare sena lìnia\n\t- Megiorada sa compidada GPX (logos non pretzisos filtrados e datos pro cuidadu/artària/lestresa sarbados)
 \n\t- Imbia documentos GPX a sa comunidade OSM (http://download.osmand.net/gpx/)
 \n\t- Megioradu su disinnu de sos vetores
 \n\t- Megioradu su motore de sìntesi vocale TTS (distàntzia pretzisa, mìglias abilitadas)
@@ -1686,25 +1680,25 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="tip_recent_changes_0_6_6_t">"Mudas in sa 0.6.6:
 \n\t- Motore de sìntesi vocale pro su nàvigu
 \n\t- Prus minujas in su disinnu de sa mapa
-\n\t- Mapa mundiale de base posta cun s\'aplicu
+\n\t- Mapa mundiale de base posta cun s’aplicu
 \n\t- Megiorau su nàvigu sena lìnia (galu isperimentale)
 \n\t- Optziones nàvigu GPX
-\n\t- Agiornamentu e curretzione de errores pro s\'interfàtzie impitadore "</string>
-	<string name="tip_favorites_t">"Sos puntos impreados a s\'ispissu podent èssere sarbados comente Prefèrridos, in custa manera:
-\n\nIn su menù cuntestale \'Imprea positzione\' pro cada puntu ischerta s\'optzione \'Annanghe a sos Prefèrridos\'e pustis inserta unu nùmene pro su prefèrridu nou.
-\n\nA pustis de su sarbamentu, su prefèridu at a èssere atzessìbile tràmite \'Menù\' → \'Logos Meos\'. Carcande in cada elementu in sa lista de sos \'Prefèrridos\' s\'ant a apèrrere sas optziones pro l\'impostare comente destinatzione, lu mudare o lu burrare.
+\n\t- Agiornamentu e curretzione de errores pro s’interfàtzie impitadore "</string>
+	<string name="tip_favorites_t">"Sos puntos impreados a s’ispissu podent èssere sarbados comente Prefèrridos, in custa manera:
+\n\nIn su menù cuntestale \'Imprea positzione\' pro cada puntu ischerta s’optzione \'Annanghe a sos Prefèrridos\' e pustis inserta unu nùmene pro su prefèrridu nou.
+\n\nA pustis de su sarbamentu, su prefèridu at a èssere atzessìbile tràmite \'Menù\' → \'Logos Meos\'. Carcande in cada elementu in sa lista de sos \'Prefèrridos\' s’ant a apèrrere sas optziones pro l’impostare comente destinatzione, lu mudare o lu burrare.
 \n\nPro fàghere ammustrare totu sos puntos Prefèrridos in sa mapa, ativa su livellu \'Prefèrridos\' dae \'Menù\' → \'Cunfigura sa mapa\'. "</string>
 	<string name="tip_map_switch_t_v2">"Sa mitza de sa mapa e sos livellos/istratos ammustrados podent èssere mudados tràmite \'Menù\' → \'Cunfigura sa mapa\'.
-\n\nSuta de \'Mitza mapa…\' podes isseberare de impreare sas mapas vetoriales non in lìnia giai carrigadas (predefinidu, netzessàriu pro su nàvigu sena lìnia), sas mapas a tasseddos predefinidas, in lìnia o in sa cache (ativa su cumponente agiuntivu (plugin) \'Mapas in lìnia\' in \'Impostaduras\' → \'Gestore plugins\' pro custu), o mapas creadas manualmente impreande, pro fàghere un\'esèmpiu, OsmAndMapCreator in su PC.
+\n\nSuta de \'Mitza mapa…\' podes isseberare de impreare sas mapas vetoriales non in lìnia giai carrigadas (predefinidu, netzessàriu pro su nàvigu sena lìnia), sas mapas a tasseddos predefinidas, in lìnia o in sa cache (ativa su cumponente agiuntivu (plugin) \'Mapas in lìnia\' in \'Impostaduras\' → \'Gestore plugins\' pro custu), o mapas creadas manualmente impreande, pro fàghere un’esèmpiu, OsmAndMapCreator in su PC.
 \n\nOsmAnd suportada fintzas mitzas pessonalizadas. "</string>
-	<string name="tip_app_mode_t_v2">"OsmAnd suportada profilos de s\'aplicu diferentes (e pessonalizados) pro diferentes maneras de impreu .
-\n\nPodes mudare profilu impreande su pursante profilu in s\'àngulu in bassu a manca de s\'ischermada de sa mapa (icona màchina, bitzicleta, o a pedes), o cando ses creande un\'àndala (\'modalidade trasportu\'). "</string>
+	<string name="tip_app_mode_t_v2">"OsmAnd suportada profilos de s’aplicu diferentes (e pessonalizados) pro diferentes maneras de impreu .
+\n\nPodes mudare profilu impreande su pursante profilu in s’àngulu in bassu a manca de s’ischermada de sa mapa (icona màchina, bitzicleta, o a pedes), o cando ses creande un’àndala (\'modalidade trasportu\'). "</string>
 	<string name="tip_search_t">"Podes chircare sos logos deretamente in sa mapa tràmite \'Imprea positzione\' → \'Chirca a curtzu de inoghe\' o fintzas tràmite \'Menù\' → \'Chirca\'.
-\n\nS\'ischermada de chirca frunidi medas ischedas pro chircare
+\n\nS’ischermada de chirca frunidi medas ischedas pro chircare
 \n\t* tràmite indiritzu
 \n\t* tràmite coordinatas
 \n\t* dae unu PDI (pro casta o nùmene)
-\n\t* tràmite s\'isctòria de sa chircas tuas
+\n\t* tràmite s’istòria de sa chircas tuas
 \n\t* o intre sos prefèrridos tuos.
 \n\nPro cada resurtadu unu menù cuntestuale at a permìtere deisseberare intre \'Indicatziones\' e \'Ammustra in sa mapa\' etc. "</string>
 	<string name="tip_map_context_menu_t">"Su menù \'Imprea positzione\' càbit totu sas atziones possìbiles pro cada puntu (positzione).
@@ -1718,7 +1712,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="speak_poi">Annùntzia PDI a curtzu</string>
     <string name="flat_list_waypoints">Totus</string>
     <string name="index_tours">Itineràrios</string>
-    <string name="record_plugin_description">Ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s\'ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.</string>
+    <string name="record_plugin_description">Ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s’ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.</string>
     <string name="record_plugin_name">Registratzione biàgios</string>
     <string name="int_hour">h</string>
     <string name="duration">Durada</string>
@@ -1726,10 +1720,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="rendering_attr_publicTransportMode_name">Modalidade bus, filobus, tram e navetas</string>
 	<string name="save_track_to_gpx_globally">Carriga sa rasta in unu documentu GPX</string>
 	<string name="save_track_interval_globally">Intervallu de registratzione</string>
-	<string name="save_track_to_gpx_globally_descr">Sa registratzione de sa positzione in unu documentu GPX podet èssere alluta o morta impreande su widged de registratzione GPX in s\'ischermu mapa</string>
+	<string name="save_track_to_gpx_globally_descr">Sa registratzione de sa positzione in unu documentu GPX podet èssere alluta o morta impreande su widged de registratzione GPX in s’ischermu mapa</string>
 	<string name="confirm_every_run">Pregunta semper</string>
 	<string name="save_global_track_interval">Intervallu de registratzione generale</string>
-	<string name="save_global_track_interval_descr">Issèbera s\'intervallu pro sa registratzione generale de sas rastas (abilitadu tramite su widget registratzione GPX in sa mapa)</string>
+	<string name="save_global_track_interval_descr">Issèbera s’intervallu pro sa registratzione generale de sas rastas (abilitadu tramite su widget registratzione GPX in sa mapa)</string>
 	<string name="traffic_warning_speed_limit">Limite de lestresa</string>
     <string name="traffic_warning_payment">Casellu</string>
     <string name="traffic_warning_stop">Cartellu de Stop</string>
@@ -1745,8 +1739,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="use_native_render">Imprea sa renderizatzione nativa</string>
     <string name="use_native_render_descr">Imprea sa renderizatzione C++ imbetzes de Java</string>
     <string name="print_route">Imprenta àndala</string>
-    <string name="fav_point_emoticons_message">Amos cambiadu su nùmene de su prefèrridu tuo, ponende•li %1$s, pro fatzilitare su sarbamentu de s\'istringa cun sas emòticons in unu documentu.</string>
-    <string name="speed_limit_exceed_message">Ischerta s\'arramponada de su lìmite de lestresa a pustis de su cale as a tènnere un\'avisu vocale.</string>
+    <string name="fav_point_emoticons_message">Amos cambiadu su nùmene de su prefèrridu tuo, ponende•li %1$s, pro fatzilitare su sarbamentu de s’istringa cun sas emòticons in unu documentu.</string>
+    <string name="speed_limit_exceed_message">Ischerta s’arramponada de su lìmite de lestresa a pustis de su cale as a tènnere un’avisu vocale.</string>
 	<string name="speed_limit_exceed">Arramponada de su lìmite de lestresa</string>
 	<string name="osmo_device_not_found">Dispositivu no agatau</string>
     <string name="anonymous_user">Impitadore anònimu</string>
@@ -1764,20 +1758,20 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="map_widget_appearance_rem">Elementos chi abarrant</string>
     <string name="map_widget_top">Barra de istadu</string>
 	<string name="layers_category_show">Ammustra</string>
-	<string name="tip_recent_changes_1_9_t">"Mudas in sa 1.9: * Istiles de sa mapa agiornados cun su disinnu de sa superfìtzie, de s\'istratu \"trasportu pùblicu\" e sos sìmbulos escursionìsticos * Chirca PDI a curtzu de s\'àndala * Sinnala s\'istrada comente impercurrìbile pro sa sessione * Iscarrigamentu e agiornamentos de sas mapas prus fàtziles * Notìficas visivas e sonoras a s\'accurtziare de sos puntos mesanos * Imprenta s\'àndala e sas indicatziones * Suportu a sas corsias de bortada * Suportu pro Android Wear * Unu muntone de mudas de s\'IU * Zoom mapa e mannària testu iscrobados * Notìficas àudio ispetziales si ses essinde dae s\'àndala * Funtzionalidade autenticatzione (login) OsMo * Curretzione incumpatibilidades versione OsMo "</string>
+	<string name="tip_recent_changes_1_9_t">"Mudas in sa 1.9: * Istiles de sa mapa agiornados cun su disinnu de sa superfìtzie, de s’istratu \"trasportu pùblicu\" e sos sìmbulos escursionìsticos * Chirca PDI a curtzu de s’àndala * Sinnala s’istrada comente impercurrìbile pro sa sessione * Iscarrigamentu e agiornamentos de sas mapas prus fàtziles * Notìficas visivas e sonoras a s’accurtziare de sos puntos mesanos * Imprenta s’àndala e sas indicatziones * Suportu a sas corsias de bortada * Suportu pro Android Wear * Unu muntone de mudas de s’IU * Zoom mapa e mannària testu iscrobados * Notìficas àudio ispetziales si ses essinde dae s’àndala * Funtzionalidade autenticatzione (login) OsMo * Curretzione incumpatibilidades versione OsMo "</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Àndalas in trenu</string>
     <string name="rendering_attr_tramRoutes_name">Àndalas in tram</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Cumpartzi àndalas in taxi</string>
     <string name="rendering_attr_trolleybusRoutes_name">Àndalas in filobus</string>
     <string name="rendering_attr_busRoutes_name">Àndalas in postale</string>
     <string name="rendering_attr_tramTrainRoutes_name">Àndalas tram e trenu</string>
-    <string name="wake_on_voice">Allughe s\'ischermu</string>
-    <string name="wake_on_voice_descr">Allughe s\'ischermu cando b\'est una bortada a curtzu</string>
+    <string name="wake_on_voice">Allughe s’ischermu</string>
+    <string name="wake_on_voice_descr">Allughe s’ischermu cando b\'est una bortada a curtzu</string>
     <string name="select_impassable_road">Ischerta in sa mapa…</string>
     <string name="impassable_road">Istransi istradas…</string>
     <string name="rendering_category_hide">Cua</string>
     <string name="wake_on_voice_never">Mai</string>
-    <string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s\'ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
+    <string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s’ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
     <string name="advanced_settings">Avantzadas</string>
 	<string name="osmo_use_https_descr">Imprea una cunnessione segura cun su server</string>
     <string name="osmo_use_https">Imprea HTTPS</string>
@@ -1811,8 +1805,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="rendering_value_orange_name">Arantzu</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlante de sas istradas tedescas</string>
     <string name="rendering_value_americanRoadAtlas_name">Atlante de sas istradas americanas</string>
-    <string name="routing_attr_no_new_routing_name">No impreare su càlculu de s\'àndala v1.9</string>
-    <string name="routing_attr_no_new_routing_description">No impreare su càlculu de s\'àndala v1.9</string>
+    <string name="routing_attr_no_new_routing_name">No impreare su càlculu de s’àndala v1.9</string>
+    <string name="routing_attr_no_new_routing_description">No impreare su càlculu de s’àndala v1.9</string>
     <string name="traffic_warning_railways">Atraessamentu de sa ferrovia</string>
 	<string name="traffic_warning_pedestrian">Atraessamentu pedonale</string>
 	<string name="show_railway_warnings">Ammustra sas rugradas ferroviàrias</string>
@@ -1820,7 +1814,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="speak_pedestrian">Annùntzia sos atraessamentos pedonales</string>
     <string name="rendering_value__name">Predefinidu</string>
 	<string name="navigation_over_track">Incumentzare su nàvigu in sa rasta?</string>
-	<string name="avoid_roads_msg">Podes cambiare s\'àndala ischertande sas istradas de istransire</string>
+	<string name="avoid_roads_msg">Podes cambiare s’àndala ischertande sas istradas de istransire</string>
     <string name="save_track_to_gpx_globally_headline">Registratzione de sa rasta a segus de rechesta</string>
 	<string name="settings_privacy">Privadesa</string>
     <string name="recents">REGHENTES</string>
@@ -1852,7 +1846,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="plugin_install_needs_network">Est netzessària sa cunnessione a ìnternet pro installare custu cumponente annuntilu (plugin).</string>
 	<string name="get_plugin">Iscàrriga</string>
 <string name="plugin_nautical_name">Mapas nàuticas</string>
-    <string name="world_ski_missing">Pro bìdere sas mapas ispetziales pro s\'iscì, depent èssere iscarrigadas</string>
+    <string name="world_ski_missing">Pro bìdere sas mapas ispetziales pro s’iscì, depent èssere iscarrigadas</string>
     <string name="plugin_ski_name">Mapas iscì</string>
     <string name="nautical_maps_missing">Pro bìdere sas mapas ispetziales nàuticas, depent èssere iscarrigadas</string>
 	<string name="rendering_attr_pisteGrooming_name">Pista abbatigada</string>
@@ -1869,15 +1863,15 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="audio">Àudio</string>
 	<string name="video">Vìdeo</string>
 	<string name="photo">Foto</string>
-	<string name="plugin_nautical_descr1">Ativande custa funtzionalidade s\'istile de sa mapa at a divènnere Nàuticu, e at a èssere disponìbile totu sa simbologia pro su nàvigu.</string>
+	<string name="plugin_nautical_descr1">Ativande custa funtzionalidade s’istile de sa mapa at a divènnere Nàuticu, e at a èssere disponìbile totu sa simbologia pro su nàvigu.</string>
 	<string name="plugin_nautical_descr2">Sa mapa cun totu sa simbologia nàutica globale est disponìbile comente iscarrigamentu ùnicu cun su nùmene \"World seamarks\".</string>
-	<string name="plugin_nautical_descr3">Custa vista podet èssere furriada disativande•la inoghe torra siat cambiande s\' \'Istile mapa\' in \'Cunfigura sa mapa\' comente boles tue.</string>
+	<string name="plugin_nautical_descr3">Custa vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura sa mapa\' comente boles tue.</string>
 
-	<string name="plugin_ski_descr1">Ativande custa vista s\'istile mapa at a divènnere \'Ierru e iscì\', ammustrande totu sas caraterìsticas de s\'iscenàriu in sas cunditziones de s\'ierru.</string>
-	<string name="plugin_ski_descr2">Est disponìbile una mapa cun totu sas pistas e s\'àndalas pro iscì de fundu suta de Iscarrigàbiles comente \'World ski map\'.</string>
-	<string name="plugin_ski_descr3">Custa vista podet èssere furriada disativande•la inoghe torra o cambiande s\'\'Istile mapa\' in \'Cunfigura mapa\'.</string>
+	<string name="plugin_ski_descr1">Ativande custa vista s’istile mapa at a divènnere \'Ierru e iscì\', ammustrande totu sas caraterìsticas de s’iscenàriu in sas cunditziones de s’ierru.</string>
+	<string name="plugin_ski_descr2">Est disponìbile una mapa cun totu sas pistas e sas àndalas pro iscì de fundu suta de \'Iscarrigàbiles\', comente \'World ski map\'.</string>
+	<string name="plugin_ski_descr3">Custa vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\'.</string>
 
-	<string name="plugin_touringview_descr1">Ativande custa vista s\'istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.</string>
+	<string name="plugin_touringview_descr1">Ativande custa vista s’istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.</string>
 	<string name="plugin_touringview_descr2">Custa vista frunit, pro cada livellu de zoom, su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sas istradas e de sas àndalas e sinnos de orientamentu). Rapresentat fintzas totu sas castas de istrada in manera crara tramite colores diferentes, agiudande meda, pro nàrrere, sos chi ghiant veìculos mannos meda.</string>
 	<string name="plugin_touringview_descr3">No est netzessària una mapa ispetziale, sa vista est creada dae sas mapas istandard.</string>
 	<string name="turn_off_all">Istuda totu</string>
@@ -1889,5 +1883,5 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 
 	<string name="location_on_map">Assètiu/Collocassione:\n Lat %1$s\n Lon %2$s</string>
 	<string name="rename_failed">Renumenatzione faddida.</string>
-	<string name="plugin_touringview_descr4">Custa vista podet èssere furriada disativande•la inoghe torra o cambiande s\' \'Istile mapa\' in \'Cunfigura mapa\' comente boles.</string>
+	<string name="plugin_touringview_descr4">Custa vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\' comente boles.</string>
 	</resources>

From 0ff4bd653adea8360dd5ee8ae3a0a6453091c365 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Wed, 25 Feb 2015 20:16:52 +0100
Subject: [PATCH 43/45] Translated using Weblate (Swedish)

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

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 1abae6e322..d178083e32 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1838,4 +1838,6 @@
 	<string name="rename_failed">Namnbytet misslyckades.</string>
 	<string name="currently_recording_track">Spelar för tillfället in spår</string>
 	<string name="back_to_map">Tillbaka till kartan</string>
+	<string name="turn_off_all">Stäng av alla</string>
+	<string name="showed_on_map">Visade på kartan</string>
 	</resources>

From 7f5205aaecdd8aa76ce05a0a7049f58897988213 Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Thu, 26 Feb 2015 01:03:10 +0100
Subject: [PATCH 44/45] Translated using Weblate (Sardinian)

Currently translated at 91.2% (585 of 641 strings)
---
 OsmAnd/res/values-sc/phrases.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 842db29c37..272067ee61 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -611,4 +611,19 @@
 	<string name="poi_entertainment">Tempus lìberu</string>
 	<string name="poi_user_defined_other">Definidu dae s\'impitadore</string>
 	
+	<string name="poi_internet_access_wlan">Atzessu ìnternet: wlan</string>
+	<string name="poi_internet_access_terminal">Atzessu ìnternet: terminale</string>
+	<string name="poi_internet_access_wired">Atzessu ìnternet: tramite cavu</string>
+	<string name="poi_internet_access_public">Atzessu ìnternet: pùblicu</string>
+	<string name="poi_internet_access_service">Atzessu ìnternet: servìtziu</string>
+	
+	<string name="poi_farm">Fatoria: butega</string>
+	<string name="poi_wine">Butega de binos</string>
+
+	<string name="poi_child_clothes_shop">Butega de bestires pro pitzinnos</string>
+	<string name="poi_car">Cuntzessionàriu de màchinas</string>
+	<string name="poi_car_parts">Cantos de màchinas</string>
+	<string name="poi_public_transport_stop_position">Firmada de su trasportu pùblicu</string>
+	<string name="poi_halt">Firmada de sa ferrovia (obsoleta)</string>
+	<string name="poi_railway_buffer_stop">Denegante pro sos trenos</string>
 	</resources>

From 1568c96e9e675927081744b91a8af69be4d3c0bb Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 26 Feb 2015 18:12:02 +0200
Subject: [PATCH 45/45] Updated currently showing on map

---
 OsmAnd/res/layout/available_gpx.xml           |   8 +
 OsmAnd/res/layout/dash_gpx_track_item.xml     |   7 +-
 .../plus/activities/AvailableGPXFragment.java | 162 ++++++++++++------
 3 files changed, 121 insertions(+), 56 deletions(-)

diff --git a/OsmAnd/res/layout/available_gpx.xml b/OsmAnd/res/layout/available_gpx.xml
index 18b3c01786..d4da1a36b1 100644
--- a/OsmAnd/res/layout/available_gpx.xml
+++ b/OsmAnd/res/layout/available_gpx.xml
@@ -51,10 +51,18 @@
 				android:id="@+id/turn_off_all"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				style="?attr/dashboardGeneralButtonStyle"
+				android:textColor="@color/color_distance"
 				android:text="@string/turn_off_all"/>
 
 		</LinearLayout>
 
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="?attr/dashboard_divider"/>
+
+
 		<ListView
 			android:id="@+id/gpx_on_map"
 			android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index 554fb6beee..5d714d5ce8 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -100,12 +100,7 @@
 			android:src="@drawable/ic_action_gsave_dark"/>
 
 
-		<CheckBox
-			android:id="@+id/check"
-			android:layout_width="@dimen/list_item_height"
-			android:layout_height="@dimen/list_item_height"
-			android:focusable="false"
-			android:visibility="gone"/>
+		<include layout="@layout/check_item_rel" />
 	</LinearLayout>
 
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
index 0978c81a9a..5b48c9b1c4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
@@ -67,6 +67,7 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -82,8 +83,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	private List<GpxInfo> selectedItems = new ArrayList<>();
 	private ActionMode actionMode;
 	private LoadGpxTask asyncLoader;
-	private GpxIndexesAdapter listAdapter;
-	private ShowedOnMapAdapter showOnMapAdapter;
+	private GpxIndexesAdapter allGpxAdapter;
+	private ShowedOnMapAdapter showOnMapGpxAdapter;
 	MessageFormat formatMb = new MessageFormat("{0, number,##.#} MB", Locale.US);
 	private LoadLocalIndexDescriptionTask descriptionLoader;
 	private ContextMenuAdapter optionsMenuAdapter;
@@ -102,8 +103,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		asyncLoader = new LoadGpxTask();
 		selectedGpxHelper = ((OsmandApplication) activity.getApplication()).getSelectedGpxHelper();
 		savingTrackHelper = ((OsmandApplication) activity.getApplication()).getSavingTrackHelper();
-		listAdapter = new GpxIndexesAdapter(getActivity());
-		setAdapter(listAdapter);
+		allGpxAdapter = new GpxIndexesAdapter(getActivity());
+		setAdapter(allGpxAdapter);
 	}
 
 	public List<GpxInfo> getSelectedItems() {
@@ -123,8 +124,14 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 	private void createShowedOnMapsView(View v) {
 		ListView onMap = (ListView) v.findViewById(R.id.gpx_on_map);
-		showOnMapAdapter = new ShowedOnMapAdapter(getActivity(), R.layout.dash_gpx_track_item);
-		onMap.setAdapter(showOnMapAdapter);
+		showOnMapGpxAdapter = new ShowedOnMapAdapter(getActivity(), R.layout.dash_gpx_track_item);
+		onMap.setAdapter(showOnMapGpxAdapter);
+		v.findViewById(R.id.turn_off_all).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showOnMapGpxAdapter.notifyDataSetChanged();
+			}
+		});
 	}
 
 	@Override
@@ -140,11 +147,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		if (v == null) {
 			return;
 		}
-		if (visibility) {
+		//temporary hiding this view
+		v.findViewById(R.id.show_on_map).setVisibility(View.GONE);
+/*		if (visibility) {
 			v.findViewById(R.id.on_map_layout).setVisibility(View.VISIBLE);
 		} else {
 			v.findViewById(R.id.on_map_layout).setVisibility(View.GONE);
-		}
+		}*/
 	}
 
 	private void updateCurrentTrack(View v) {
@@ -257,13 +266,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 			@Override
 			public boolean onQueryTextSubmit(String query) {
-				listAdapter.getFilter().filter(query);
+				allGpxAdapter.getFilter().filter(query);
 				return true;
 			}
 
 			@Override
 			public boolean onQueryTextChange(String newText) {
-				listAdapter.getFilter().filter(newText);
+				allGpxAdapter.getFilter().filter(newText);
 				return true;
 			}
 		});
@@ -394,7 +403,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	private void openShowOnMapMode() {
 		enableSelectionMode(true);
 		selectedItems.clear();
-		final Set<GpxInfo> originalSelectedItems = listAdapter.getSelectedGpx();
+		final Set<GpxInfo> originalSelectedItems = allGpxAdapter.getSelectedGpx();
 		selectedItems.addAll(originalSelectedItems);
 		actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {
 
@@ -435,11 +444,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				enableSelectionMode(false);
 				getView().findViewById(R.id.memory_size).setVisibility(View.GONE);
 				runSelection(false);
-				listAdapter.notifyDataSetChanged();
+				allGpxAdapter.notifyDataSetChanged();
 			}
 
 		});
-		listAdapter.notifyDataSetChanged();
+		allGpxAdapter.notifyDataSetChanged();
 	}
 
 
@@ -451,7 +460,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			value = value.substring(0, value.length() - 3);
 		}
 		final String actionButton = value;
-		if (listAdapter.getGroupCount() == 0) {
+		if (allGpxAdapter.getGroupCount() == 0) {
 			AccessibleToast.makeText(getActivity(), app.getString(R.string.local_index_no_items_to_do, actionButton.toLowerCase()), Toast.LENGTH_SHORT).show();
 			return;
 		}
@@ -496,7 +505,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			public void onDestroyActionMode(ActionMode mode) {
 				enableSelectionMode(false);
 				getView().findViewById(R.id.memory_size).setVisibility(View.GONE);
-				listAdapter.notifyDataSetChanged();
+				allGpxAdapter.notifyDataSetChanged();
 			}
 
 		});
@@ -505,7 +514,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			((TextView) getView().findViewById(R.id.memory_size)).setText(R.string.local_index_upload_gpx_description);
 			((TextView) getView().findViewById(R.id.memory_size)).setVisibility(View.VISIBLE);
 		}
-		listAdapter.notifyDataSetChanged();
+		allGpxAdapter.notifyDataSetChanged();
 	}
 
 	private void renameFile(GpxInfo info) {
@@ -555,7 +564,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 						loadGpxAsync(info, resId == R.string.local_index_select_gpx_file);
 					} else {
 						getMyApplication().getSelectedGpxHelper().selectGpxFile(info.gpx, resId == R.string.local_index_select_gpx_file, true);
-						listAdapter.notifyDataSetChanged();
+						showOnMapGpxAdapter.addGpxInfo(info);
+
+						allGpxAdapter.notifyDataSetChanged();
 						selectedGpxHelper.runUiListeners();
 					}
 				} else if (resId == R.string.local_index_mi_delete) {
@@ -615,6 +626,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				e = false;
 				getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(info.gpx);
 				MapActivity.launchMapActivityMoveToTop(getActivity());
+				if (showOnMapGpxAdapter.getCount() == 0) {
+					setShowedOnMapVisibility(true);
+				}
+				showOnMapGpxAdapter.addGpxInfo(info);
 			}
 		}
 		if (e) {
@@ -644,37 +659,37 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		@Override
 		protected void onPreExecute() {
 			((ActionBarActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(true);
-			listAdapter.clear();
-			if (showOnMapAdapter != null) {
-				showOnMapAdapter.clear();
+			allGpxAdapter.clear();
+			if (showOnMapGpxAdapter != null) {
+				showOnMapGpxAdapter.clear();
 			}
 		}
 
 		@Override
 		protected void onProgressUpdate(GpxInfo... values) {
 			for (GpxInfo v : values) {
-				listAdapter.addLocalIndexInfo(v);
+				allGpxAdapter.addLocalIndexInfo(v);
 				if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null) {
-					showOnMapAdapter.add(v);
+					showOnMapGpxAdapter.addGpxInfo(v);
 				}
 			}
-			showOnMapAdapter.notifyDataSetChanged();
-			listAdapter.notifyDataSetChanged();
+			showOnMapGpxAdapter.notifyDataSetChanged();
+			allGpxAdapter.notifyDataSetChanged();
 		}
 
 		public void setResult(List<GpxInfo> result) {
 			this.result = result;
-			listAdapter.clear();
-			showOnMapAdapter.clear();
+			allGpxAdapter.clear();
+			showOnMapGpxAdapter.clear();
 			if (result != null) {
 				for (GpxInfo v : result) {
-					listAdapter.addLocalIndexInfo(v);
+					allGpxAdapter.addLocalIndexInfo(v);
 					if (selectedGpxHelper.getSelectedFileByName(v.getFileName()) != null) {
-						showOnMapAdapter.add(v);
+						showOnMapGpxAdapter.addGpxInfo(v);
 					}
 				}
-				listAdapter.notifyDataSetChanged();
-				showOnMapAdapter.notifyDataSetChanged();
+				allGpxAdapter.notifyDataSetChanged();
+				showOnMapGpxAdapter.notifyDataSetChanged();
 				onPostExecute(result);
 			}
 		}
@@ -685,11 +700,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			if (getActivity() != null) {
 				((ActionBarActivity) getActivity()).setSupportProgressBarIndeterminateVisibility(false);
 			}
-			if (listAdapter.getGroupCount() > 0) {
+			if (allGpxAdapter.getGroupCount() > 0) {
 				getExpandableListView().expandGroup(0);
 			}
 
-			if (showOnMapAdapter.getCount() > 0) {
+			if (showOnMapGpxAdapter.getCount() > 0) {
 				setShowedOnMapVisibility(true);
 			} else {
 				setShowedOnMapVisibility(false);
@@ -1082,13 +1097,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		@Override
 		protected void onProgressUpdate(GpxInfo... values) {
-			listAdapter.notifyDataSetChanged();
+			allGpxAdapter.notifyDataSetChanged();
 		}
 
 		@Override
 		protected void onPostExecute(GpxInfo[] result) {
 			hideProgressBar();
-			listAdapter.notifyDataSetChanged();
+			allGpxAdapter.notifyDataSetChanged();
 
 		}
 
@@ -1118,9 +1133,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		@Override
 		protected void onProgressUpdate(GpxInfo... values) {
 			for (GpxInfo g : values) {
-				listAdapter.delete(g);
+				allGpxAdapter.delete(g);
 			}
-			listAdapter.notifyDataSetChanged();
+			allGpxAdapter.notifyDataSetChanged();
 		}
 
 		@Override
@@ -1166,7 +1181,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 					toShow = g.gpx.findPointToShow();
 				}
 			}
-			listAdapter.notifyDataSetInvalidated();
+			allGpxAdapter.notifyDataSetInvalidated();
 		}
 
 		@Override
@@ -1218,7 +1233,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				}
 				if (info.gpx != null) {
 					getMyApplication().getSelectedGpxHelper().selectGpxFile(info.gpx, selected, true);
-					listAdapter.notifyDataSetChanged();
+					allGpxAdapter.notifyDataSetChanged();
 					selectedGpxHelper.runUiListeners();
 				}
 			}
@@ -1254,18 +1269,18 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		@Override
 		protected void publishResults(CharSequence constraint, FilterResults results) {
 			if (results.values != null) {
-				synchronized (listAdapter) {
-					listAdapter.clear();
-					showOnMapAdapter.clear();
+				synchronized (allGpxAdapter) {
+					allGpxAdapter.clear();
+					showOnMapGpxAdapter.clear();
 					for (GpxInfo i : ((List<GpxInfo>) results.values)) {
-						listAdapter.addLocalIndexInfo(i);
+						allGpxAdapter.addLocalIndexInfo(i);
 						if (selectedGpxHelper.getSelectedFileByName(i.getFileName()) != null) {
-							showOnMapAdapter.add(i);
+							showOnMapGpxAdapter.addGpxInfo(i);
 						}
 					}
 				}
-				showOnMapAdapter.notifyDataSetChanged();
-				listAdapter.notifyDataSetChanged();
+				showOnMapGpxAdapter.notifyDataSetChanged();
+				allGpxAdapter.notifyDataSetChanged();
 				if (constraint != null && constraint.length() > 3) {
 					collapseTrees(10);
 				}
@@ -1287,7 +1302,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 	@Override
 	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
-		GpxInfo item = listAdapter.getChild(groupPosition, childPosition);
+		GpxInfo item = allGpxAdapter.getChild(groupPosition, childPosition);
 		if (!selectionMode) {
 			item.setExpanded(!item.isExpanded());
 			if (item.isExpanded()) {
@@ -1302,7 +1317,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			}
 			updateSelectionMode(actionMode);
 		}
-		listAdapter.notifyDataSetInvalidated();
+		allGpxAdapter.notifyDataSetInvalidated();
 		return true;
 	}
 
@@ -1411,8 +1426,40 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		}
 	}
 
+	private void adjustShowOnMapListViewSize() {
+		View v = getView();
+		if (v == null) {
+			return;
+		}
+		float size = getResources().getDimension(R.dimen.dashListItemHeight) * 3.5f;
+		LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, (int) size);
+		getView().findViewById(R.id.gpx_on_map).setLayoutParams(params);
+	}
+
 	class ShowedOnMapAdapter extends ArrayAdapter<GpxInfo> {
 
+		public void addGpxInfo(GpxInfo info) {
+			boolean contains = false;
+			for (int i = 0; i < getCount(); i++) {
+				if (getItem(i).equals(info)) {
+					contains = true;
+					break;
+				}
+			}
+			if (contains) {
+				return;
+			}
+
+			add(info);
+			notifyDataSetChanged();
+
+			//if there's too many items, we need to set size of listview
+			if (getCount() == 4) {
+				adjustShowOnMapListViewSize();
+			}
+
+		}
+
 		public ShowedOnMapAdapter(Context context, int resource) {
 			super(context, resource);
 		}
@@ -1425,7 +1472,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				v = inflater.inflate(R.layout.dash_gpx_track_item, parent, false);
 			}
 
-			GpxInfo gpxInfo = getItem(position);
+			final GpxInfo gpxInfo = getItem(position);
 
 			TextView viewName = ((TextView) v.findViewById(R.id.name));
 			viewName.setText(gpxInfo.getName());
@@ -1443,9 +1490,24 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 			}
 
-			CompoundButton check = (CompoundButton) v.findViewById(R.id.check);
+			final CompoundButton check = (CompoundButton) v.findViewById(R.id.check_item);
 			check.setVisibility(View.VISIBLE);
-
+			if (selectedGpxHelper.getSelectedFileByName(gpxInfo.getFileName()) != null) {
+				check.setChecked(true);
+			} else {
+				check.setChecked(false);
+			}
+			check.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if (gpxInfo.gpx == null) {
+						loadGpxAsync(gpxInfo, check.isChecked());
+					} else {
+						selectedGpxHelper.selectGpxFile(gpxInfo.gpx, check.isChecked(), true);
+					}
+					allGpxAdapter.notifyDataSetChanged();
+				}
+			});
 			return v;
 		}
 	}