From c3a0bce079f729bc885de2e0aa459ad8c5d3078d Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Wed, 28 Oct 2015 20:57:06 +0200
Subject: [PATCH 1/2] New help in progress.

---
 OsmAnd/res/layout/fragment_help_screen.xml    |  20 ++
 OsmAnd/res/values/strings.xml                 |  11 +
 .../osmand/plus/activities/HelpActivity.java  |  84 +++---
 .../dialogs/HelpScreenDialogFragment.java     | 275 ++++++++++++++++++
 .../ui/DownloadResourceGroupFragment.java     |   3 -
 5 files changed, 352 insertions(+), 41 deletions(-)
 create mode 100644 OsmAnd/res/layout/fragment_help_screen.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java

diff --git a/OsmAnd/res/layout/fragment_help_screen.xml b/OsmAnd/res/layout/fragment_help_screen.xml
new file mode 100644
index 0000000000..6e8f15b4df
--- /dev/null
+++ b/OsmAnd/res/layout/fragment_help_screen.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/shared_string_help"
+        app:navigationIcon="@drawable/abc_ic_ab_back_mtrl_am_alpha"
+        app:theme="?attr/toolbar_theme"/>
+
+    <ExpandableListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a64fcf0949..8282806b50 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2032,4 +2032,15 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="application_dir_description">Choose where you want to save map files.</string>
     <string name="show_on_start_description">\'Off\' directly launches map screen</string>
     <string name="enter_country_name">Enter country name</string>
+    <string name="new_version">New version</string>
+    <string name="begin_with_osmand_menu_group">Begin with OsmAnd</string>
+    <string name="features_menu_group">Features</string>
+    <string name="help_us_to_improve_menu_group">Help us to improve OsmAnd</string>
+    <string name="other_menu_group">Other</string>
+    <string name="plugins_menu_group">Plugins</string>
+    <string name="first_usage_menu_item">First usage</string>
+    <string name="first_usage_menu_item_description">How to download map, basic settings</string>
+    <string name="navigation_menu_item_description">Setup navigation</string>
+    <string name="faq_menu_item">FAQ</string>
+    <string name="faq_menu_item_description">How to use plugins</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index ed1cea4efb..25bb3123e1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -16,6 +16,7 @@ import android.webkit.WebViewClient;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.dialogs.HelpScreenDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 
 import java.io.BufferedReader;
@@ -25,7 +26,7 @@ import java.io.InputStreamReader;
 
 
 public class HelpActivity extends OsmandActionBarActivity {
-	
+
 	private static final String FILE_ANDROID_ASSET_HELP = "file:///android_asset/help/";
 	public static final String URL = "url";
 	public static final String TITLE = "title";
@@ -33,8 +34,9 @@ public class HelpActivity extends OsmandActionBarActivity {
 	private static final int BACK = 2;
 	private static final int FORWARD = 3;
 	private static final int CLOSE = 4;
+	private static final int NEW_VERSION = 5;
 	private WebView mWebView;
-	
+
 	@SuppressLint("NewApi")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -47,13 +49,13 @@ public class HelpActivity extends OsmandActionBarActivity {
 
 		String title = getString(R.string.shared_string_help);
 		String url = "index.html";
-		if(getIntent() != null) {
+		if (getIntent() != null) {
 			String tl = getIntent().getStringExtra(TITLE);
-			if(tl != null) {
+			if (tl != null) {
 				title = tl;
 			}
 			String ul = getIntent().getStringExtra(URL);
-			if(ul != null) {
+			if (ul != null) {
 				url = ul;
 			}
 		}
@@ -61,7 +63,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 		setContentView(R.layout.help_activity);
 		mWebView = (WebView) findViewById(R.id.webView);
 		mWebView.setFocusable(true);
-        mWebView.setFocusableInTouchMode(true);
+		mWebView.setFocusableInTouchMode(true);
 		mWebView.requestFocus(View.FOCUS_DOWN);
 		mWebView.setOnTouchListener(new View.OnTouchListener() {
 			@Override
@@ -104,40 +106,43 @@ public class HelpActivity extends OsmandActionBarActivity {
 	}
 
 	public String readContent(String url) throws IOException {
-		InputStream index = HelpActivity.class.getClassLoader().getResourceAsStream("help/" +url);
+		InputStream index = HelpActivity.class.getClassLoader().getResourceAsStream("help/" + url);
 		BufferedReader read = new BufferedReader(new InputStreamReader(index));
 		StringBuilder bld = new StringBuilder();
 		String s;
-		while((s = read.readLine()) != null) {
+		while ((s = read.readLine()) != null) {
 			bld.append(s);
 		}
 		read.close();
 		return bld.toString();
 	}
-	
+
 	private OsmandApplication getMyApplication() {
 		return (OsmandApplication) getApplication();
 	}
-	
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		if (AndroidUiHelper.isOrientationPortrait(this)){
+		if (AndroidUiHelper.isOrientationPortrait(this)) {
 			menu = getClearToolbar(true).getMenu();
 		} else {
 			getClearToolbar(false);
 		}
-		createMenuItem(menu, HOME, R.string.home, 
+		createMenuItem(menu, HOME, R.string.home,
 				R.drawable.ic_action_home_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		createMenuItem(menu, BACK, R.string.shared_string_previous,
 				R.drawable.ic_action_undo_dark,
-				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		createMenuItem(menu, FORWARD, R.string.shared_string_next,
 				R.drawable.ic_action_redo_dark,
-				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
-		createMenuItem(menu, CLOSE, R.string.shared_string_close, 
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		createMenuItem(menu, CLOSE, R.string.shared_string_close,
 				R.drawable.ic_action_remove_dark,
-				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		createMenuItem(menu, NEW_VERSION, R.string.new_version,
+				R.drawable.ic_action_help,
+				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		return super.onCreateOptionsMenu(menu);
 	}
 
@@ -145,29 +150,32 @@ public class HelpActivity extends OsmandActionBarActivity {
 	public boolean onOptionsItemSelected(MenuItem item) {
 		int itemId = item.getItemId();
 		switch (itemId) {
-		case android.R.id.home:
-			finish();
-			return true;
-		case HOME:
-			mWebView.loadUrl(FILE_ANDROID_ASSET_HELP + "index.html");
-			return true;
-		case BACK:
-			if(mWebView.canGoBack()) {
-				mWebView.goBack();
-			}
-			return true;
-		case FORWARD:
-			if(mWebView.canGoForward()) {
-				mWebView.goForward();
-			}
-			return true;
-		case CLOSE:
-			finish();
-			return true;
+			case android.R.id.home:
+				finish();
+				return true;
+			case HOME:
+				mWebView.loadUrl(FILE_ANDROID_ASSET_HELP + "index.html");
+				return true;
+			case BACK:
+				if (mWebView.canGoBack()) {
+					mWebView.goBack();
+				}
+				return true;
+			case FORWARD:
+				if (mWebView.canGoForward()) {
+					mWebView.goForward();
+				}
+				return true;
+			case CLOSE:
+				finish();
+				return true;
+			case NEW_VERSION:
+				new HelpScreenDialogFragment().show(getSupportFragmentManager(), null);
+				return true;
 		}
 		return false;
 	}
-	
+
 	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconDark, int menuItemType) {
 		MenuItem menuItem = m.add(0, id, 0, titleRes);
 		if (iconDark != 0) {
@@ -182,12 +190,12 @@ public class HelpActivity extends OsmandActionBarActivity {
 		});
 		return menuItem;
 	}
-	
+
 	public Toolbar getClearToolbar(boolean visible) {
 		final Toolbar tb = (Toolbar) findViewById(R.id.bottomControls);
 		tb.setTitle(null);
 		tb.getMenu().clear();
-		tb.setVisibility(visible? View.VISIBLE : View.GONE);
+		tb.setVisibility(visible ? View.VISIBLE : View.GONE);
 		return tb;
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java
new file mode 100644
index 0000000000..287767db60
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java
@@ -0,0 +1,275 @@
+package net.osmand.plus.dialogs;
+
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.support.v4.app.DialogFragment;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ExpandableListView;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HelpScreenDialogFragment extends DialogFragment {
+
+	private static final List<MenuCategory> menu = new ArrayList<>();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		boolean isLightTheme = ((OsmandApplication) getActivity().getApplication())
+				.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
+		int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme;
+		setStyle(STYLE_NO_FRAME, themeId);
+
+
+		final MenuCategory beginWithOsmand = new MenuCategory(R.string.begin_with_osmand_menu_group);
+		MyMenuItem.Builder builder = new MyMenuItem.Builder();
+		builder.setTitle(R.string.first_usage_menu_item)
+				.setDesription(R.string.first_usage_menu_item_description);
+		beginWithOsmand.addItem(builder.create());
+		builder = new MyMenuItem.Builder();
+		builder.setTitle(R.string.shared_string_navigation)
+				.setDesription(R.string.navigation_menu_item_description);
+		beginWithOsmand.addItem(builder.create());
+		builder = new MyMenuItem.Builder();
+		builder.setTitle(R.string.faq_menu_item)
+				.setDesription(R.string.faq_menu_item_description);
+		beginWithOsmand.addItem(builder.create());
+
+		menu.add(beginWithOsmand);
+		menu.add(new MenuCategory(R.string.features_menu_group));
+		menu.add(new MenuCategory(R.string.plugins_menu_group));
+		menu.add(new MenuCategory(R.string.help_us_to_improve_menu_group));
+		menu.add(new MenuCategory(R.string.other_menu_group));
+	}
+
+	@NonNull
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final View view = inflater.inflate(R.layout.fragment_help_screen, container, false);
+		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
+		final OsmandApplication application = (OsmandApplication) getActivity().getApplication();
+		final MenuAdapter listAdapter = new MenuAdapter(application, menu);
+		listView.setAdapter(listAdapter);
+		for (int i = 0; i < listAdapter.getGroupCount(); i++) {
+			listView.expandGroup(i);
+		}
+		return view;
+	}
+
+	public static class MenuAdapter extends OsmandBaseExpandableListAdapter {
+		private OsmandApplication ctx;
+		private final List<MenuCategory> menu;
+
+		public MenuAdapter(OsmandApplication ctx, List<MenuCategory> menu) {
+			this.ctx = ctx;
+			this.menu = menu;
+		}
+
+		@Override
+		public MyMenuItem getChild(int groupPosition, int childPosition) {
+			return menu.get(groupPosition).getItem(childPosition);
+		}
+
+		@Override
+		public long getChildId(int groupPosition, int childPosition) {
+			return groupPosition * 10000 + childPosition;
+		}
+
+		@Override
+		public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
+								 View convertView, ViewGroup parent) {
+			final MyMenuItem child = getChild(groupPosition, childPosition);
+			MenuItemViewHolder viewHolder;
+			if (convertView == null) {
+				convertView = LayoutInflater.from(parent.getContext()).inflate(
+						R.layout.two_line_with_images_list_item, parent, false);
+				viewHolder = new MenuItemViewHolder(convertView, ctx);
+				convertView.setTag(viewHolder);
+			} else {
+				viewHolder = (MenuItemViewHolder) convertView.getTag();
+			}
+			viewHolder.bindMenuItem(child);
+
+			return convertView;
+		}
+
+
+
+		@Override
+		public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
+			View v = convertView;
+			int titleId = getGroup(groupPosition);
+			if (v == null) {
+				LayoutInflater inflater = LayoutInflater.from(ctx);
+				v = inflater.inflate(R.layout.download_item_list_section, parent, false);
+			}
+			TextView nameView = ((TextView) v.findViewById(R.id.section_name));
+			nameView.setText(titleId);
+			v.setOnClickListener(null);
+			TypedValue typedValue = new TypedValue();
+			// TODO optimize
+			Resources.Theme theme = ctx.getTheme();
+			theme.resolveAttribute(R.attr.ctx_menu_info_view_bg, typedValue, true);
+			v.setBackgroundColor(typedValue.data);
+
+			return v;
+		}
+
+		@Override
+		public int getChildrenCount(int groupPosition) {
+			return menu.get(groupPosition).getChildrenCount();
+		}
+
+		@Override
+		public Integer getGroup(int groupPosition) {
+			return menu.get(groupPosition).getTitle();
+		}
+
+		@Override
+		public int getGroupCount() {
+			return menu.size();
+		}
+
+		@Override
+		public long getGroupId(int groupPosition) {
+			return groupPosition;
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			return false;
+		}
+
+		@Override
+		public boolean isChildSelectable(int groupPosition, int childPosition) {
+			return true;
+		}
+
+	}
+
+	private static class MenuItemViewHolder {
+		private final TextView nameTextView;
+		private final TextView descrTextView;
+		private final ImageView leftImageView;
+		private final OsmandApplication context;
+
+		public MenuItemViewHolder(View view, OsmandApplication context) {
+			this.context = context;
+			leftImageView = (ImageView) view.findViewById(R.id.leftImageView);
+			descrTextView = (TextView) view.findViewById(R.id.description);
+			nameTextView = (TextView) view.findViewById(R.id.name);
+		}
+
+		public void bindMenuItem(MyMenuItem menuItem) {
+			nameTextView.setText(menuItem.title);
+			if (menuItem.desription != -1) {
+				descrTextView.setVisibility(View.VISIBLE);
+				descrTextView.setText(menuItem.desription);
+			} else {
+				descrTextView.setVisibility(View.GONE);
+			}
+			if (menuItem.icon != -1) {
+				leftImageView.setVisibility(View.VISIBLE);
+				leftImageView.setImageDrawable(context.getIconsCache().getContentIcon(menuItem.icon));
+			} else {
+				leftImageView.setVisibility(View.GONE);
+			}
+		}
+	}
+
+	private static class MenuCategory {
+		private final List<MyMenuItem> items = new ArrayList<>();
+		@StringRes
+		private final int title;
+
+		private MenuCategory(@StringRes int title) {
+			this.title = title;
+		}
+
+		public int getTitle() {
+			return title;
+		}
+
+		public int getChildrenCount() {
+			return items.size();
+		}
+
+		public MenuCategory addItem(MyMenuItem item) {
+			items.add(item);
+			return this;
+		}
+
+		public MyMenuItem getItem(int position) {
+			return items.get(position);
+		}
+	}
+
+
+	public static class MyMenuItem {
+		private final int title;
+		private final int desription;
+		@DrawableRes
+		private final int icon;
+		private final boolean isSquare;
+
+//		MyMenuItem(int title) {
+//			this.title = title;
+//			desription = null;
+//			icon = -1;
+//			isSquare = false;
+//		}
+
+		private MyMenuItem(int title, int desription, int icon, boolean isSquare) {
+			this.title = title;
+			this.desription = desription;
+			this.icon = icon;
+			this.isSquare = isSquare;
+		}
+
+		public static class Builder {
+			@StringRes
+			private int title = -1;
+			private int desription = -1;
+			private int icon = -1;
+			private boolean isSquare = false;
+
+			public Builder setTitle(@StringRes int title) {
+				this.title = title;
+				return this;
+			}
+
+			public Builder setDesription(int desription) {
+				this.desription = desription;
+				return this;
+			}
+
+			public Builder setIcon(int icon) {
+				this.icon = icon;
+				return this;
+			}
+
+			public Builder setIsSquare(boolean isSquare) {
+				this.isSquare = isSquare;
+				return this;
+			}
+
+			public HelpScreenDialogFragment.MyMenuItem create() {
+				return new HelpScreenDialogFragment.MyMenuItem(title, desription, icon, isSquare);
+			}
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
index ee2e593b37..9be7192424 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
@@ -1,7 +1,6 @@
 package net.osmand.plus.download.ui;
 
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -317,8 +316,6 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
 
 		public DownloadResourceGroupAdapter(DownloadActivity ctx) {
 			this.ctx = ctx;
-			TypedArray ta = ctx.getTheme().obtainStyledAttributes(new int[] { android.R.attr.textColorPrimary });
-			ta.recycle();
 		}
 
 		public void update(DownloadResourceGroup mainGroup) {

From 43837acedcf6f7a6baab868653079914b5c91ed2 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Fri, 30 Oct 2015 09:55:18 +0200
Subject: [PATCH 2/2] New help listView ready.

---
 .../bg_download_bar_light_grey.9.png          | Bin
 .../bg_download_bar_light_orange.9.png        | Bin
 OsmAnd/res/drawable-hdpi/ic_action_circle.png | Bin
 OsmAnd/res/drawable-hdpi/ic_action_label.png  | Bin
 .../res/drawable-hdpi/ic_action_wikipedia.png | Bin
 .../drawable-hdpi/map_intermediate_point.png  | Bin
 OsmAnd/res/drawable-hdpi/map_target_point.png | Bin
 OsmAnd/res/drawable-hdpi/warnings_limit.png   | Bin
 .../widget_monitoring_rec_inactive_day.png    | Bin
 .../widget_monitoring_rec_inactive_night.png  | Bin
 OsmAnd/res/layout/fragment_help_screen.xml    |   8 +-
 OsmAnd/res/layout/help_to_improve_item.xml    |  33 ++
 OsmAnd/res/values-af/strings.xml              |   4 +-
 OsmAnd/res/values-ar/strings.xml              |   4 +-
 OsmAnd/res/values-be-rBY/strings.xml          |   4 +-
 OsmAnd/res/values-be/strings.xml              |   4 +-
 OsmAnd/res/values-bg/strings.xml              |   4 +-
 OsmAnd/res/values-bs/strings.xml              |   2 +-
 OsmAnd/res/values-ca/strings.xml              |   4 +-
 OsmAnd/res/values-cs/strings.xml              |   4 +-
 OsmAnd/res/values-cy/strings.xml              |   2 +-
 OsmAnd/res/values-da/strings.xml              |   4 +-
 OsmAnd/res/values-de/strings.xml              |   4 +-
 OsmAnd/res/values-el/strings.xml              |   4 +-
 OsmAnd/res/values-es-rAR/strings.xml          |   4 +-
 OsmAnd/res/values-es/strings.xml              |   4 +-
 OsmAnd/res/values-et/strings.xml              |   2 +-
 OsmAnd/res/values-eu/strings.xml              |   4 +-
 OsmAnd/res/values-fa/strings.xml              |   4 +-
 OsmAnd/res/values-fi/strings.xml              |   4 +-
 OsmAnd/res/values-fr/strings.xml              |   4 +-
 OsmAnd/res/values-gl/strings.xml              |   4 +-
 OsmAnd/res/values-he/strings.xml              |   2 +-
 OsmAnd/res/values-hr/strings.xml              |   2 +-
 OsmAnd/res/values-hu/strings.xml              |   4 +-
 OsmAnd/res/values-id/strings.xml              |   2 +-
 OsmAnd/res/values-it/strings.xml              |   4 +-
 OsmAnd/res/values-ja/strings.xml              |   4 +-
 OsmAnd/res/values-ka/strings.xml              |   4 +-
 OsmAnd/res/values-kn/strings.xml              |   2 +-
 OsmAnd/res/values-ko/strings.xml              |   4 +-
 OsmAnd/res/values-lt/strings.xml              |   4 +-
 OsmAnd/res/values-lv/strings.xml              |   4 +-
 OsmAnd/res/values-mr/strings.xml              |   2 +-
 OsmAnd/res/values-nb/strings.xml              |   4 +-
 OsmAnd/res/values-nl/strings.xml              |   4 +-
 OsmAnd/res/values-nn/strings.xml              |   2 +-
 OsmAnd/res/values-pl/strings.xml              |   4 +-
 OsmAnd/res/values-pt-rBR/strings.xml          |   4 +-
 OsmAnd/res/values-pt/strings.xml              |   4 +-
 OsmAnd/res/values-ro/strings.xml              |   4 +-
 OsmAnd/res/values-ru/strings.xml              |   4 +-
 OsmAnd/res/values-sc/strings.xml              |   4 +-
 OsmAnd/res/values-sk/strings.xml              |   4 +-
 OsmAnd/res/values-sl/strings.xml              |   4 +-
 OsmAnd/res/values-sq/strings.xml              |   2 +-
 OsmAnd/res/values-sr/strings.xml              |   2 +-
 OsmAnd/res/values-sv/strings.xml              |   4 +-
 OsmAnd/res/values-tr/strings.xml              |   4 +-
 OsmAnd/res/values-uk/strings.xml              |   4 +-
 OsmAnd/res/values-zh-rCN/strings.xml          |   4 +-
 OsmAnd/res/values-zh-rTW/strings.xml          |   4 +-
 OsmAnd/res/values/strings.xml                 |  28 +-
 .../osmand/plus/activities/HelpActivity.java  |   2 +-
 .../dialogs/HelpScreenDialogFragment.java     | 275 --------------
 .../helpscreen/HelpScreenDialogFragment.java  | 337 ++++++++++++++++++
 .../plus/dialogs/helpscreen/MyMenuItem.java   | 104 ++++++
 .../rastermaps/OsmandRasterMapsPlugin.java    |   2 +-
 .../SettingsRasterMapsActivity.java           |  19 +-
 69 files changed, 603 insertions(+), 383 deletions(-)
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/bg_download_bar_light_grey.9.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/bg_download_bar_light_orange.9.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/ic_action_circle.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/ic_action_label.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/map_intermediate_point.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/map_target_point.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/warnings_limit.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_day.png
 mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_night.png
 create mode 100644 OsmAnd/res/layout/help_to_improve_item.xml
 delete mode 100644 OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dialogs/helpscreen/HelpScreenDialogFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dialogs/helpscreen/MyMenuItem.java

diff --git a/OsmAnd/res/drawable-hdpi/bg_download_bar_light_grey.9.png b/OsmAnd/res/drawable-hdpi/bg_download_bar_light_grey.9.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/bg_download_bar_light_orange.9.png b/OsmAnd/res/drawable-hdpi/bg_download_bar_light_orange.9.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_circle.png b/OsmAnd/res/drawable-hdpi/ic_action_circle.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_label.png b/OsmAnd/res/drawable-hdpi/ic_action_label.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/map_intermediate_point.png b/OsmAnd/res/drawable-hdpi/map_intermediate_point.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/map_target_point.png b/OsmAnd/res/drawable-hdpi/map_target_point.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/warnings_limit.png b/OsmAnd/res/drawable-hdpi/warnings_limit.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_day.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_night.png
old mode 100755
new mode 100644
diff --git a/OsmAnd/res/layout/fragment_help_screen.xml b/OsmAnd/res/layout/fragment_help_screen.xml
index 6e8f15b4df..56035e2e17 100644
--- a/OsmAnd/res/layout/fragment_help_screen.xml
+++ b/OsmAnd/res/layout/fragment_help_screen.xml
@@ -15,6 +15,12 @@
     <ExpandableListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="0dp"
+        style="@style/OsmandListView"
+        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/help_to_improve_item.xml b/OsmAnd/res/layout/help_to_improve_item.xml
new file mode 100644
index 0000000000..53e2aa5359
--- /dev/null
+++ b/OsmAnd/res/layout/help_to_improve_item.xml
@@ -0,0 +1,33 @@
+<?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="wrap_content"
+              android:orientation="horizontal"
+              android:paddingTop="16dp"
+              android:paddingBottom="16dp">
+
+    <TextView
+        android:id="@+id/pollButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:text="@string/poll"
+        tools:drawableTop="@drawable/ic_action_message"/>
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="?attr/divider_color"/>
+
+    <TextView
+        android:id="@+id/contactUsButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:text="@string/contact_us"
+        tools:drawableTop="@drawable/ic_action_message"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 287b557145..ea77e7c68e 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -77,7 +77,7 @@
   <string name="map_online_plugin_is_not_installed">Skakel die internet kaarte inlasmodule aan om ander kaartbronne te kies</string>
   <string name="map_online_data">Internet kaarte (teëls)</string>
   <string name="map_online_data_descr">Gebruik internet kaarte (Laai teëls af en berg dit in kasgeheue op die SD kaart)</string>
-  <string name="online_map_settings">Internet kaarte</string>
+  <string name="shared_string_online_maps">Internet kaarte</string>
   <string name="online_map_settings_descr">Stel die bronne op vir internet of kasgeheue-teël kaarte</string>
   
   
@@ -1189,7 +1189,7 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
 	<string name="driving_region_uk">VK, Indië, Australië &amp; Ander</string>
 	<string name="map_widget_fps_info">FPS ontfout inligting</string>
 	<string name="about_version">Weergawe:</string>
-    <string name="about_settings">Omtrent</string>
+    <string name="shared_string_about">Omtrent</string>
     <string name="about_settings_descr">Weergawe inligting, lisensie, projeklede</string>
     
     
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index bee5c2ac14..dd6a628419 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -196,7 +196,7 @@
 	<string name="front">أمام</string>
 	
 	<string name="about_version">الإصدار :</string>
-    <string name="about_settings">عنْ التطبيق</string>
+    <string name="shared_string_about">عنْ التطبيق</string>
     <string name="about_settings_descr">معلومات النسخة، والتراخيص، أعضاء المشروع</string>
     
     <string name="edit_tilesource_maxzoom">التّقريب الأقصى</string>
@@ -516,7 +516,7 @@
 	<string name="map_online_plugin_is_not_installed">تمكين ملحق الخرائط على الإنترنت من تحديد مصادر مختلفة للخرائط</string>
 	<string name="map_online_data">خرائط من الانترنت وتجانبية</string>
 	<string name="map_online_data_descr">استخدام الخرائط من الإنترنت (تنزيل وحفظ التجانبيات منها على بطاقة SD)</string>
-	<string name="online_map_settings">خرائط المتصلة بالانترنت</string>
+	<string name="shared_string_online_maps">خرائط المتصلة بالانترنت</string>
 	<string name="online_map_settings_descr">ضبط مصادر الخرائط التجانبية على الإنترنت أو المخزنة مؤقتا</string>
 	<string name="auto_zoom_farthest">إلى مدى الطويل</string>
 	<string name="use_magnetic_sensor_descr">استخدم الحساس المغناطيسي لتحديد قيمة البوصلة بدلا من حساس الاتجاهات</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 31cc68271a..6fed687751 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -442,7 +442,7 @@
 	
 	
     <string name="about_version">Viersіja:</string>
-    <string name="about_settings">Ab prahramie</string>
+    <string name="shared_string_about">Ab prahramie</string>
     <string name="about_settings_descr">Viersіja, lіcenzіі, udzieĺnіkі prajekta</string>
 
     
@@ -847,7 +847,7 @@
 	<string name="map_online_plugin_is_not_installed">Aktyvujcie moduĺ onlajn mapaŭ, kab vybіrać roznyja krynіcy dlia mapaŭ</string>
 	<string name="map_online_data">Siecіŭnyja і rastravyja mapy</string>
 	<string name="map_online_data_descr">Karystacca siecіŭnymі mapamі (zladavać і zachoŭvać na kartcy SD)</string>
-	<string name="online_map_settings">Siecіŭnyja mapy</string>
+	<string name="shared_string_online_maps">Siecіŭnyja mapy</string>
 	<string name="online_map_settings_descr">Nastrojka krynіc anlajn abo kešavanych rastravych mapaŭ</string>
 	
 	
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 5c4a5431bb..ffbad3cfe3 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -5,7 +5,7 @@
     <string name="map_magnifier">Лупа мапы</string>
     <string name="base_world_map">Асноўная мапа сьвету</string>
     <string name="about_version">Вэрсія:</string>
-    <string name="about_settings">Аб праграме</string>
+    <string name="shared_string_about">Аб праграме</string>
     <string name="about_settings_descr">Вэрсія, ліцэнзіі, удзельнікі праекту</string>
     
     
@@ -402,7 +402,7 @@
 	<string name="map_online_plugin_is_not_installed">Актывуйце модуль анлайн мапаў, каб выбіраць розныя крыніцы для мапаў</string>
 	<string name="map_online_data">Сеціўныя і растравыя мапы</string>
 	<string name="map_online_data_descr">Карыстацца сеціўнымі мапамі (cьцягнуць і захоўваць фрагмэнты на картцы SD)</string>
-	<string name="online_map_settings">Сеціўныя мапы</string>
+	<string name="shared_string_online_maps">Сеціўныя мапы</string>
 	<string name="online_map_settings_descr">Наладзьце крыніцы сеціўных або кэшаваных растравых мапаў</string>
 	
 	
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 1a646fa2d8..52f83672f8 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -571,7 +571,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="map_online_plugin_is_not_installed">Включете добавката за онлайн карти и ще можете да избирате различни източници на карти</string>
 	<string name="map_online_data">Онлайн карти</string>
 	<string name="map_online_data_descr">Използване на онлайн карти (сваляне на карти в SD картата)</string>
-	<string name="online_map_settings">Онлайн карти</string>
+	<string name="shared_string_online_maps">Онлайн карти</string>
 	<string name="online_map_settings_descr">Настройване на източниците за онлайн карти</string>
 	
 	
@@ -1377,7 +1377,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	За сега е възможно добро изчисляване на маршрут между точки, отдалечени на не повече от 200 км. Добавете междинни точки при по-дълги дистанции.</string>
 	<string name="base_world_map">Базова карта на света</string>
 	<string name="about_version">Версия:</string>
-    <string name="about_settings">За програмата</string>
+    <string name="shared_string_about">За програмата</string>
     <string name="about_settings_descr">Версия, лицензи и разработчици</string>
     
     
diff --git a/OsmAnd/res/values-bs/strings.xml b/OsmAnd/res/values-bs/strings.xml
index ddad787a2f..43a576b0de 100644
--- a/OsmAnd/res/values-bs/strings.xml
+++ b/OsmAnd/res/values-bs/strings.xml
@@ -36,7 +36,7 @@
   <string name="map_online_plugin_is_not_installed">Omogući nadogradnju za izbor drugačijih izvora javnih mapa</string>
   <string name="map_online_data">Javne mape (u sličicama)</string>
   <string name="map_online_data_descr">Koristi javne mape (preuzmi i keširaj sličice na memorijsku karticu)</string>
-  <string name="online_map_settings">Javne mape</string>
+  <string name="shared_string_online_maps">Javne mape</string>
   <string name="online_map_settings_descr">Podesi izvor sličica javnih ili keširanih mapa</string>
   
   
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 9cb9dca761..55240d1f51 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -94,7 +94,7 @@
 <string name="map_online_plugin_is_not_installed">Activeu el connector Mapes en línia per poder seleccionar diferents fonts de mapes</string>
 <string name="map_online_data">Mapes en línia (tessel·les)</string>
 <string name="map_online_data_descr">Utilitzeu mapes en línia (les tessel·les es baixen i es desen a la memòria cau de la targeta SD)</string>
-<string name="online_map_settings">Mapes en línia</string>
+<string name="shared_string_online_maps">Mapes en línia</string>
 <string name="online_map_settings_descr">Configureu les fonts de mapes de tessel·les en línia o desades a la memòria cau</string>
 
 
@@ -1167,7 +1167,7 @@
 	<string name="base_world_map">Mapa mundial</string>
 	
 	<string name="about_version">Versió:</string>
-    <string name="about_settings">Quant a</string>
+    <string name="shared_string_about">Quant a</string>
     <string name="about_settings_descr">Informació de la versió, llicències, membres del projecte</string>
     
     <string name="local_index_tile_data_zooms">Escalats baixats: %1$s</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 9de25d1c88..5fd347f3e3 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -770,7 +770,7 @@
   <string name="map_online_plugin_is_not_installed">Povolit modul \'Online mapy\' pro výběr různých mapových zdrojů</string>
   <string name="map_online_data">Online mapy (rastrové)</string>
   <string name="map_online_data_descr">Používat online mapy (stáhnout je a uložit na SD kartě)</string>
-  <string name="online_map_settings">Online mapy</string>
+  <string name="shared_string_online_maps">Online mapy</string>
   <string name="online_map_settings_descr">Nastavení rastrových překryvných nebo podkresových map</string>
   
   
@@ -1187,7 +1187,7 @@
 	<string name="driving_region_europe_asia">Evropa a Asie</string>
 	<string name="driving_region_uk">Británie, Indie, Austrálie a ostatní</string>
 	<string name="about_version">Verze:</string>
-    <string name="about_settings">O aplikaci</string>
+    <string name="shared_string_about">O aplikaci</string>
     <string name="about_settings_descr">Informace o verzi, licenci, členech projektu</string>
     <string name="local_index_tile_data_maxzoom">Maximální zvětšení: %1$s</string>
     <string name="local_index_tile_data_minzoom">Minimální zvětšení: %1$s</string>
diff --git a/OsmAnd/res/values-cy/strings.xml b/OsmAnd/res/values-cy/strings.xml
index 1a45f17af3..837b42960a 100644
--- a/OsmAnd/res/values-cy/strings.xml
+++ b/OsmAnd/res/values-cy/strings.xml
@@ -148,7 +148,7 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="map_online_plugin_is_not_installed">Galluogi mapiau plugin ar-lein i ddewis ffynonellau map gwahanol</string>
 <string name="map_online_data">Mapiau Ar-lein (teils)</string>
 <string name="map_online_data_descr">Defnyddio mapiau ar-lein (teils lawrlwytho a cache ar SD cerdyn)</string>
-<string name="online_map_settings">Mapiau Ar-lein</string>
+<string name="shared_string_online_maps">Mapiau Ar-lein</string>
 <string name="online_map_settings_descr">Ffurfweddu ffynonellau teils ar-lein neu cached map</string>
 
 
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 0e7d9cbef3..f1ab7cecdf 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -293,7 +293,7 @@
     <string name="map_online_plugin_is_not_installed">Aktiver onlinekort udvidelsen for at vælge andre kortkilder</string>
     <string name="map_online_data">Onlinekort og kortfliser</string>
     <string name="map_online_data_descr">Brug onlinekort (hent og gem midlertidig kortfliser på SD-kort)</string>
-    <string name="online_map_settings">Onlinekort</string>
+    <string name="shared_string_online_maps">Onlinekort</string>
     <string name="online_map_settings_descr">Konfigurer online- eller cachelagrede kilder til kortfliser</string>
 
 
@@ -1155,7 +1155,7 @@
     <string name="edit_tilesource_successfully">Kortflisekilden %1$s er gemt</string>
     
     <string name="about_version">Version:</string>
-    <string name="about_settings">Om</string>
+    <string name="shared_string_about">Om</string>
     <string name="about_settings_descr">Versioninformation, licenser, projektmedlemmer</string>
 
     
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index b233cbe3cc..ae94505713 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -160,7 +160,7 @@
 	<string name="map_online_plugin_is_not_installed">Aktivieren Sie das Online-Karten-Plugin, um andere Kartenquellen nutzen zu können</string>
 	<string name="map_online_data">Online- und Kachel-Karten</string>
 	<string name="map_online_data_descr">Online-Karten verwenden (Kacheln auf die SD-Karte herunterladen und zwischenspeichern)</string>
-	<string name="online_map_settings">Online-Karten</string>
+	<string name="shared_string_online_maps">Online-Karten</string>
 	<string name="online_map_settings_descr">Online- oder zwischengespeicherte Kachelkartenquellen konfigurieren</string>
 	
 	
@@ -1254,7 +1254,7 @@
 	<string name="announce_gpx_waypoints">GPX-Wegpunkte ansagen</string>
 	<string name="driving_region">Fahrgebiet</string>
 	<string name="about_version">Version :</string>
-	<string name="about_settings">Über</string>
+	<string name="shared_string_about">Über</string>
 	<string name="about_settings_descr">Versionsinfo, Lizenz, Projekt-Mitglieder</string>
 	<string name="local_index_tile_data_zooms">Zooms heruntergeladen: %1$s</string>
 	<string name="local_index_tile_data_expire">Gültigkeit endet in (Minuten): %1$s</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 95bb16e8d2..bbe40ac884 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -166,7 +166,7 @@
 	<string name="map_online_plugin_is_not_installed">Ενεργοποιήστε το πρόσθετο για τους online χάρτες για να επιλέξετε διαφορετικές πηγές χάρτη</string>
 	<string name="map_online_data">Online και χάρτες πλακίδια</string>
 	<string name="map_online_data_descr">Χρήση online χαρτών (λήψη και φύλαξη πλακιδίων στην κάρτα SD)</string>
-	<string name="online_map_settings">Online χάρτες</string>
+	<string name="shared_string_online_maps">Online χάρτες</string>
 	<string name="online_map_settings_descr">Διαμορφώστε τις πηγές των online ή προσωρινά αποθηκευμένων πλακιδίων χάρτη</string>
 	
 	
@@ -1129,7 +1129,7 @@
 	<string name="driving_region_europe_asia">Ευρώπη &amp; Ασία</string>
 	<string name="driving_region_uk">ΗΒ, Ινδία, Αυστραλία, Κύπρος κλπ</string>
 	<string name="about_version">Εκδοχή :</string>
-    <string name="about_settings">Περί</string>
+    <string name="shared_string_about">Περί</string>
     <string name="about_settings_descr">Πληροφορίες έκδοσης, άδειες, μέλη έργου</string>
     
     <string name="local_index_tile_data_expire">Λήξη (λεπτά): %1$s</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index b6a9cd153f..3f49a4d206 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -125,7 +125,7 @@
 	<string name="route_points">Puntos de la ruta</string>
 	<string name="track_segments">Segmentos de la traza</string>
 	<string name="track_points">Puntos de la traza</string>
-	<string name="online_map_settings">Mapas en línea</string>
+	<string name="shared_string_online_maps">Mapas en línea</string>
 	<string name="record_plugin_name">Grabación de viaje</string>
 	<string name="osmo_plugin_name">OsMo (Rastreo OSM)</string>
 	<string name="plugin_touringview_name">Vista turística</string>
@@ -623,7 +623,7 @@
 	
 	
     <string name="about_version">Versión:</string>
-    <string name="about_settings">Acerca de</string>
+    <string name="shared_string_about">Acerca de</string>
     <string name="about_settings_descr">Información de la versión, licencias, miembros del proyecto</string>
 
     
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 92ec91b921..6e3416bd8b 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -725,7 +725,7 @@
   <string name="map_online_plugin_is_not_installed">Habilita el complemento mapas en línea para seleccionar diferentes fuentes de mapas</string>
   <string name="map_online_data">Mapas en línea y teselas</string>
   <string name="map_online_data_descr">Usa mapas en línea (teselas descargadas y almacenadas localmente en la tarjeta SD)</string>
-  <string name="online_map_settings">Mapas en línea</string>
+  <string name="shared_string_online_maps">Mapas en línea</string>
   <string name="online_map_settings_descr">Configura las fuentes de teselas de mapas en línea o almacenadas localmente</string>
   
   
@@ -1279,7 +1279,7 @@
     <string name="edit_tilesource_successfully">Fuente de teselas %1$s ha sido guardada correctamente</string>
     <string name="local_index_tile_data_name">Datos de teselas: %1$s</string>
     <string name="local_index_tile_data_expire">Expirar (minutos): %1$s</string>
-    <string name="about_settings">Acerca de</string>
+    <string name="shared_string_about">Acerca de</string>
     <string name="about_settings_descr">Información de la versión, licencias, miembros del proyecto</string>
     <string name="edit_tilesource_choose_existing">Elegir existente…</string>
     
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index 22d4d5156a..d96cfc7c23 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -66,7 +66,7 @@
 	<string name="shared_string_audio">Audio</string>
 	<string name="shared_string_video">Video</string>
 	<string name="shared_string_photo">Foto</string>
-	<string name="online_map_settings">Online kaardid</string>
+	<string name="shared_string_online_maps">Online kaardid</string>
 	<string name="record_plugin_name">Reisi salvestus</string>
 	<string name="osmo_plugin_name">OsMo (OSM Monitoorimine)</string>
 	<string name="plugin_nautical_name">Merendus kaardi vaade</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 68465f7058..399fc80d87 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -404,7 +404,7 @@
   <string name="map_online_plugin_is_not_installed">Gaitu sareko mapen plugina mapen iturburu ezberdinak aukeratzeko</string>
   <string name="map_online_data">Sare eta tesela mapak</string>
   <string name="map_online_data_descr">Erabili sareko mapak (deskargatu eta katxeatu teselak SD txartelan)</string>
-  <string name="online_map_settings">Sareko mapak</string>
+  <string name="shared_string_online_maps">Sareko mapak</string>
   <string name="online_map_settings_descr">Konfiguratu sareko edo katxeaturiko mapen iturburuak</string>
   
   
@@ -1266,7 +1266,7 @@
     
     
     <string name="about_version">Bertsioa:</string>
-    <string name="about_settings">Buruz</string>
+    <string name="shared_string_about">Buruz</string>
     <string name="about_settings_descr">Bertsioaren informazioa ,lizantziak ,proiektu kideak</string>
     
 	<string name="shared_string_or">edo</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 54b0a4b2cd..2e3364334c 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -711,7 +711,7 @@
 	<string name="local_indexes_cat_tile">نقشه های آنلاین</string>
 	<string name="map_online_data">نقشه های آنلاین</string>
 	<string name="map_online_data_descr">استفاده از نقشه های آنلاین (دانلود کاشه های نقشه روی حافظه جانبی)</string>
-	<string name="online_map_settings">نقشه های آنلاین</string>
+	<string name="shared_string_online_maps">نقشه های آنلاین</string>
 	<string name="online_map_settings_descr">تنظیمات آنلاین و منابع کاشه های نقشه</string>
 	
 	<string name="vector_maps_may_display_faster_on_some_devices">نقشه های بُرداری سریعتر نمایش داده میشوند. ممکن است روی یرخی دستگاهها خوب کار نکند.</string>
@@ -1348,7 +1348,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. 
 	<string name="driving_region_europe_asia">اروپا و آسیا</string>
 	<string name="driving_region_uk">انگلستان، هند، استرالیا و سایر کشورها</string>
 	<string name="about_version">ویرایش:</string>
-    <string name="about_settings">درباره</string>
+    <string name="shared_string_about">درباره</string>
     <string name="about_settings_descr">درباره نسخه، گواهی ها، اعضای پروژه</string>
     
     
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index 8d84b38cf8..e4927a9781 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -600,7 +600,7 @@
 	<string name="local_indexes_cat_map">Offline kartat (vektori)</string>
 	
 	<string name="index_settings_descr">Lataa, katso lisätietoja ja hallinnoi offline karttoja</string>
-	<string name="online_map_settings">Online kartat</string>
+	<string name="shared_string_online_maps">Online kartat</string>
 	<string name="process_navigation_service">OsmAnd navigointipalvelu</string>
 	<string name="network_provider">Verkko</string>
 	<string name="background_router_service_descr">Suorita OsmAnd sovellusta taustalla seurataksesi sijaintia silloin kun näyttö on pois päältä</string>
@@ -675,7 +675,7 @@
     <string name="distance_measurement_start_editing">Aloita muokkaus</string>
     
 	<string name="about_version">Versio:</string>
-    <string name="about_settings">Tietoja</string>
+    <string name="shared_string_about">Tietoja</string>
     <string name="about_settings_descr">Versio tietoja, lisenssit, projektin jäsenet</string>
     
     <string name="local_index_tile_data_downloadable">Ladattavissa: %1$s</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 929b22984b..e220268833 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -702,7 +702,7 @@
   <string name="map_online_plugin_is_not_installed">Activez le greffon \"Cartes en ligne\" pour sélectionner différentes sources de cartes</string>
   <string name="map_online_data">Carte en ligne (tuiles)</string>
   <string name="map_online_data_descr">Utiliser une carte en ligne (télécharger et conserver en cache les tuiles de carte sur la carte SD)</string>
-  <string name="online_map_settings">Cartes en ligne</string>
+  <string name="shared_string_online_maps">Cartes en ligne</string>
   <string name="online_map_settings_descr">Configurer la source de la carte en ligne ou en cache</string>
   
   
@@ -1224,7 +1224,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="driving_region_canada">Canada</string>
 	<string name="speak_speed_limit">Limitation de vitesse</string>
     
-	<string name="about_settings">À propos</string>
+	<string name="shared_string_about">À propos</string>
     <string name="about_settings_descr">Note de version, licences, membres du projet</string>
     
     <string name="local_index_tile_data_zooms">Zooms téléchargés : %1$s</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 1c22d39c98..0657f08bb2 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -368,7 +368,7 @@
 	
 	
     <string name="about_version">Versión :</string>
-    <string name="about_settings">Sobre</string>
+    <string name="shared_string_about">Sobre</string>
     <string name="about_settings_descr">Información sobre a versión, licenzas, participantes no proxecto</string>
 
     
@@ -775,7 +775,7 @@
 	<string name="map_online_plugin_is_not_installed">Activar o engadido de mapas con conexión para seleccionar fontes de mapas diferentes</string>
 	<string name="map_online_data">Mapas con conexión e en teselas</string>
 	<string name="map_online_data_descr">Empregar mapas con conexión (descargar e gardar temporalmente as teselas no cartón SD)</string>
-	<string name="online_map_settings">Mapas con conexión</string>
+	<string name="shared_string_online_maps">Mapas con conexión</string>
 	<string name="online_map_settings_descr">Configurar as fontes de mapas en teselas con conexión ou gardados temporalmente</string>
 	
 	
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 84df52faba..460169095a 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -192,7 +192,7 @@
 	<string name="map_online_plugin_is_not_installed">ניתן להפעיל את תוסף המפות המקוונות כדי לבחור במקורות שונים למפה</string>
 	<string name="map_online_data">מפות מקוונות ואריחים</string>
 	<string name="map_online_data_descr">שימוש במפות מקוונות (הורדה ואחסון המפות בכרטיס ה־SD)</string>
-	<string name="online_map_settings">מפות מקוונות</string>
+	<string name="shared_string_online_maps">מפות מקוונות</string>
 	<string name="online_map_settings_descr">הגדרת מקורות אריחי מפה מקוונים או שמורים</string>
 	
 	
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index 298b3d3657..fc09a65abb 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -186,7 +186,7 @@
 	<string name="left_side_navigation">Vožnja lijevom stranom</string>
 	<string name="left_side_navigation_descr">Označi za države s vožnjom na lijevoj strani</string>
 	<string name="local_indexes_cat_map">Offline karte (vektorske)</string>
-	<string name="online_map_settings">Online karte</string>
+	<string name="shared_string_online_maps">Online karte</string>
 	
 	
 	<string name="plugins_screen">Dodaci</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 726c21185b..0dc060fe59 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -778,7 +778,7 @@
   <string name="map_online_plugin_is_not_installed">További térképforrások kiválasztásához engedélyezd az online térképek bővítményt</string>
   <string name="map_online_data">Online térképcsempék</string>
   <string name="map_online_data_descr">Internetes térképek használata (letöltés és tárolás az SD kártyán)</string>
-  <string name="online_map_settings">Online térképek</string>
+  <string name="shared_string_online_maps">Online térképek</string>
   <string name="online_map_settings_descr">Internetes és tárolt raszteres térképek beállításai</string>
   
   
@@ -1188,7 +1188,7 @@
 	<string name="map_widget_fps_info">FPS debug infó</string>
 	
 	<string name="about_version">Verzió:</string>
-    <string name="about_settings">Névjegy</string>
+    <string name="shared_string_about">Névjegy</string>
     <string name="about_settings_descr">Verzióinfó, licencek, csapattagok</string>
     
     
diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml
index e9129dccb2..535cf956a7 100644
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@@ -45,7 +45,7 @@
     
     <string name="local_indexes_cat_av">Data Audio/Video</string>
     <string name="about_version">Versi :</string>
-    <string name="about_settings">Tentang</string>
+    <string name="shared_string_about">Tentang</string>
     <string name="about_settings_descr">Info versi, lisensi, anggota</string>
     
     <string name="local_index_tile_data_downloadable">Dapat di download: %1$s</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index aa4f8b1688..e195cefc44 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -664,7 +664,7 @@
   <string name="map_online_plugin_is_not_installed">Abilita il plugin Mappe Online per scegliere altre sorgenti di mappe</string>
   <string name="map_online_data">Mappe online e a tasselli</string>
   <string name="map_online_data_descr">Usa le mappe online (scarica e archivia i tasselli nella scheda SD)</string>
-  <string name="online_map_settings">Mappe online</string>
+  <string name="shared_string_online_maps">Mappe online</string>
   <string name="online_map_settings_descr">Configura le sorgenti delle mappe online o dei tasselli in cache</string>
   
   
@@ -1195,7 +1195,7 @@
     <string name="maps_define_edit">Imposta/Modifica…</string>
 	
     <string name="about_version">Versione:</string>
-    <string name="about_settings">Informazioni</string>
+    <string name="shared_string_about">Informazioni</string>
     <string name="about_settings_descr">Informazioni versione, licenze e membri del progetto</string>
     
     
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index fbaaafbee5..df4e35a667 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -625,7 +625,7 @@ POIの更新は利用できません</string>
     <string name="map_magnifier">マップ拡大鏡倍率</string>
     
     <string name="about_version">バージョン：</string>
-    <string name="about_settings">OsmAnd Maps &amp; Navigationについて</string>
+    <string name="shared_string_about">OsmAnd Maps &amp; Navigationについて</string>
     <string name="about_settings_descr">バージョン情報、ライセンス、プロジェクトメンバー</string>
     
     
@@ -984,7 +984,7 @@ POIの更新は利用できません</string>
 	<string name="local_indexes_cat_map">オフラインマップ(ベクター形式)</string>
 	<string name="map_online_plugin_is_not_installed">別のマップソースを選択するためにオンラインマッププラグインを有効にする</string>
 	<string name="map_online_data">オンラインタイルマップ</string>
-	<string name="online_map_settings">オンラインマップ</string>
+	<string name="shared_string_online_maps">オンラインマップ</string>
 	<string name="online_map_settings_descr">オンラインまたはキャッシュされたタイルマップソースを設定します</string>
 	
 	
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index acb3d6a5f5..e80eaf020d 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -16,7 +16,7 @@
   <string name="map_online_plugin_is_not_installed">"ჩართეთ მიმდინარე რუკების დამატება სხვადასხვა წყაროების სანახავად"</string>
   <string name="map_online_data">მიმდინარე რუკები</string>
   <string name="map_online_data_descr">მიმდინარე რუკების გამოყენება (ჩამოტვირთვა და sdcard-ზე ქეშირება)</string>
-  <string name="online_map_settings">მიმდინარე რუკები</string>
+  <string name="shared_string_online_maps">მიმდინარე რუკები</string>
   <string name="online_map_settings_descr">მიმდინარე და დაქეშირებული ნაწილოვანი რუკების წყაროების გამართვა</string>
   
   
@@ -1083,7 +1083,7 @@
 	<string name="base_world_map">დედამიწის ბაზისური რუკა</string>
 	
 	<string name="about_version">ვერსია:</string>
-    <string name="about_settings">შესახებ</string>
+    <string name="shared_string_about">შესახებ</string>
     <string name="about_settings_descr">ინფორმაცია ვერსიის, ლიცენზიების და პროექტის წევრების შესახებ</string>
     
     <string name="local_index_tile_data_zooms">ჩამოტვირთულია გადიდებები: %1$s</string>
diff --git a/OsmAnd/res/values-kn/strings.xml b/OsmAnd/res/values-kn/strings.xml
index 1ef2f384f7..ff7406a98b 100644
--- a/OsmAnd/res/values-kn/strings.xml
+++ b/OsmAnd/res/values-kn/strings.xml
@@ -105,7 +105,7 @@
 	<string name="shared_string_audio">ಶ್ರಾವ್ಯ</string>
 	<string name="shared_string_video">ದೃಶ್ಯ</string>
 	<string name="shared_string_photo">ಛಾಯಾಚಿತ್ರ</string>
-	<string name="online_map_settings">ಮಿಂಬಲೆ ನಕ್ಷೆಗಳು</string>
+	<string name="shared_string_online_maps">ಮಿಂಬಲೆ ನಕ್ಷೆಗಳು</string>
 	<string name="record_plugin_name">ಪ್ರಯಾಣ ದಾಖಲಿಸಿಕೊಳ್ಳುವುದು</string>
 	<string name="osmo_plugin_name">ಒಸ್ಮೊ (ಒಎಸ್ಎಂ ಪರಿವೀಕ್ಷಿಸುವಿಕೆ)</string>
 	<string name="plugin_nautical_name">ಹಡಗಿನ ನಕ್ಷೆ ವೀಕ್ಷಣೆ</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 9f347e857e..cc0c2390b3 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -869,7 +869,7 @@
 	<string name="about_version">버전:</string>
     <string name="about_settings_descr">버전 정보, 라이센스, 프로젝트 멤버</string>
     
-    <string name="about_settings">소개</string>
+    <string name="shared_string_about">소개</string>
     <string name="local_index_tile_data_zooms">다운로드된 줌 : %1$s</string>
     <string name="local_index_tile_data_expire">만료(분) : %1$s</string>
     <string name="local_index_tile_data_downloadable">다운로드 가능 : %1$s</string>
@@ -1355,7 +1355,7 @@
 	<string name="map_online_plugin_is_not_installed">다른 지도 소스를 선택하려면 온라인지도 플러그인을 활성화하세요</string>
 	<string name="map_online_data">온라인 및 타일 지도</string>
 	<string name="map_online_data_descr">온라인지도를 사용합니다 (SD 카드에 타일을 다운로드 하고 캐시합니다)</string>
-	<string name="online_map_settings">온라인지도</string>
+	<string name="shared_string_online_maps">온라인지도</string>
 	<string name="online_map_settings_descr">온라인 또는 캐시된 타일 지도 소스를 구성합니다</string>
 	
 	
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 226e8d8969..eaae07d530 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -64,7 +64,7 @@
   <string name="map_online_plugin_is_not_installed">Įjunkite interneto žemėlapių įskiepį norėdami pasirinkti kitus žemėlapių šaltinius</string>
   <string name="map_online_data">Interneto žemėlapiai</string>
   <string name="map_online_data_descr">Naudoti interneto žemėlapius (parsisiųsti dalis laikinam saugojimui SD kortelėje)</string>
-  <string name="online_map_settings">Interneto žemėlapiai</string>
+  <string name="shared_string_online_maps">Interneto žemėlapiai</string>
   <string name="online_map_settings_descr">Nustatykite interneto ar laikinai išsaugotų žemėlapių šaltinius</string>
   
   
@@ -1191,7 +1191,7 @@
 	<string name="av_photo_play_sound">Groti garsą darant nuotrauką</string>
 	<string name="av_photo_play_sound_descr">Pasirinkite ar groti garsą, kai fotografuojama</string>
 <string name="about_version">Versija :</string>
-    <string name="about_settings">Apie</string>
+    <string name="shared_string_about">Apie</string>
     <string name="about_settings_descr">Versijos informacija, licencijos, projekto nariai</string>
     
     
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 3e1c63d574..bd4c607da1 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -791,7 +791,7 @@
   <string name="map_online_plugin_is_not_installed">Aktivizēt tiešsaistes karšu spraudni, lai atlasītu citus karšu avotus</string>
   <string name="map_online_data">Bezsaistes kartes (bildes)</string>
   <string name="map_online_data_descr">Lietot tiešaistes kartes (lejuplādējot un kešojot bildes SD kartē)</string>
-  <string name="online_map_settings">Tiešsaistes kartes</string>
+  <string name="shared_string_online_maps">Tiešsaistes kartes</string>
   <string name="online_map_settings_descr">Konfigurēt tiešaistes vai kešotās kartes bildes</string>
   
   
@@ -1009,7 +1009,7 @@
 	<string name="base_world_map">Pasaules karte</string>
 	
 	<string name="about_version">Versija:</string>
-    <string name="about_settings">Par</string>
+    <string name="shared_string_about">Par</string>
     <string name="about_settings_descr">Versijas informācija, licenzes, projektā piedalījušies cilvēki</string>
     <string name="local_index_tile_data_zooms">Mērogošanas dati ielādēti: %1$s</string>
     <string name="local_index_tile_data_downloadable">Lejupielādējams: %1$s</string>
diff --git a/OsmAnd/res/values-mr/strings.xml b/OsmAnd/res/values-mr/strings.xml
index 05853643ae..d6e4c2bac0 100644
--- a/OsmAnd/res/values-mr/strings.xml
+++ b/OsmAnd/res/values-mr/strings.xml
@@ -6,7 +6,7 @@
   <string name="local_indexes_cat_map">ऑफलाइन नकाशे (वेक्टर)</string>
   <string name="map_online_data">ऑनलाइन नकाशे (टाइल्स)</string>
   <string name="map_online_data_descr">ऑनलाइन नकाशे वापरा (डाउनलोड करून एसडी कार्ड वार साठवा)</string>
-  <string name="online_map_settings">ऑनलाइन नकाशे</string>
+  <string name="shared_string_online_maps">ऑनलाइन नकाशे</string>
   <string name="online_map_settings_descr">Configure online or cached tile map sources</string>
   
   <string name="plugins_screen">प्लगिन्स</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 6dbb6f167d..f29d272e66 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -116,7 +116,7 @@
 	<string name="map_online_plugin_is_not_installed">Aktiver programtillegget for nettbaserte kart for å velge ulike kartkilder</string>
 	<string name="map_online_data">Nettbaserte- og flis-kart</string>
 	<string name="map_online_data_descr">Bruk nettbaserte kart (last ned og bufre fliser på SD-kort)</string>
-	<string name="online_map_settings">Nettbaserte kart</string>
+	<string name="shared_string_online_maps">Nettbaserte kart</string>
 	<string name="online_map_settings_descr">Still inn nettbaserte eller hurtigbufrede flis-kartkilder</string>
 	
 	
@@ -630,7 +630,7 @@
     <string name="search_street_in_neighborhood_cities">Søk etter gaten i nabobyer</string>
     
 	<string name="about_version">Versjon:</string>
-    <string name="about_settings">Om</string>
+    <string name="shared_string_about">Om</string>
     <string name="about_settings_descr">Versjonsinformasjon, lisenser, prosjektmedlemmer</string>
     
     <string name="local_index_tile_data_downloadable">Nedlastbar: %1$s</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 03086f1e91..3d2c2148b3 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -764,7 +764,7 @@
   <string name="map_online_plugin_is_not_installed">Activeer de online kaarten-plugin om andere kaartbronnen te kunnen selecteren</string>
   <string name="map_online_data">Online (raster-) kaarten</string>
   <string name="map_online_data_descr">Gebruik online kaarten (download en bewaar deze op SD-kaart)</string>
-  <string name="online_map_settings">Online kaarten</string>
+  <string name="shared_string_online_maps">Online kaarten</string>
   <string name="online_map_settings_descr">Configureer online of bewaarde kaartbronnen</string>
   
   
@@ -1340,7 +1340,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="maps_define_edit">Definieer/bewerk…</string>
 	
     <string name="about_version">Versie:</string>
-    <string name="about_settings">Over</string>
+    <string name="shared_string_about">Over</string>
     <string name="about_settings_descr">Versieinformatie, licenties, projectdeelnemers</string>
     
     
diff --git a/OsmAnd/res/values-nn/strings.xml b/OsmAnd/res/values-nn/strings.xml
index bd718a6819..21e848c691 100644
--- a/OsmAnd/res/values-nn/strings.xml
+++ b/OsmAnd/res/values-nn/strings.xml
@@ -164,7 +164,7 @@
     <string name="base_world_map">Globalt grunnkart</string>
 	
 	<string name="about_version">Versjon:</string>
-    <string name="about_settings">Om</string>
+    <string name="shared_string_about">Om</string>
     
     <string name="edit_tilesource_maxzoom">Maksforstørring</string>
     <string name="edit_tilesource_minzoom">Minste forstørring</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 015b6f6e0a..c80c741cbc 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -650,7 +650,7 @@
   <string name="map_online_plugin_is_not_installed">Aktywuj wtyczkę map online, aby wybrać inne źródła mapy</string>
   <string name="map_online_data">Mapy online i kafelki</string>
   <string name="map_online_data_descr">Używa map online (pobiera i przechowuje kafelki na karcie SD)</string>
-  <string name="online_map_settings">Mapy online</string>
+  <string name="shared_string_online_maps">Mapy online</string>
   <string name="online_map_settings_descr">Skonfiguruj źródła kafelków online i offline</string>
   
   
@@ -1195,7 +1195,7 @@
     <string name="local_index_tile_data_minzoom">Minimalne przybliżenie: %1$s</string>
     <string name="local_index_tile_data_name">Dane kafelkowe: %1$s</string>
     <string name="about_version">Wersja:</string>
-    <string name="about_settings">Informacje</string>
+    <string name="shared_string_about">Informacje</string>
     <string name="about_settings_descr">Wyświetla informacje o wersji, licencji, współtwórcach</string>
     
     
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index a234d6462a..33d3a6343a 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -138,7 +138,7 @@
 	<string name="shared_string_photo">Foto</string>
 	<string name="route_points">Pontos da rota</string>
 	<string name="track_segments">Segmentos do trajeto</string>
-	<string name="online_map_settings">Mapas on-line</string>
+	<string name="shared_string_online_maps">Mapas on-line</string>
 	<string name="osmand_rastermaps_plugin_description">"Com este complemento você pode acessar muitos tipos de mapas online (chamados de quadrícula ou ladrilho), tais como quadrículas predefinidas do OpenStreetMap (como Mapnik) para imagens de satélite e camadas especiais como mapas aquáticos, climáticos, geológicos, camadas de sombra de relevo, etc.\n\nQuaisquer desses mapas podem ser usados como mapa principal (base) para ser mostrado no OsmAnd ou como uma sobreposição ou subcamada para outro mapa base (como o mapa offline normal de OsmAnd). A fim de fazer qualquer subcamada do mapa mais visível, certos elementos do mapa vetorial do OsmAnd podem facilmente ser ocultados através do menu \'Configurar mapa\' conforme desejado.\n\nQuadrículas de mapas podem ser obtidas diretamente através de fontes on-line ou podem ser preparados para uso off-line (e copiadas manualmente para o diretório de dados do OsmAnd) como um banco de dados sqlite, que pode ser produzido por uma variedade de ferramentas de terceiros para preparação de mapas. "</string>
 	<string name="record_plugin_name">Gravação de viagem</string>
 	<string name="record_plugin_description">"Este complemento ativa a funcionalidade para gravar e salvar seus trajetos manualmente tocando o widget de registro de GPX na tela do mapa ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um arquivo GPX.
@@ -622,7 +622,7 @@
 	
 	
     <string name="about_version">Versão:</string>
-    <string name="about_settings">Sobre</string>
+    <string name="shared_string_about">Sobre</string>
     <string name="about_settings_descr">Versão, licenças, membros do projeto</string>
 
     
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 9942af3b81..6e449c6329 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -459,7 +459,7 @@
   <string name="map_online_plugin_is_not_installed">Activar plugin de mapas on-line para seleccionar diferentes fontes de mapas</string>
   <string name="map_online_data">Mapas Online e Mosaicos</string>
   <string name="map_online_data_descr">Usar mapas on-line (obter e armazenar mosaicos no cartão SD)</string>
-  <string name="online_map_settings">Mapas Online</string>
+  <string name="shared_string_online_maps">Mapas Online</string>
   <string name="online_map_settings_descr">Configurar fontes de mosaicos ou de mapas on-line</string>
   
   
@@ -1263,7 +1263,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 <string name="driving_region_canada">Canadá</string>
 	
 	<string name="about_version">Versão:</string>
-    <string name="about_settings">Sobre</string>
+    <string name="shared_string_about">Sobre</string>
     <string name="about_settings_descr">Versão, licenças, membros do projeto</string>
     
     <string name="local_index_tile_data_zooms">Zoom transferidas: %1$s</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index e3461d18cc..9edcdea0b1 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -197,7 +197,7 @@
 	<string name="map_online_plugin_is_not_installed">Activează plugin-ul pentru hărți online ca să beneficiezi și de alte surse de date</string>
 	<string name="map_online_data">Hărți online și în format raster</string>
 	<string name="map_online_data_descr">Folosește hărți online (descarcă și salvează porțiuni de hartă pe cardul SD)</string>
-	<string name="online_map_settings">Hărți online</string>
+	<string name="shared_string_online_maps">Hărți online</string>
 	<string name="online_map_settings_descr">Configurați sursele pentru hărțile online și raster</string>
 	
 	
@@ -1089,7 +1089,7 @@
 	<string name="base_world_map">Harta de bază a lumii</string>
 	
 	<string name="about_version">Versiune :</string>
-    <string name="about_settings">Despre</string>
+    <string name="shared_string_about">Despre</string>
     <string name="about_settings_descr">Informații versiune, licențe, membrii proiect</string>
     
     <string name="local_index_tile_data_expire">Expiră (minute): %1$s</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index af8e9e5a47..872d6e71c0 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -84,7 +84,7 @@
   <string name="map_online_plugin_is_not_installed">Активируйте плагин онлайн карт, чтобы выбирать различные источники карт</string>
   <string name="map_online_data">Онлайн карты</string>
   <string name="map_online_data_descr">Использовать онлайн карты (загрузка и кэширование на SD-карте)</string>
-  <string name="online_map_settings">Онлайн карты</string>
+  <string name="shared_string_online_maps">Онлайн карты</string>
   <string name="online_map_settings_descr">Настройки источников онлайн карт и слоёв</string>
   
   
@@ -1180,7 +1180,7 @@
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_name">Имя</string>
     <string name="map_widget_fps_info">Отладочная информация FPS</string>
-	<string name="about_settings">О программе</string>
+	<string name="shared_string_about">О программе</string>
     <string name="about_settings_descr">Информация о версии, участниках проекта</string>
     
     <string name="local_index_tile_data_zooms">Загружено данных по масштабам: %1$s</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 4f8217c3b8..ddd70bc0db 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -126,7 +126,7 @@
 	<string name="shared_string_yes">Eja</string>
 	
     <string name="about_version">Versione:</string>
-    <string name="about_settings">Informatziones</string>
+    <string name="shared_string_about">Informatziones</string>
     <string name="about_settings_descr">Informatziones de sa versione, litzèntzias, membros de su progetu</string>
     
     
@@ -726,7 +726,7 @@
 	<string name="local_indexes_cat_map">Mapas regulares (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="online_map_settings">Mapas in lìnia</string>
+	<string name="shared_string_online_maps">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>
 	
 	
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 0f7daa5c89..88584d8355 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -82,7 +82,7 @@
   <string name="map_online_plugin_is_not_installed">Povoľte zásuvný modul Online mapy, aby bolo možné vybrať rozličné mapové zdroje</string>
   <string name="map_online_data">Online mapy (dlaždice)</string>
   <string name="map_online_data_descr">Použitie online máp (ich stiahnutie a uloženie na SD kartu)</string>
-  <string name="online_map_settings">Online mapy</string>
+  <string name="shared_string_online_maps">Online mapy</string>
   <string name="online_map_settings_descr">Konfigurácia online mapových zdrojov</string>
   
   
@@ -1121,7 +1121,7 @@
 	<string name="speak_traffic_warnings">Dopravné varovania</string>
 	
 	<string name="about_version">Verzia:</string>
-    <string name="about_settings">O programe</string>
+    <string name="shared_string_about">O programe</string>
     <string name="about_settings_descr">Informácie o verzii, licencie, členovia projektu</string>
     
     
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 46f950b505..1cf441e521 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -568,7 +568,7 @@
 	<string name="index_settings_descr">Prejemanje in upravljanje datotek zemljevidov, shranjenih na napravi</string>
 	<string name="map_online_plugin_is_not_installed">Omogočite vstavek spletnih zemljevidov za izbiro različnih virov zemljevidov</string>
 	<string name="map_online_data_descr">Uporabi spletne zemljevide (prejem in shranjevanje na kartici SD)</string>
-	<string name="online_map_settings">Spletni zemljevidi</string>
+	<string name="shared_string_online_maps">Spletni zemljevidi</string>
 	<string name="online_map_settings_descr">Nastavitev virov spletnih in shranjenih zemljevidov</string>
 	<string name="osmand_rastermaps_plugin_description">"Vstavek omogoča dostop do različnih vrst zemljevidov od vektorskih OpenStreetMap do satelitskih slik ter posebnih prekrivnih zemljevidov, kot so vremenski, klimatski, geološki in drugi zemljevidi. Vstavek omogoča tudi podporo za izrisovanje izohips, senčenje hribovitih predelov in podobno.\n\nVsi ti zemljevidi so lahko uporabljeni kot osnovni zemljevidi, ali pa so podloga oziroma prekrivni zemljevid drugim zemljevidom. V ta namen je treba vektorske zemljevide OsmAnd skriti oziroma narediti prosojne med \'Nastavitvami zemljevida\' v vsebinskem meniju.\n\nVektorske zemljevide je mogoče pridobiti preko spletnih virov, ali pa jih shraniti za delo brez povezave. Zemljevidi morajo biti shranjeni v osnovni mapi OsmAnd kot podatkovna zbirka SQLite. "</string>
 	<string name="osm_editing_plugin_description">Vstavek omogoča upravljanje nastavitev, ki so namenjene pošiljanju poročil, hroščev in odzivov na delovanje programa OsmAnd (posodabljanje podatkov točk POI, objavljanje sledi GPX (zahteva ustrezna poverila OSM) in drugo). OSM je javni odprtokodni projekt, katerega kakovost je odvisna tudi od vaše dejavnosti.</string>
@@ -1174,7 +1174,7 @@
 	<string name="driving_region_uk">Velika Britanija, Indija, Avstralija in drugo</string>
 	
 	<string name="about_version">Različica:</string>
-    <string name="about_settings">O programu</string>
+    <string name="shared_string_about">O programu</string>
     <string name="about_settings_descr">Podrobnosti o različici, dovoljenju, članih projekta in drugo</string>
     
     
diff --git a/OsmAnd/res/values-sq/strings.xml b/OsmAnd/res/values-sq/strings.xml
index c3950eaa12..aff36abaa6 100644
--- a/OsmAnd/res/values-sq/strings.xml
+++ b/OsmAnd/res/values-sq/strings.xml
@@ -18,7 +18,7 @@
 	<string name="shared_string_yes">Po</string>
 	
 	<string name="about_version">Versioni :</string>
-    <string name="about_settings">Rreth</string>
+    <string name="shared_string_about">Rreth</string>
     <string name="about_settings_descr">Informacion versioni, liçensat, anëtarët e projektit</string>
     <string name="local_index_tile_data_expire">Skadon (minuta): %1$s</string>
     <string name="local_index_tile_data_downloadable">E shkarkueshme: %1$s</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 57c1e1fd7d..1eb4c88a99 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
     <string name="about_version">Верзија:</string>
-    <string name="about_settings">Oko</string>
+    <string name="shared_string_about">Oko</string>
     <string name="about_settings_descr">Верзија инфо, лиценце, чланови пројекта</string>
     
     <string name="av_photo_play_sound_descr">Изаберите да ли да се чује звук приликом снимања фотографија</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 60c7c27b13..8c62b9f4a0 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -140,7 +140,7 @@
 <string name="local_indexes_cat_map">Standardkartor (vektor)</string>
 
 <string name="index_settings_descr">Ladda ner och hantera offline-kartor lagrade på din enhet</string>
-<string name="online_map_settings">Online-kartor</string>
+<string name="shared_string_online_maps">Online-kartor</string>
 <string name="osmand_accessibility_description">Denna modul gör så att inställningarna för att aktivera speciella tillgänglighetsfunktioner blir direkt åtkomliga i OsmAnd och underlättar t.ex. justering av talhastigheten för TTS-röster, konfigurering av skärmnavigering med hjälp av en styrkula för zoomkontroll eller användande av återkoppling med text-till-tal, t.ex. för att meddela din position automatiskt.</string>
 
 
@@ -1108,7 +1108,7 @@
 	<string name="driving_region_uk">UK, Indien, Australien &amp; andra</string>
 	<string name="local_osm_changes_backup_successful">Ändrad OSM-fil skapad utan problem %1$s</string>
     <string name="about_version">Version:</string>
-    <string name="about_settings">Om</string>
+    <string name="shared_string_about">Om</string>
     <string name="about_settings_descr">Versionsinformation, licenser, projektmedlemmar</string>
     
     
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index ecf78de738..7997906595 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -262,7 +262,7 @@
 	<string name="confirm_interrupt_download">Dosya indirmesini durdurmak istiyor musunuz?</string>
 	<string name="select_index_file_to_download">Hiçbir şey bulunamadı. Eğer bölgenizi bulamıyorsanız, kendiniz yapabilirsiniz (bakınız: http://osmand.net).</string>
 	<string name="local_indexes_cat_map">Çevrimdışı haritalar(vektör)</string>
-	<string name="online_map_settings">Çevrimiçi haritalar</string>
+	<string name="shared_string_online_maps">Çevrimiçi haritalar</string>
 	
 	
 	<string name="default_buttons_support">Destek</string>
@@ -824,7 +824,7 @@
     <string name="local_indexes_cat_srtm">Çevreleme çizgileri verisi</string>
     <string name="announce_gpx_waypoints">GPX yol işaretlerini söyle</string>
     <string name="about_version">Sürüm :</string>
-    <string name="about_settings">Hakkında</string>
+    <string name="shared_string_about">Hakkında</string>
     <string name="about_settings_descr">Sürüm bilgisi, lisanslar, proje üyeleri</string>
     
     <string name="local_index_tile_data_expire">Sona erecek (dakika): %1$s</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 80783619d7..5e83257de5 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -38,7 +38,7 @@
   <string name="map_online_plugin_is_not_installed">Активуйте втулок онлайн мап, щоб мати можливість вибирати різні джерела для мап</string>
   <string name="map_online_data">Онлайн мапи (растрові)</string>
   <string name="map_online_data_descr">Використовувати онлайн мапи (кешуються на SD картці)</string>
-  <string name="online_map_settings">Онлайн мапи</string>
+  <string name="shared_string_online_maps">Онлайн мапи</string>
   <string name="online_map_settings_descr">Налаштування онлнай або кешованих джерел (тайлів) мап</string>
   
   
@@ -1333,7 +1333,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	
 	<string name="map_widget_fps_info">FPS-інфо</string>
 <string name="about_version">Версія:</string>
-    <string name="about_settings">Про</string>
+    <string name="shared_string_about">Про</string>
     <string name="about_settings_descr">Версія, ліцензії, учасники проекту</string>
     
     
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 964e8412fa..de2c445a95 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -414,7 +414,7 @@
     
 	
     <string name="about_version">版本：</string>
-    <string name="about_settings">关于</string>
+    <string name="shared_string_about">关于</string>
     <string name="about_settings_descr">版本信息，许可证，项目成员</string>
     
     
@@ -591,7 +591,7 @@
 	<string name="map_online_plugin_is_not_installed">启用在线地图插件以选择不同的地图来源</string>
 	<string name="map_online_data">在线瓦片地图</string>
 	<string name="map_online_data_descr">使用在线地图(在SD卡上下载并缓存瓦片)</string>
-	<string name="online_map_settings">在线地图</string>
+	<string name="shared_string_online_maps">在线地图</string>
 	<string name="online_map_settings_descr">配置在线或缓存瓦片地图来源</string>
 	
 	
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 0ebac2b264..d289faa480 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -186,7 +186,7 @@
 	<string name="map_online_plugin_is_not_installed">啟用線上地圖外掛元件，來選擇不同的地圖來源</string>
 	<string name="map_online_data">線上地圖圖磚</string>
 	<string name="map_online_data_descr">使用線上地圖(下載暫存地圖圖磚到 SD 卡)</string>
-	<string name="online_map_settings">線上地圖</string>
+	<string name="shared_string_online_maps">線上地圖</string>
 	<string name="online_map_settings_descr">組態線上或暫存的地圖圖磚來源</string>
 	
 	
@@ -1153,7 +1153,7 @@
     <string name="edit_tilesource_name">名稱</string>
     <string name="maps_define_edit">定義/編輯…</string>
 	<string name="about_version">版本：</string>
-    <string name="about_settings">關於</string>
+    <string name="shared_string_about">關於</string>
     <string name="about_settings_descr">版本訊息、授權、專案成員</string>
     
     
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 8282806b50..5a37ca5233 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -263,7 +263,7 @@
 	<string name="route_points">Route points</string>
 	<string name="track_segments">Track segments</string>
 	<string name="track_points">Track points</string>
-	<string name="online_map_settings">Online maps</string>
+	<string name="shared_string_online_maps">Online maps</string>
 	<string name="osmand_rastermaps_plugin_description">With this plugin you can access many types of online (so called tile or raster) maps, from predefined Openstreetmap tiles (like Mapnik) to satellite images and special purpose layers like weather maps, climate maps, geological maps, hillshade layers, etc.
 		\n\nAny of these maps can either be used as the main (base) map to be displayed on the OsmAnd map screen, or as an overlay or underlay to another base map (like OsmAnd\'s standard offline maps). In order to make any underlay map more visible, certain elements of the OsmAnd vector maps can easily be hidden via the \'Configure map\' menu as desired.
 		\n\nTile maps can be obtained directly via online sources, or can be prepared for offline use (and manually copied to OsmAnd\'s data folder) as an sqlite database which can be produced by a variety of 3rd party map preparation tools.
@@ -761,7 +761,7 @@
 	<string name="map_magnifier">Map magnifier</string>
 	<string name="base_world_map">World basemap</string>
     <string name="about_version">Version :</string>
-    <string name="about_settings">About</string>
+    <string name="shared_string_about">About</string>
     <string name="about_settings_descr">Version info, licenses, project members</string>
     <string name="local_index_tile_data_zooms">Zooms downloaded: %1$s</string>
     <string name="local_index_tile_data_expire">Expire (minutes): %1$s</string>
@@ -2038,9 +2038,23 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="help_us_to_improve_menu_group">Help us to improve OsmAnd</string>
     <string name="other_menu_group">Other</string>
     <string name="plugins_menu_group">Plugins</string>
-    <string name="first_usage_menu_item">First usage</string>
-    <string name="first_usage_menu_item_description">How to download map, basic settings</string>
-    <string name="navigation_menu_item_description">Setup navigation</string>
-    <string name="faq_menu_item">FAQ</string>
-    <string name="faq_menu_item_description">How to use plugins</string>
+    <string name="first_usage_item">First usage</string>
+    <string name="first_usage_item_description">How to download map, basic settings</string>
+    <string name="navigation_item_description">Setup navigation</string>
+    <string name="faq_item">FAQ</string>
+    <string name="faq_item_description">How to use plugins</string>
+    <string name="map_viewing_item">Map viewing</string>
+    <string name="search_on_the_map_item">Search on the map</string>
+    <string name="planning_trip_item">Planning trip</string>
+    <string name="contour_lines_and_hillshade_maps_item">Contour lines and hillshade maps</string>
+    <string name="trip_recording_tool_item">Trip recording tool</string>
+    <string name="osmand_ski_maps_item">OsmAnd Ski maps</string>
+    <string name="nautical_charts_item">Nautical charts</string>
+    <string name="audio_video_note_item">Audio/video notes</string>
+    <string name="osm_editing_item">OSM editing</string>
+    <string name="instalation_troubleshooting_item">Installation and troubleshooting</string>
+    <string name="techical_articles_item">Technical articles</string>
+    <string name="versions_item">Versions</string>
+    <string name="poll">poll</string>
+    <string name="contact_us">Contact us</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index 25bb3123e1..890cd2bb00 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -16,7 +16,7 @@ import android.webkit.WebViewClient;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.dialogs.HelpScreenDialogFragment;
+import net.osmand.plus.dialogs.helpscreen.HelpScreenDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 
 import java.io.BufferedReader;
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java
deleted file mode 100644
index 287767db60..0000000000
--- a/OsmAnd/src/net/osmand/plus/dialogs/HelpScreenDialogFragment.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package net.osmand.plus.dialogs;
-
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.app.DialogFragment;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ExpandableListView;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class HelpScreenDialogFragment extends DialogFragment {
-
-	private static final List<MenuCategory> menu = new ArrayList<>();
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		boolean isLightTheme = ((OsmandApplication) getActivity().getApplication())
-				.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
-		int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme;
-		setStyle(STYLE_NO_FRAME, themeId);
-
-
-		final MenuCategory beginWithOsmand = new MenuCategory(R.string.begin_with_osmand_menu_group);
-		MyMenuItem.Builder builder = new MyMenuItem.Builder();
-		builder.setTitle(R.string.first_usage_menu_item)
-				.setDesription(R.string.first_usage_menu_item_description);
-		beginWithOsmand.addItem(builder.create());
-		builder = new MyMenuItem.Builder();
-		builder.setTitle(R.string.shared_string_navigation)
-				.setDesription(R.string.navigation_menu_item_description);
-		beginWithOsmand.addItem(builder.create());
-		builder = new MyMenuItem.Builder();
-		builder.setTitle(R.string.faq_menu_item)
-				.setDesription(R.string.faq_menu_item_description);
-		beginWithOsmand.addItem(builder.create());
-
-		menu.add(beginWithOsmand);
-		menu.add(new MenuCategory(R.string.features_menu_group));
-		menu.add(new MenuCategory(R.string.plugins_menu_group));
-		menu.add(new MenuCategory(R.string.help_us_to_improve_menu_group));
-		menu.add(new MenuCategory(R.string.other_menu_group));
-	}
-
-	@NonNull
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		final View view = inflater.inflate(R.layout.fragment_help_screen, container, false);
-		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
-		final OsmandApplication application = (OsmandApplication) getActivity().getApplication();
-		final MenuAdapter listAdapter = new MenuAdapter(application, menu);
-		listView.setAdapter(listAdapter);
-		for (int i = 0; i < listAdapter.getGroupCount(); i++) {
-			listView.expandGroup(i);
-		}
-		return view;
-	}
-
-	public static class MenuAdapter extends OsmandBaseExpandableListAdapter {
-		private OsmandApplication ctx;
-		private final List<MenuCategory> menu;
-
-		public MenuAdapter(OsmandApplication ctx, List<MenuCategory> menu) {
-			this.ctx = ctx;
-			this.menu = menu;
-		}
-
-		@Override
-		public MyMenuItem getChild(int groupPosition, int childPosition) {
-			return menu.get(groupPosition).getItem(childPosition);
-		}
-
-		@Override
-		public long getChildId(int groupPosition, int childPosition) {
-			return groupPosition * 10000 + childPosition;
-		}
-
-		@Override
-		public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
-								 View convertView, ViewGroup parent) {
-			final MyMenuItem child = getChild(groupPosition, childPosition);
-			MenuItemViewHolder viewHolder;
-			if (convertView == null) {
-				convertView = LayoutInflater.from(parent.getContext()).inflate(
-						R.layout.two_line_with_images_list_item, parent, false);
-				viewHolder = new MenuItemViewHolder(convertView, ctx);
-				convertView.setTag(viewHolder);
-			} else {
-				viewHolder = (MenuItemViewHolder) convertView.getTag();
-			}
-			viewHolder.bindMenuItem(child);
-
-			return convertView;
-		}
-
-
-
-		@Override
-		public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
-			View v = convertView;
-			int titleId = getGroup(groupPosition);
-			if (v == null) {
-				LayoutInflater inflater = LayoutInflater.from(ctx);
-				v = inflater.inflate(R.layout.download_item_list_section, parent, false);
-			}
-			TextView nameView = ((TextView) v.findViewById(R.id.section_name));
-			nameView.setText(titleId);
-			v.setOnClickListener(null);
-			TypedValue typedValue = new TypedValue();
-			// TODO optimize
-			Resources.Theme theme = ctx.getTheme();
-			theme.resolveAttribute(R.attr.ctx_menu_info_view_bg, typedValue, true);
-			v.setBackgroundColor(typedValue.data);
-
-			return v;
-		}
-
-		@Override
-		public int getChildrenCount(int groupPosition) {
-			return menu.get(groupPosition).getChildrenCount();
-		}
-
-		@Override
-		public Integer getGroup(int groupPosition) {
-			return menu.get(groupPosition).getTitle();
-		}
-
-		@Override
-		public int getGroupCount() {
-			return menu.size();
-		}
-
-		@Override
-		public long getGroupId(int groupPosition) {
-			return groupPosition;
-		}
-
-		@Override
-		public boolean hasStableIds() {
-			return false;
-		}
-
-		@Override
-		public boolean isChildSelectable(int groupPosition, int childPosition) {
-			return true;
-		}
-
-	}
-
-	private static class MenuItemViewHolder {
-		private final TextView nameTextView;
-		private final TextView descrTextView;
-		private final ImageView leftImageView;
-		private final OsmandApplication context;
-
-		public MenuItemViewHolder(View view, OsmandApplication context) {
-			this.context = context;
-			leftImageView = (ImageView) view.findViewById(R.id.leftImageView);
-			descrTextView = (TextView) view.findViewById(R.id.description);
-			nameTextView = (TextView) view.findViewById(R.id.name);
-		}
-
-		public void bindMenuItem(MyMenuItem menuItem) {
-			nameTextView.setText(menuItem.title);
-			if (menuItem.desription != -1) {
-				descrTextView.setVisibility(View.VISIBLE);
-				descrTextView.setText(menuItem.desription);
-			} else {
-				descrTextView.setVisibility(View.GONE);
-			}
-			if (menuItem.icon != -1) {
-				leftImageView.setVisibility(View.VISIBLE);
-				leftImageView.setImageDrawable(context.getIconsCache().getContentIcon(menuItem.icon));
-			} else {
-				leftImageView.setVisibility(View.GONE);
-			}
-		}
-	}
-
-	private static class MenuCategory {
-		private final List<MyMenuItem> items = new ArrayList<>();
-		@StringRes
-		private final int title;
-
-		private MenuCategory(@StringRes int title) {
-			this.title = title;
-		}
-
-		public int getTitle() {
-			return title;
-		}
-
-		public int getChildrenCount() {
-			return items.size();
-		}
-
-		public MenuCategory addItem(MyMenuItem item) {
-			items.add(item);
-			return this;
-		}
-
-		public MyMenuItem getItem(int position) {
-			return items.get(position);
-		}
-	}
-
-
-	public static class MyMenuItem {
-		private final int title;
-		private final int desription;
-		@DrawableRes
-		private final int icon;
-		private final boolean isSquare;
-
-//		MyMenuItem(int title) {
-//			this.title = title;
-//			desription = null;
-//			icon = -1;
-//			isSquare = false;
-//		}
-
-		private MyMenuItem(int title, int desription, int icon, boolean isSquare) {
-			this.title = title;
-			this.desription = desription;
-			this.icon = icon;
-			this.isSquare = isSquare;
-		}
-
-		public static class Builder {
-			@StringRes
-			private int title = -1;
-			private int desription = -1;
-			private int icon = -1;
-			private boolean isSquare = false;
-
-			public Builder setTitle(@StringRes int title) {
-				this.title = title;
-				return this;
-			}
-
-			public Builder setDesription(int desription) {
-				this.desription = desription;
-				return this;
-			}
-
-			public Builder setIcon(int icon) {
-				this.icon = icon;
-				return this;
-			}
-
-			public Builder setIsSquare(boolean isSquare) {
-				this.isSquare = isSquare;
-				return this;
-			}
-
-			public HelpScreenDialogFragment.MyMenuItem create() {
-				return new HelpScreenDialogFragment.MyMenuItem(title, desription, icon, isSquare);
-			}
-		}
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/helpscreen/HelpScreenDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/helpscreen/HelpScreenDialogFragment.java
new file mode 100644
index 0000000000..9b9f562278
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dialogs/helpscreen/HelpScreenDialogFragment.java
@@ -0,0 +1,337 @@
+package net.osmand.plus.dialogs.helpscreen;
+
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.support.v4.app.DialogFragment;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ExpandableListView;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.osmand.PlatformUtil;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
+import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
+
+import org.apache.commons.logging.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HelpScreenDialogFragment extends DialogFragment implements ExpandableListView.OnChildClickListener {
+	private static final Log LOG = PlatformUtil.getLog(HelpScreenDialogFragment.class);
+	final static MenuCategory[] categories = MenuCategory.values();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		boolean isLightTheme = (getOsmandApplication())
+				.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
+		int themeId = isLightTheme ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme;
+		setStyle(STYLE_NO_FRAME, themeId);
+	}
+
+	@NonNull
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		final View view = inflater.inflate(R.layout.fragment_help_screen, container, false);
+
+		MenuCategory.BEGIN_WITH_OSMAND.initItems(createBeginWithOsmandItems());
+		MenuCategory.FEATURES.initItems(createFeaturesItems());
+		MenuCategory.PLUGINS.initItems(createPluginsItems());
+		MenuCategory.OTHER.initItems(createOtherItems());
+
+		ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
+		final HelpAdapter listAdapter = new HelpAdapter(getOsmandApplication());
+		listView.setAdapter(listAdapter);
+		for (int i = 0; i < listAdapter.getGroupCount(); i++) {
+			listView.expandGroup(i);
+		}
+		listView.setOnChildClickListener(this);
+		return view;
+	}
+
+	private OsmandApplication getOsmandApplication() {
+		return (OsmandApplication) getActivity().getApplication();
+	}
+
+	@Override
+	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
+								int childPosition, long id) {
+		if (categories[groupPosition] != MenuCategory.HELP_US_TO_IMPROVE &&
+				categories[groupPosition].getItem(childPosition).getOnClickListener() != null) {
+			categories[groupPosition].getItem(childPosition).getOnClickListener().onClick(v);
+		}
+		return false;
+	}
+
+	public static class HelpAdapter extends OsmandBaseExpandableListAdapter {
+		private OsmandApplication ctx;
+
+		public HelpAdapter(OsmandApplication ctx) {
+			this.ctx = ctx;
+		}
+
+		@Override
+		public MyMenuItem getChild(int groupPosition, int childPosition) {
+			if (categories[groupPosition] != MenuCategory.HELP_US_TO_IMPROVE) {
+				return categories[groupPosition].getItem(childPosition);
+			} else {
+				return null;
+			}
+		}
+
+		@Override
+		public long getChildId(int groupPosition, int childPosition) {
+			return groupPosition * 10000 + childPosition;
+		}
+
+		@Override
+		public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
+								 View convertView, ViewGroup parent) {
+			LOG.debug("categories[groupPosition]=" + categories[groupPosition]);
+			if(categories[groupPosition] == MenuCategory.HELP_US_TO_IMPROVE) {
+				convertView = LayoutInflater.from(parent.getContext()).inflate(
+						R.layout.help_to_improve_item, parent, false);
+				TextView pollButton = (TextView) convertView.findViewById(R.id.pollButton);
+				Drawable pollIcon = ctx.getIconsCache().getContentIcon(R.drawable.ic_action_message);
+				pollButton.setCompoundDrawablesWithIntrinsicBounds(null, pollIcon, null, null);
+				TextView contactUsButton = (TextView) convertView.findViewById(R.id.contactUsButton);
+				Drawable contactUsIcon =
+						ctx.getIconsCache().getContentIcon(R.drawable.ic_action_message);
+				contactUsButton.setCompoundDrawablesWithIntrinsicBounds(null, contactUsIcon, null,
+						null);
+				return convertView;
+			} else {
+				final MyMenuItem child = getChild(groupPosition, childPosition);
+				MenuItemViewHolder viewHolder;
+				if (convertView == null || convertView.getTag() == null) {
+					convertView = LayoutInflater.from(parent.getContext()).inflate(
+							R.layout.two_line_with_images_list_item, parent, false);
+					viewHolder = new MenuItemViewHolder(convertView, ctx);
+					convertView.setTag(viewHolder);
+				} else {
+					viewHolder = (MenuItemViewHolder) convertView.getTag();
+				}
+				viewHolder.bindMenuItem(child);
+
+				return convertView;
+			}
+		}
+
+
+		@Override
+		public View getGroupView(int groupPosition, boolean isExpanded, final View convertView, final ViewGroup parent) {
+			View v = convertView;
+			int titleId = getGroup(groupPosition);
+			if (v == null) {
+				LayoutInflater inflater = LayoutInflater.from(ctx);
+				v = inflater.inflate(R.layout.download_item_list_section, parent, false);
+			}
+			TextView nameView = ((TextView) v.findViewById(R.id.section_name));
+			nameView.setText(titleId);
+			v.setOnClickListener(null);
+			TypedValue typedValue = new TypedValue();
+			// TODO optimize
+			Resources.Theme theme = ctx.getTheme();
+			theme.resolveAttribute(R.attr.ctx_menu_info_view_bg, typedValue, true);
+			v.setBackgroundColor(typedValue.data);
+
+			return v;
+		}
+
+		@Override
+		public int getChildrenCount(int groupPosition) {
+			if (categories[groupPosition] != MenuCategory.HELP_US_TO_IMPROVE) {
+				return categories[groupPosition].getChildrenCount();
+			} else {
+				return 1;
+			}
+		}
+
+		@Override
+		public Integer getGroup(int groupPosition) {
+			return categories[groupPosition].getTitle();
+		}
+
+		@Override
+		public int getGroupCount() {
+			return MenuCategory.values().length;
+		}
+
+		@Override
+		public long getGroupId(int groupPosition) {
+			return groupPosition;
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			return false;
+		}
+
+		@Override
+		public boolean isChildSelectable(int groupPosition, int childPosition) {
+			return true;
+		}
+
+	}
+
+	private static class MenuItemViewHolder {
+		private final TextView nameTextView;
+		private final TextView descrTextView;
+		private final ImageView leftImageView;
+		private final OsmandApplication context;
+
+		public MenuItemViewHolder(View view, OsmandApplication context) {
+			this.context = context;
+			leftImageView = (ImageView) view.findViewById(R.id.leftImageView);
+			descrTextView = (TextView) view.findViewById(R.id.description);
+			nameTextView = (TextView) view.findViewById(R.id.name);
+		}
+
+		public void bindMenuItem(MyMenuItem menuItem) {
+			nameTextView.setText(menuItem.getTitle());
+			if (menuItem.getDesription() != null) {
+				descrTextView.setVisibility(View.VISIBLE);
+				descrTextView.setText(menuItem.getDesription());
+			} else {
+				descrTextView.setVisibility(View.GONE);
+			}
+			if (menuItem.getIcon() != -1) {
+				leftImageView.setVisibility(View.VISIBLE);
+				leftImageView.setImageDrawable(context.getIconsCache()
+						.getContentIcon(menuItem.getIcon()));
+			} else {
+				leftImageView.setVisibility(View.GONE);
+			}
+		}
+	}
+
+	private enum MenuCategory {
+		BEGIN_WITH_OSMAND(R.string.begin_with_osmand_menu_group),
+		FEATURES(R.string.features_menu_group),
+		PLUGINS(R.string.plugins_menu_group),
+		HELP_US_TO_IMPROVE(R.string.help_us_to_improve_menu_group),
+		OTHER(R.string.other_menu_group);
+
+		private List<MyMenuItem> items;
+		@StringRes
+		private final int title;
+
+		MenuCategory(int title) {
+			this.title = title;
+		}
+
+		public int getTitle() {
+			return title;
+		}
+
+		public int getChildrenCount() {
+			return items.size();
+		}
+
+		public MyMenuItem getItem(int position) {
+			return items.get(position);
+		}
+
+		public void initItems(List<MyMenuItem> items) {
+			this.items = items;
+		}
+	}
+
+
+	private List<MyMenuItem> createBeginWithOsmandItems(){
+		ArrayList<MyMenuItem> arrayList = new ArrayList<>();
+		MyMenuItem.Builder builder = new MyMenuItem.Builder()
+				.setTitle(R.string.first_usage_item)
+				.setDescription(R.string.first_usage_item_description, getActivity());
+		arrayList.add(builder.create());
+		builder = new MyMenuItem.Builder()
+				.setTitle(R.string.shared_string_navigation)
+				.setDescription(R.string.navigation_item_description, getActivity());
+		arrayList.add(builder.create());
+		builder = new MyMenuItem.Builder()
+				.setTitle(R.string.faq_item)
+				.setDescription(R.string.faq_item_description, getActivity());
+		arrayList.add(builder.create());
+		return arrayList;
+	}
+
+	private static List<MyMenuItem> createFeaturesItems() {
+		ArrayList<MyMenuItem> arrayList = new ArrayList<>();
+		arrayList.add(new MyMenuItem(R.string.map_viewing_item));
+		arrayList.add(new MyMenuItem(R.string.search_on_the_map_item));
+		arrayList.add(new MyMenuItem(R.string.planning_trip_item));
+		return arrayList;
+	}
+
+	private static List<MyMenuItem> createPluginsItems() {
+		ArrayList<MyMenuItem> arrayList = new ArrayList<>();
+		MyMenuItem.Builder builder = new MyMenuItem.Builder()
+				.setTitle(R.string.shared_string_online_maps)
+				.setIcon(R.drawable.ic_world_globe_dark);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.contour_lines_and_hillshade_maps_item)
+				.setIcon(R.drawable.ic_plugin_srtm);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.trip_recording_tool_item)
+				.setIcon(R.drawable.ic_action_polygom_dark);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.osmand_ski_maps_item)
+				.setIcon(R.drawable.ic_plugin_skimaps);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.nautical_charts_item)
+				.setIcon(R.drawable.ic_action_sail_boat_dark);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.audio_video_note_item)
+				.setIcon(R.drawable.ic_action_micro_dark);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.osm_editing_item)
+				.setIcon(R.drawable.ic_action_bug_dark);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.osmand_distance_planning_plugin_name)
+				.setIcon(R.drawable.ic_action_ruler);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.poi_filter_parking)
+				.setIcon(R.drawable.ic_action_parking_dark);
+		arrayList.add(builder.create());
+		builder.reset()
+				.setTitle(R.string.debugging_and_development)
+				.setIcon(R.drawable.ic_plugin_developer);
+		arrayList.add(builder.create());
+		return arrayList;
+	}
+
+	private List<MyMenuItem> createOtherItems() {
+		ArrayList<MyMenuItem> arrayList = new ArrayList<>();
+		arrayList.add(new MyMenuItem(R.string.instalation_troubleshooting_item));
+		arrayList.add(new MyMenuItem(R.string.techical_articles_item));
+		arrayList.add(new MyMenuItem(R.string.versions_item));
+		String version = Version.getBuildAppEdition(getOsmandApplication());
+		if (TextUtils.isEmpty(version)) {
+			version = Version.getAppVersion(getOsmandApplication());
+		}
+		MyMenuItem.Builder builder = new MyMenuItem.Builder()
+				.setTitle(R.string.shared_string_about)
+				.setDescription(version);
+		arrayList.add(builder.create());
+		return arrayList;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/helpscreen/MyMenuItem.java b/OsmAnd/src/net/osmand/plus/dialogs/helpscreen/MyMenuItem.java
new file mode 100644
index 0000000000..01e770934c
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dialogs/helpscreen/MyMenuItem.java
@@ -0,0 +1,104 @@
+package net.osmand.plus.dialogs.helpscreen;
+
+import android.content.Context;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
+import android.view.View.OnClickListener;
+
+public class MyMenuItem {
+	private final int title;
+	private final String desription;
+	@DrawableRes
+	private final int icon;
+	private final OnClickListener onClickListener;
+
+	public MyMenuItem(@StringRes int title) {
+		this.title = title;
+		this.onClickListener = null;
+		desription = null;
+		icon = -1;
+	}
+
+	public MyMenuItem(@StringRes int title, OnClickListener onClickListener) {
+		this.title = title;
+		this.onClickListener = onClickListener;
+		desription = null;
+		icon = -1;
+	}
+
+	private MyMenuItem(@StringRes int title, @StringRes int desription, @DrawableRes int icon,
+					   Context context, OnClickListener onClickListener) {
+		this.title = title;
+		this.onClickListener = onClickListener;
+		this.desription = context.getString(desription);
+		this.icon = icon;
+	}
+
+	private MyMenuItem(@StringRes int title, String desription, @DrawableRes int icon,
+					   OnClickListener onClickListener) {
+		this.title = title;
+		this.desription = desription;
+		this.icon = icon;
+		this.onClickListener = onClickListener;
+	}
+
+	public int getTitle() {
+		return title;
+	}
+
+	public String getDesription() {
+		return desription;
+	}
+
+	public int getIcon() {
+		return icon;
+	}
+
+	public OnClickListener getOnClickListener() {
+		return onClickListener;
+	}
+
+	public static class Builder {
+		@StringRes
+		private int title = -1;
+		private String description = null;
+		private int icon = -1;
+		private OnClickListener listener;
+
+		public Builder setTitle(@StringRes int title) {
+			this.title = title;
+			return this;
+		}
+
+		public Builder setDescription(@StringRes int desriptionId, Context context) {
+			this.description = context.getString(desriptionId);
+			return this;
+		}
+
+		public Builder setDescription(String description) {
+			this.description = description;
+			return this;
+		}
+
+		public Builder setIcon(@DrawableRes int icon) {
+			this.icon = icon;
+			return this;
+		}
+
+		public void setListener(OnClickListener listener) {
+			this.listener = listener;
+		}
+
+		public Builder reset() {
+			title = -1;
+			description = null;
+			icon = -1;
+			listener = null;
+			return this;
+		}
+
+		public MyMenuItem create() {
+			return new MyMenuItem(title, description, icon, listener);
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
index 91290f987c..01943d45f7 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
@@ -75,7 +75,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 	}
 	@Override
 	public String getName() {
-		return app.getString(R.string.online_map_settings);
+		return app.getString(R.string.shared_string_online_maps);
 	}
 	@Override
 	public void registerLayers(MapActivity activity) {
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
index 2e6e4067ae..27a2dce0d5 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
@@ -1,14 +1,6 @@
 package net.osmand.plus.rastermaps;
 
 
-import java.util.Map;
-
-import net.osmand.ResultMatcher;
-import net.osmand.map.TileSourceManager.TileSourceTemplate;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.SettingsBaseActivity;
-import net.osmand.plus.views.SeekBarPreference;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -17,6 +9,15 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 
+import net.osmand.ResultMatcher;
+import net.osmand.map.TileSourceManager.TileSourceTemplate;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.SettingsBaseActivity;
+import net.osmand.plus.views.SeekBarPreference;
+
+import java.util.Map;
+
 public class SettingsRasterMapsActivity extends SettingsBaseActivity {
 
 	private ListPreference tileSourcePreference;
@@ -30,7 +31,7 @@ public class SettingsRasterMapsActivity extends SettingsBaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 		((OsmandApplication) getApplication()).applyTheme(this);
 		super.onCreate(savedInstanceState);
-		getToolbar().setTitle(R.string.online_map_settings);
+		getToolbar().setTitle(R.string.shared_string_online_maps);
 		PreferenceScreen grp = getPreferenceScreen();
 		OnPreferenceChangeListener listener = createPreferenceListener();