Merge commit

OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java

@@ -1008,7 +1008,7 @@ public class OpeningHoursParser {
 		String assembledString = hours.toStringNoMonths();
 		boolean isCorrect = assembledString.equalsIgnoreCase(timeString);
 		System.out.printf("  %sok: Expected: \"%s\" got: \"%s\"\n",
-				(isCorrect ? "NOT " : ""), timeString, assembledString);
+				(!isCorrect ? "NOT " : ""), timeString, assembledString);
 		if (!isCorrect) {
 			throw new IllegalArgumentException("BUG!!!");
 		}

OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java

@@ -90,7 +90,7 @@ public class RouteResultPreparationTest {
 
         List<RouteSegmentResult> routeSegments = fe.searchRoute(ctx, startPoint, endPoint, null);
         Set<Long> reachedSegments = new TreeSet<Long>();
-
+        Assert.assertNotNull(routeSegments);
         int prevSegment = -1;
         for (int i = 0; i <= routeSegments.size(); i++) {
             if (i == routeSegments.size() || routeSegments.get(i).getTurnType() != null) {

OsmAnd-java/test/resources/test_turn_lanes.json

@@ -218,7 +218,57 @@
     }
   },
   {
-    "testName": "11.Figure 8 TL",
+    "testName": "11.Graaf Lodewijkstraat to Graaf Lodewijkstraat u-turn",
+    "startPoint": {
+      "latitude": 52.076116774796496,
+      "longitude": 4.821222126483946
+    },
+    "endPoint": {
+      "latitude": 52.075488682963716,
+      "longitude": 4.821018278598814
+    },
+    "expectedResults": {
+      "7352195": null,
+      "7352546": "+TL,TR"
+    }
+  },
+  {
+    "testName": "12.Rembrandtlaan to Rubensstraat u-turn",
+    "startPoint": {
+      "latitude": 45.698570524678956,
+      "longitude": 35.64198324084282
+    },
+    "endPoint": {
+      "latitude": 45.699327350398576,
+      "longitude": 35.64244994521141
+    },
+    "expectedResults": {
+      "7351364": null,
+      "7351365": "+TL",
+      "7351445": "+TL"
+    }
+  },
+  {
+    "testName": "13.Ira Lee Henderson Memorial Highway (US 75)",
+    "startPoint": {
+      "latitude": 45.691518814511134,
+      "longitude": 35.66402764618397
+    },
+    "endPoint": {
+      "latitude": 45.69157314830206,
+      "longitude": 35.66372522711754
+    },
+    "expectedResults": {
+      "309115848": null,
+      "309115858": "+TU, C",
+      "309115891": null,
+      "309115871": null,
+      "309115849": null,
+      "14418": "TL|+TL|C|C|TR"
+   }
+  },
+  {
+    "testName": "14.Figure 8 TL",
     "startPoint": {
       "latitude": 45.69816447596442,
       "longitude": 35.74885922431952

OsmAnd/build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
 
 android {
 	compileSdkVersion 23
-	buildToolsVersion "23.0.1"
+	buildToolsVersion "23.0.2"
 
 	signingConfigs {
 		development {
@@ -91,58 +91,58 @@ android {
 	productFlavors {
 		// ABI
 		armv7 {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "armeabi-v7a"
 			}
 		}
 		armv5 {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "armeabi"
 			}
 		}
 		x86 {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "x86"
 			}
 		}
 		mips {
-			flavorDimension "abi"
+			dimension "abi"
 			ndk {
 				abiFilter "mips"
 			}
 		}
 		fat {
-			flavorDimension "abi"
+			dimension "abi"
 		}
 
 		// Version
 		freedev {
-			flavorDimension "version"
+			dimension "version"
 			applicationId "net.osmand.dev"
 		}
 		free {
-			flavorDimension "version"
+			dimension "version"
 			applicationId "net.osmand"
 		}
 		full {
-			flavorDimension "version"
+			dimension "version"
 			applicationId "net.osmand.plus"
 		}
 
 		// CoreVersion
 		legacy {
-			flavorDimension "coreversion"
+			dimension "coreversion"
 		}
 
 		qtcore {
-			flavorDimension "coreversion"
+			dimension "coreversion"
 		}
 
 		qtcoredebug {
-			flavorDimension "coreversion"
+			dimension "coreversion"
 		}
 	}
 

OsmAnd/res/layout/alert.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/message"
-        android:focusable="true"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:textSize="@dimen/default_list_text_size"
-        android:gravity="fill_horizontal" />
-
-</LinearLayout>

OsmAnd/res/layout/list_group_title_with_switch.xml

@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:orientation="vertical"
+    android:clickable="false"
-    android:clickable="false">
+    android:orientation="vertical">
 
     <include layout="@layout/card_bottom_divider"/>
 
@@ -26,12 +26,12 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
-        <TextView
+        <net.osmand.plus.widgets.TextViewEx
             android:id="@+id/title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="?android:attr/textColorPrimary"
+            style="@style/TextAppearance.ListItemCategoryTitle"
             tools:text="Live updates"/>
 
         <android.support.v7.widget.SwitchCompat

OsmAnd/res/layout/list_item_icon_and_menu.xml

@@ -43,16 +43,17 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.OsmandListItemTitle"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"
-            android:textSize="@dimen/default_list_text_size"
             tools:text="Some title text"/>
 
         <android.support.v7.widget.AppCompatTextView
             android:id="@+id/description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
             android:textSize="@dimen/default_desc_text_size"
-            tools:text="Some subtitle text"/>
+            tools:text="Some very long subtitle text, that won't fit into one line"/>
 
         <View
             android:layout_width="0dp"
@@ -74,7 +75,7 @@
     <android.support.v7.widget.SwitchCompat
         android:id="@+id/toggle_item"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"

OsmAnd/res/layout/list_item_icon_and_menu_wide.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    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:background="?attr/bg_color"
+    android:minHeight="72dp"
+    tools:layout_height="72dp">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        tools:src="@drawable/ic_action_gabout_dark"/>
+
+    <LinearLayout
+        android:id="@+id/text_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_toEndOf="@+id/icon"
+        android:layout_toLeftOf="@+id/secondary_icon"
+        android:layout_toRightOf="@+id/icon"
+        android:layout_toStartOf="@+id/secondary_icon"
+        android:minHeight="60dp"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.ListItemTitle"
+            tools:text="Some title text"/>
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            android:textSize="@dimen/default_desc_text_size"
+            tools:text="Some very long subtitle text, that won't fit into one line"/>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+    </LinearLayout>
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/secondary_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="16dp"
+        android:layout_toLeftOf="@+id/toggle_item"
+        android:layout_toStartOf="@+id/toggle_item"
+        tools:src="@drawable/ic_action_gabout_dark"/>
+
+    <android.support.v7.widget.SwitchCompat
+        android:id="@+id/toggle_item"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:focusable="false"/>
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="1dp"
+        android:layout_alignLeft="@+id/text_wrapper"
+        android:layout_alignParentBottom="true"
+        android:layout_alignStart="@+id/text_wrapper"
+        android:background="?attr/dashboard_divider"/>
+
+</RelativeLayout>

OsmAnd/res/layout/list_item_progress.xml

@@ -3,10 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="74dp"
+    android:layout_height="wrap_content"
+    android:background="?attr/bg_color"
     android:descendantFocusability="blocksDescendants"
     android:gravity="center_vertical"
-    android:minHeight="@dimen/list_item_height"
+    android:minHeight="72dp"
     android:orientation="vertical"
     android:paddingLeft="16dp">
 

OsmAnd/res/layout/list_item_single_line_descrition_narrow.xml

@@ -35,7 +35,7 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:maxLines="2"
-                android:textSize="@dimen/default_list_text_size"
+                android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
                 tools:text="Overlay map..."/>
 
             <TextView

OsmAnd/res/layout/list_item_single_line_descrition_wide.xml

@@ -35,7 +35,7 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:maxLines="2"
-                android:textSize="@dimen/default_list_text_size"
+                android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
                 tools:text="Overlay map..."/>
 
             <TextView

OsmAnd/res/layout/notification.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="@color/color_black">
-
-    <net.osmand.access.NotificationTextView
-        android:id="@+id/message"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:textSize="@dimen/default_list_text_size"
-        android:gravity="fill_horizontal" />
-
-</LinearLayout>

OsmAnd/res/layout/simple_list_menu_item.xml

@@ -13,7 +13,7 @@
         android:drawablePadding="24dp"
         android:gravity="center_vertical"
         android:paddingLeft="16dp"
-        android:textAppearance="@style/TextAppearance.OsmandListItemTitle"
+        android:textAppearance="@style/TextAppearance.ListItemTitle"
         android:textStyle="normal"
         tools:drawableLeft="@drawable/ic_action_search_dark"
         tools:text="@string/layer_poi"/>

OsmAnd/res/layout/two_line_list_item.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="72dp"
-    android:descendantFocusability="blocksDescendants"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
-
-    <android.support.v7.widget.AppCompatImageView
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="12dp"
-        tools:src="@drawable/ic_world_globe_dark"/>
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/default_list_text_size"
-            tools:text="Germany"/>
-
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="match_parent"
-            android:gravity="center_vertical"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:maxLines="25"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="@dimen/default_sub_text_size"
-            tools:text="Contour Lines"/>
-
-    </LinearLayout>
-</LinearLayout>

OsmAnd/res/menu/refresh_menu.xml

@@ -4,6 +4,6 @@
     <item
         android:id="@+id/action_refresh"
         android:icon="@drawable/ic_action_refresh_dark"
-        android:title="@string/shared_string_refresh"
+        android:title="@string/map_widget_reset"
         app:showAsAction="ifRoom"/>
 </menu>

OsmAnd/res/values-af/strings.xml

@@ -116,8 +116,6 @@
   <string name="back_to_location">Terug na ligging</string>
   <string name="shared_string_help">Help</string>
   
-  <string name="accessibility_extensions_descr">Toeganklikheid uitbreidings vir ou Android-weergawes</string>
-  <string name="accessibility_extensions">Toeganklikheid uitbreidings</string>
   <string name="accessibility_mode">Toeganklikheid gebruikswyse</string>
   <string name="accessibility_mode_descr">Skakel die toeganklikheid funksies aan</string>
   <string name="shared_string_on">Aan</string>
@@ -162,13 +160,9 @@
   <string name="settings_direction_style_descr">Kies die styl om relatiewe rigtings uit te druk tydens beweging</string>
   <string name="auto_announce_on">Begin outo-aankondiging</string>
   <string name="auto_announce_off">Stop outo-aankondiging</string>
-  <string name="scroll_map_by_gestures_descr">Beweeg kaart deur gebare op die raakskerm</string>
-  <string name="scroll_map_by_gestures">Natuurlike kaart beweging</string>
   <string name="i_am_here">Ek is hier</string>
   <string name="zoom_by_trackball_descr">Verander kaart vergroting deur horisontale trekbal bewegings</string>
   <string name="zoom_by_trackball">Gebruik trekbal vir vergrotingsbeheer</string>
-  <string name="use_short_object_names_descr">Gebruik kort voorwerp name in aanraking ondersoek gebruikswyse</string>
-  <string name="use_short_object_names">Gebruik voorwerp name</string>
   <string name="accessibility_preferences_descr">Toeganklikheid voorkeure</string>
   <string name="shared_string_accessibility">Toeganklikheid</string>
   <string name="rendering_out_of_memory">Nie genoeg proses geheue om geselekteerde area te vertoon nie</string>

OsmAnd/res/values-ar/strings.xml

@@ -167,8 +167,6 @@
 	<string name="back_to_location">عودة إلى الموقع</string>
 	<string name="shared_string_help">مساعدة</string>
 	
-	<string name="accessibility_extensions_descr">ملحقات الوصول لإصدارات أندرويد القديمة</string>
-	<string name="accessibility_extensions">ملحقات لإتاحة الوصول</string>
 	<string name="accessibility_mode">وضع إتاحة الوصول</string>
 	<string name="accessibility_mode_descr">تفعيل مميزات إتاحة الوصول</string>
 	<string name="shared_string_on">تفعيل</string>
@@ -567,7 +565,6 @@
 	<string name="back_right">الأيمن الخلفي</string>
 	<string name="accuracy">الدقة</string>
 	<string name="altitude">الارتفاع</string>
-	<string name="use_short_object_names">استخدام أسماء الكائنات</string>
 	<string name="accessibility_preferences_descr">التفضيلات المتعلقة بالإتاحة</string>
 	<string name="shared_string_accessibility">الإتاحة</string>
 	<string name="rendering_out_of_memory">ذاكرة التشغيل غير كافية لعرض المنطقة المختارة</string>
@@ -603,8 +600,6 @@
 	<string name="direction_style_clockwise">جانبان (12 قطاع)</string>
 	<string name="settings_direction_style">نمط التّوجه</string>
 	<string name="settings_direction_style_descr">اختر نمط التّعبير عن الاتّجاهات النّسبية أثناء الحركة</string>
-	<string name="scroll_map_by_gestures_descr">تمرير الخريطة بالإيماء على شاشة اللمس</string>
-	<string name="scroll_map_by_gestures">تمرير الخريطة الطبيعي</string>
 	<string name="i_am_here">أنا هنا</string>
 	<string name="index_name_voice">الحزم الصوتية (مسجلة، ميزات محدودة)</string>
 	<string name="index_name_tts_voice">الحزم الصوتية (صوت آلي، مفضلة)</string>
@@ -632,7 +627,6 @@
 	<string name="auto_announce_on">تفعيل الإخطار التلقائي</string>
 	<string name="route_is_too_long">من المحتمل أن الطريق طويلة جدا قد لايتمكن جهاز توجيه OsmAnd من حساب المسافة إلا بعد وضع نقطة وصل واحدة أو أكثر ↵ → متوسط طول المسافة المحتسب هو 200 كيلو متر تقريبًا. لذلك يرجى إضافة نقطة وصل أو أكثر على طول الطريق حتى يتمكن الجهاز من حساب طول مسافة الطريق.</string>
 	<string name="audionotes_location_not_defined">لم يعين المكان المرتبط بالملاحظة. استخدم \"استخدم المكان …\" لتعيين ملاحظة لمكان محدد</string>
-    <string name="use_short_object_names_descr">استخدم أسماء عناصر صغيرة في نمط التّصفح اللمسي</string>
 	<string name="animate_routing_route_not_calculated">رجاء، احتسب المسار أولا</string>
     <string name="animate_routing_route">حاكي باستخدام المسار المحتسب </string>
     <string name="animate_routing_gpx">حاكي باستخدام مسار GPX</string>

OsmAnd/res/values-be-rBY/strings.xml

@@ -884,8 +884,6 @@
 	<string name="back_to_location">Viarnucca da pazіcyі</string>
 	<string name="shared_string_help">Dapamoha</string>
 	
-	<string name="accessibility_extensions_descr">Pašyreńnі dastupnaścі dlia starych versіj Android</string>
-	<string name="accessibility_extensions">Pašyreńnі dastupnaścі</string>
 	<string name="accessibility_mode">Režym dastupnaścі</string>
 	<string name="accessibility_mode_descr">Ukliučyć ulaścіvaścі dastupnaścі</string>
 	<string name="shared_string_on">Ukl</string>
@@ -930,13 +928,9 @@
 	<string name="settings_direction_style_descr">Abiarycie styĺ jak pakazvać adnosnyja napramkі padčas ruchu</string>
 	<string name="auto_announce_on">Pačać aŭtamatyčnyja anonsy</string>
 	<string name="auto_announce_off">Spynіć aŭtamatyčnyja anonsy</string>
-	<string name="scroll_map_by_gestures_descr">Pasoŭvać mapu ruchamі na tačskrynie</string>
-	<string name="scroll_map_by_gestures">Naturaĺnaje pasoŭvańnie mapy</string>
 	<string name="i_am_here">Ja tut</string>
 	<string name="zoom_by_trackball_descr">Źmianiać maštab haryzantaĺnymі ruchamі trekbolu</string>
 	<string name="zoom_by_trackball">Karystacca trekbolam dlia źmieny maštabu</string>
-	<string name="use_short_object_names_descr">Užyvać karotkіja nazvy abektaŭ u režymie ahliadu</string>
-	<string name="use_short_object_names">Užyvać nazvy abektaŭ</string>
 	<string name="accessibility_preferences_descr">Nalady dastupnaścі</string>
 	<string name="shared_string_accessibility">Dastupnaść</string>
     <string name="arrival_distance_factor_early">Raniej</string>

OsmAnd/res/values-be/strings.xml

@@ -439,8 +439,6 @@
 	<string name="info_button">Інфармацыя</string>
 	<string name="back_to_location">Вярнуцца да становішча</string>
 	
-	<string name="accessibility_extensions_descr">Пашырэньні даступнасьці для старых вэрсій Android</string>
-	<string name="accessibility_extensions">Пашырэньні даступнасьці</string>
 	<string name="accessibility_mode">Рэжым даступнасьці</string>
 	<string name="accessibility_mode_descr">Уключыць уласьцівасьці даступнасьці</string>
 	<string name="accessibility_default">Паводле глябальных наладаў сыстэмы</string>
@@ -483,13 +481,9 @@
 	<string name="settings_direction_style_descr">Абярыце стыль як паказваць адносныя напрамкі падчас руху</string>
 	<string name="auto_announce_on">Уключыць аўтаматычнае агалошваньне</string>
 	<string name="auto_announce_off">Выключыць аўтаматычнае агалошваньне</string>
-	<string name="scroll_map_by_gestures_descr">Пасоўваць мапу рухамі на тачскрыне</string>
-	<string name="scroll_map_by_gestures">Натуральнае пасоўваньне мапы</string>
 	<string name="i_am_here">Я тут</string>
 	<string name="zoom_by_trackball_descr">Зьмяняць маштаб гарызантальнымі рухамі трэкболу</string>
 	<string name="zoom_by_trackball">Карыстацца трэкболам для зьмены маштабу</string>
-	<string name="use_short_object_names_descr">Ужываць кароткія назвы аб\'ектаў у рэжыме агляду</string>
-	<string name="use_short_object_names">Ужываць назвы аб\'ектаў</string>
 	<string name="accessibility_preferences_descr">Налады даступнасьці</string>
 	<string name="shared_string_accessibility">Даступнасьць</string>
 	<string name="rendering_out_of_memory">Недастаткова памяці каб паказаць абраную прастору</string>
@@ -1417,14 +1411,14 @@
 \n - Калі вам трэба стварыць групу з іншымі ўмовамі, калі ласка, зьвяртайцеся на http://osmo.mobi"</string>
     <string name="osmo_auth_error_short">Не атрымалася выканаць аўтарызацыю</string>
     <string name="osmo_auth_error">Адбылася памылка аўтарызацыі OsMo: %1$s.\nГэта можа быць выклікана часовай непрацаздольнасьцю службы ці сканьчэньнем вашай рэгістрацыі.\nХочаце зарэгістравацца ізноў?</string>
-    <string name="rendering_attr_hideBuildings_name">Схаваць будынкі</string>
+    <string name="rendering_attr_hideBuildings_name">Будынкі</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Схаваць не аўтамабільныя дарогі</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Не аўтамабільныя дарогі</string>
-    <string name="rendering_attr_hideText_name">Схаваць тэкст</string>
+    <string name="rendering_attr_hideText_name">Тэкст</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Схаваць лясы і хмызьнякі</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Лясы і хмызьнякі</string>
     <string name="rendering_attr_buildings15zoom_name">Будынкі на маштабе 15</string>
     <string name="rendering_attr_moreDetailed_name">Больш падрабязна</string>
     <string name="rendering_attr_lessDetailed_name">Менш падрабязна</string>
-    <string name="rendering_attr_hideAccess_name">Схаваць абмежаваньні доступу</string>
+    <string name="rendering_attr_hideAccess_name">Абмежаваньні доступу</string>
     <string name="rendering_attr_showAccess_name">Паказаць абмежаваньні доступу</string>
     <string name="rendering_attr_showSurfaceGrade_name">Адлюстроўваць якасьць дарог</string>
     <string name="rendering_attr_showSurfaces_name">Адлюстроўваць тып пакрыцьця</string>
@@ -1779,7 +1773,7 @@
     <string name="storage_directory">Захоўваньне мапы</string>
     <string name="storage_directory_multiuser">Агульнае сховішча</string>
     <string name="application_dir_change_warning3">Вы хочаце, каб OsmAnd таксама скапіяваў свае файлы дадзеных у новае месца прызначэньня?</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Схаваць нумары дамоў</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Нумары дамоў</string>
     
 	<string name="routing_attr_avoid_borders_description">Пазьбягаць перасячэньня мяжы іншай краіны</string>
 	<string name="routing_attr_height_name">Абмежаваньне па вышыні</string>
@@ -2003,7 +1997,7 @@
     <string name="techical_articles_item">Тэхнічныя артыкулы</string>
     <string name="read_more">Падрабязьней</string>
     <string name="whats_new">Што новага ў</string>
-    <string name="rendering_attr_hideProposed_name">Схаваць плануемыя аб\'екты</string>
+    <string name="rendering_attr_hideProposed_name">Плануемыя аб\'екты</string>
     <string name="lang_mk">македонская</string>
     <string name="lang_nds">ніжненямецкая</string>
     <string name="lang_fy">заходнефрыская</string>
@@ -2098,7 +2092,7 @@
     <string name="shared_string_remove">Выдаліць</string>
     <string name="road_blocked">Дарога заблякаваная</string>
     <string name="switch_start_finish">Памяняць месцамі пункт адпраўленьня і пункт прызначэньня</string>
-    <string name="rendering_attr_hideIcons_name">Схаваць значкі POI</string>
+    <string name="rendering_attr_hideIcons_name">Значкі POI</string>
     <string name="rec_split">Разьбіцьцё на кліпы</string>
     <string name="rec_split_title">Выкарыстоўваць разьбіцьцё на кліпы</string>
     <string name="rec_split_desc">Цыклічны перазапіс кліпаў пры перавышэньні зададзенага аб\'ёму сховішча</string>
@@ -2112,7 +2106,7 @@
     <string name="shared_string_status">Стан</string>
     <string name="shared_string_save_changes">Захаваць зьмены</string>
     <string name="shared_string_email_address">E-mail адрас</string>
-    <string name="rendering_attr_hideUnderground_name">Схаваць падземныя аб\'екты</string>
+    <string name="rendering_attr_hideUnderground_name">Падземныя аб\'екты</string>
     <string name="data_is_not_available">Зьвесткі недаступныя</string>
     <string name="shared_string_read_more">Чытаць далей</string>
     <string name="clear_updates_proposition_message">Вы можаце выдаліць сьцягнутыя абнаўленьні і вярнуцца да першапачатковай рэдакцыі мапы</string>
@@ -2180,4 +2174,12 @@
 <string name="rendering_value_thin_name">Тонкі</string>
     <string name="rendering_value_medium_name">Сярэдні</string>
     <string name="rendering_value_bold_name">Тоўсты</string>
+    <string name="map_mode">Рэжым мапы</string>
+    <string name="number_of_gpx_files_selected_pattern">Абрана %s GPX файлаў</string>
+    <string name="add_points_to_map_markers_q">Хочаце дадаць усе пункты да маркераў мапы?</string>
+    <string name="shared_string_add_to_map_markers">Дадаць да маркераў мапы</string>
+    <string name="no_map_markers_found">Калі ласка, дадайце маркеры праз экран мапы</string>
+    <string name="storage_directory_readonly_desc">Абраны для захоўваньня зьвестак каталёг даступны толькі для чытаньня. Каталёг захоўваньня часова разьмешчаны ва ўнутранай памяці. Калі ласка, абярыце падыходзячы каталёг для захоўваньня зьвестак.</string>
+    <string name="osm_live_email_desc">Неабходна прадаставіць інфармацыю пра ўкладальнікаў</string>
+    <string name="show_map_markers_description">Актывуе функцыю маркераў мапы</string>
     </resources>

OsmAnd/res/values-bg/strings.xml

@@ -417,8 +417,6 @@
     <string name="back_to_location">Назад към позицията</string>
     <string name="shared_string_help">Помощ</string>
 
-    <string name="accessibility_extensions_descr">Достъпност за по-стари версии на Android</string>
-    <string name="accessibility_extensions">Разширения за достъпност</string>
     <string name="accessibility_mode">режим на достъпност</string>
     <string name="accessibility_mode_descr">Включване на функции за достъпност и улесняване</string>
     <string name="shared_string_on">Вкл.</string>
@@ -463,13 +461,9 @@
     <string name="settings_direction_style_descr">Изберете стил за относителните посоки при движение</string>
     <string name="auto_announce_on">Старт на гласовите напътствия</string>
     <string name="auto_announce_off">Край на анонсирането</string>
-    <string name="scroll_map_by_gestures_descr">Преместване на картата с плъзгане по екрана</string>
-    <string name="scroll_map_by_gestures">Движение на картата</string>
     <string name="i_am_here">Аз съм тук</string>
     <string name="zoom_by_trackball_descr">Хоризонталното движение на тракбола за мащабира картата</string>
     <string name="zoom_by_trackball">Тракбола за мащабиране</string>
-    <string name="use_short_object_names_descr">Кратки имена на обекти в режим разглеждане</string>
-    <string name="use_short_object_names">Използване на имена на обекти</string>
     <string name="accessibility_preferences_descr">Настройки за достъпност</string>
     <string name="shared_string_accessibility">Достъпност</string>
     <string name="rendering_out_of_memory">Няма достатъчно памет за избрания район</string>

OsmAnd/res/values-ca/strings.xml

@@ -105,8 +105,6 @@
     <string name="info_button">Informació</string>
     <string name="back_to_location">Torna a la ubicació</string>
     <string name="shared_string_help">Ajuda</string>
-    <string name="accessibility_extensions_descr">Extensions d\'accessibilitat per versions d\'Android antigues</string>
-    <string name="accessibility_extensions">Extensions d\'accessibilitat</string>
     <string name="accessibility_mode">Mode d\'accessibilitat</string>
     <string name="shared_string_on">Activa</string>
     <string name="shared_string_off">Inactiva</string>
@@ -185,11 +183,8 @@
     <string name="osmand_parking_event">Traieu el cotxe de l\'aparcament</string>
     <string name="rendering_attr_appMode_description">Optimitza el mapa per</string>
     <string name="play_commands_of_currently_selected_voice">Reprodueix les instruccions de la veu seleccionada</string>
-    <string name="scroll_map_by_gestures_descr">Desplaçament del mapa per gestos a la pantalla tàctil</string>
-    <string name="scroll_map_by_gestures">Desplaçament natural del mapa</string>
     <string name="zoom_by_trackball_descr">Canvia el zoom del mapa amb moviments horitzontals al ratolí de bola</string>
     <string name="zoom_by_trackball">Utilitza el ratolí de bola per controlar el zoom</string>
-    <string name="use_short_object_names">Utilitza el nom dels objectes</string>
     <string name="local_openstreetmap_were_uploaded">Es van penjar {0} PDI/notes</string>
     <string name="local_openstreetmap_settings">PDIs/Notes d\'OSM desades localment</string>
     <string name="local_openstreetmap_settings_descr">Mostra i gestiona els PDI/notes d\'OSM de la base de dades local</string>
@@ -422,7 +417,6 @@
     <string name="map_widget_view_direction">Direcció de visió</string>
     <string name="shared_string_clear_all">Neteja-ho tot</string>
     <string name="recalculate_route_to_your_location">Mitjà de transport:</string>
-    <string name="use_short_object_names_descr">Utilitza el nom curt dels objectes en el mode d\'exploració tàctil</string>
     <string name="amenity_type_user_defined">Definit per l\'usuari</string>
     <string name="choose_auto_follow_route">Visualització del mapa centrada automàticament</string>
     <string name="auto_follow_route_navigation">Només centra automàticament en la navegació</string>
@@ -636,7 +630,7 @@
     <string name="city_type_village">Vila</string>
     <string name="favorite_delete_multiple">Esteu a punt de suprimir %1$d preferit(s) i %2$d grup(s) de preferits. N\'esteu segurs?</string>
     <string name="basemap_missing">No s\'ha trobat el mapa base del món (el qual cobreix tot el món als nivells de zoom menors). És recomanable que us baixeu el fitxer World_basemap_x.obf per gaudir d\'un entorn complet.</string>
-    <string name="vector_data_missing">No s\'ha trobat les dades de bord («fora de línia») a la targeta SD. És recomanable que les baixeu per utilitzar els mapes fora de línia.</string>
+    <string name="vector_data_missing">No s\'ha trobat les dades descarregades («fora de línia») a la targeta SD. És recomanable que les baixeu per utilitzar mapes sense connexió.</string>
     <string name="tts_missing_language_data">No hi ha dades instal·lades per la llengua seleccionada. Voleu anar al Market per instal·lar-ne?</string>
     <string name="gpx_option_from_start_point">Passa al llarg de la traça sencera</string>
     <string name="switch_to_vector_map_to_see">Hi ha un mapa de vectors fora de línia per aquesta localització.
@@ -686,7 +680,7 @@
     <string name="opening_hours_not_supported">Format d\'horaris d\'obertura no suportat per a l\'edició</string>
     <string name="transport_to_go_after">prioritza distancia</string>
     <string name="hello">Aplicació de navegació OsmAnd</string>
-    <string name="osmand_rastermaps_plugin_description">"Amb aquest connector podeu accedir a diferents tipus de mapa (anomenats mosaic o ràster), des de les tessel·les predefinides d\'OpenStreetMap (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc.\n\nQualsevol d\'aquests mapes es pot utilitzar sigui com principal (base) per veure\'s a la vista del mapa de l\'OsmAnd, o com una superposició o sots-posició d\'un altre mapa base (com els mapes  d\'OsmAnd habituals en desconnexió). Per fer més visible qualsevol mapa en sots-posició, es pot amagar fàcilment determinats elements dels mapes vectorials de l\'OsmAnd via el menú «Configuració del mapa» a voluntat.\n\nEls mapes de tessel·les es poden obtenir directament de proveïdors en línia, o es poden preparar per un ús fora de línia (cal copiar-los manualment al directori de l\'OsmAnd) com una base de dades sqlite construïda per diferents eines de preparació de mapes de tercers. "</string>
+    <string name="osmand_rastermaps_plugin_description">"Amb aquest connector podeu accedir a diferents tipus de mapa (anomenats mosaic o ràster), des de les tessel·les predefinides d\'OpenStreetMap (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc.\n\nQualsevol d\'aquests mapes es pot utilitzar sigui com principal (base) per veure\'s a la vista del mapa de l\'OsmAnd, o com una superposició o sots-posició d\'un altre mapa base (com els mapes  d\'OsmAnd habituals en desconnexió). Per fer més visible qualsevol mapa en sots-posició, es pot amagar fàcilment determinats elements dels mapes vectorials de l\'OsmAnd via el menú «Configuració del mapa» a voluntat.\n\nEls mapes de tessel·les es poden obtenir directament de proveïdors en línia, o es poden preparar per un ús fora de línia (cal copiar-los manualment al directori de l\'OsmAnd) com una base de dades SQLite construïda per diferents eines de preparació de mapes de tercers. "</string>
     <string name="choose_audio_stream_descr">Escolliu el canal per reproduir el guiat per veu (depenent del sistema)</string>
     <string name="renderers">Renderització dels vectors</string>
     
@@ -785,7 +779,7 @@
     <string name="voice_stream_voice_call">Àudio de trucada de veu</string>
     <string name="enable_plugin_monitoring_services">Habilita el connector de monitorització (enregistrament GPX, seguiment en viu) per poder utilitzar els serveis de registre d\'ubicació</string>
     <string name="gps_not_available">Habiliteu el GPS a les preferències</string>
-    <string name="zxing_barcode_scanner_not_found">L\'aplicació ZXing Barcode Scanner no està instal·lada. La voleu cercar al Market?</string>
+    <string name="zxing_barcode_scanner_not_found">L\'aplicació ZXing Barcode Scanner no està instal·lada. La voleu cercar a Google Play?</string>
     <string name="rendering_attr_roadColors_name">Esquema de color de carreteres</string>
     <string name="map_widget_show_destination_arrow">Mostra la direcció de destinació</string>
     <string name="non_optimal_route_calculation">Calcula possibles rutes no òptimes per a llargues distàncies</string>
@@ -1107,7 +1101,7 @@
     <string name="route_preferences">Preferències de ruta</string>
     <string name="route_info">Informació de ruta</string>
     <string name="osmand_srtm_long_description_1000_chars">"Aquest connector proporciona tant corbes de nivell superposades com una capa d\'ombres amb efecte relleu per superposar als mapes de OsmAnd. Corredors, ciclistes, excursionistes i qualsevol interessat en el perfil de relleu del terreny ho agrairan força.\n\nLes dades globals (entre 70 graus nord i 70 graus sud) estan basades en mesures del SRTM (Shuttle Radar Topography Mission) i del ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un instrument de generació d\'imatges a bord de Terra, el satèl·lit insígnia del Sistema d\'Observació de la Terra de la NASA. ASTER és un esforç de col·laboració entre la NASA, el Ministeri d\'Economia i Comerç del Japó (METI) i la fundació Japan Space Systems (J-spacesystems). "</string>
-    <string name="keep_and_add_destination_point">Afegeix com a punt de destinació</string>
+    <string name="keep_and_add_destination_point">Afegeix com a darrer punt de destinació</string>
     <string name="calculate_osmand_route_without_internet">Calcula un segment de ruta a l\'OsmAnd sense Internet</string>
     <string name="gpx_option_calculate_first_last_segment">Calcula una ruta a l\'OsmAnd pels seus segments primer i darrer</string>
     <string name="use_displayed_track_for_navigation">Voleu utilitzar la traça visualitzada per la navegació?</string>
@@ -1233,7 +1227,7 @@
     <string name="osmo_activity">Monitorització d\'OpenStreetMap</string>
     <string name="osmo_enable_tracker">Envia les meves ubicacions</string>
     <string name="osmo_control">Accés ràpid a OsMo</string>
-    <string name="import_file_favourites">Voleu desar els punts com un fitxer GPX o voleu importar-los als preferits?</string>
+    <string name="import_file_favourites">Voleu desar les dades com un fitxer GPX o voleu importar les fites als Preferits?</string>
     <string name="osmo_follow">Segueix</string>
     <string name="osmo_sign_in">Inicia una sessió</string>
     <string name="osmo_create_groups_confirm">Per poder crear grups cal ser un usuari registrat d\'OsMo.</string>
@@ -1311,14 +1305,14 @@
     <string name="osmo_group_information">Cal que ho llegiu abans de crear un grup.</string>
     <string name="osmo_auth_error_short">Ha fallat l\'autorització</string>
     <string name="osmo_auth_error">S\'ha trobat un error d\'autorització OsMo: %1$s.\n Pot ser per una caiguda temporal del servei o bé pel venciment del vostre usuari.\n Voleu crear un nou usuari nou?</string>
-    <string name="rendering_attr_hideBuildings_name">Oculta els edificis</string>
+    <string name="rendering_attr_hideBuildings_name">Edificis</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Oculta les vies sense circulació de vehicles</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Vies sense circulació de vehicles</string>
-    <string name="rendering_attr_hideText_name">Oculta el text</string>
+    <string name="rendering_attr_hideText_name">Text</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Oculta els boscos i erms</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Boscos i erms</string>
     <string name="rendering_attr_buildings15zoom_name">Edificis al detall 15 de zoom</string>
     <string name="rendering_attr_moreDetailed_name">Més detalls</string>
     <string name="rendering_attr_lessDetailed_name">Menys detalls</string>
-    <string name="rendering_attr_hideAccess_name">Oculta les restriccions d\'accés</string>
+    <string name="rendering_attr_hideAccess_name">Restriccions d\'accés</string>
     <string name="rendering_attr_showAccess_name">Mostra les restriccions d\'accés</string>
     <string name="rendering_attr_showSurfaceGrade_name">Mostra la qualitat de la via</string>
     <string name="rendering_attr_showSurfaces_name">Mostra el tipus de superfície de la via</string>
@@ -1601,7 +1595,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="storage_directory_default">Memòria interna</string>
     <string name="storage_directory">Emmagatzematge de mapes</string>
     <string name="shared_string_copy">Copia</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Amaga la numeració de finques</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Numeració de finques</string>
     
     <string name="routing_attr_avoid_borders_description">Evita creuar la frontera a un altre pais</string>
     <string name="routing_attr_height_name">Límit d\'alçada</string>
@@ -1741,7 +1735,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="favorite_category_select">Selecciona categoria</string>
     <string name="default_speed_system_descr">Defineix el sistema de mesura de velocitat</string>
     <string name="default_speed_system">Mesura de velocitat</string>
-    <string name="nm">mm</string>
+    <string name="nm">nmi</string>
     <string name="si_nm">Milles marines</string>
     <string name="si_kmh">Quilòmetres per hora</string>
     <string name="si_mph">Milles per hora</string>
@@ -1813,7 +1807,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="contact_us">Contacteu-nos</string>
     <string name="map_legend">Llegenda del mapa</string>
     <string name="shared_string_update">Actualitza</string>
-    <string name="rendering_attr_hideProposed_name">Amaga proposta d\'objectes</string>
+    <string name="rendering_attr_hideProposed_name">Objectes proposats</string>
 
 <string name="read_more">Llegiu-ne més</string>
     <string name="whats_new">Què hi ha de nou a</string>
@@ -1822,7 +1816,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="lang_mk">Macedònic</string>
     <string name="lang_fy">Frisó</string>
     <string name="lang_als">Albanès (Tosc)</string>
-    <string name="save_poi_without_poi_type_message">Confirmeu desar el PDI sense indicar el tipus?</string>
+    <string name="save_poi_without_poi_type_message">Confirmeu que voleu desar el PDI sense indicar el seu tipus?</string>
     <string name="context_menu_item_delete_waypoint">Voleu suprimir la fita GPX?</string>
     <string name="context_menu_item_edit_waypoint">Edita la fita GPX</string>
     <string name="shared_string_location">Localització</string>
@@ -1883,10 +1877,10 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="update_now">Actualitza ara</string>
  	<string name="route_distance">Distància:</string>
     <string name="route_duration">Durada:</string>
-    <string name="missing_write_external_storage_permission">L\'aplicació no té autorització per utilitzar la memòria SD</string>
+    <string name="missing_write_external_storage_permission">L\'aplicació no tenia autorització per utilitzar la memòria SD</string>
-<string name="no_location_permission">L\'aplicació no té autorització per utilitzar les dades d\'ubicació.</string>
+<string name="no_location_permission">L\'aplicació no tenia autorització per utilitzar les dades d\'ubicació.</string>
-    <string name="no_camera_permission">L\'aplicació no té autorització per utilitzar la càmera.</string>
+    <string name="no_camera_permission">L\'aplicació no tenia autorització per utilitzar la càmera.</string>
-    <string name="no_microphone_permission">L\'aplicació no té autorització per utilitzar el micròfon.</string>
+    <string name="no_microphone_permission">L\'aplicació no tenia autorització per utilitzar el micròfon.</string>
     <string name="impassable_road_desc">Indiqueu les vies que voleu evitar en la navegació</string>
     <string name="shared_string_sound">So</string>
     <string name="live_updates">Actualitzacions al moment</string>
@@ -1909,7 +1903,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="morning">Matí</string>
     <string name="night">Nit</string>
 <string name="switch_start_finish">Intercanvi entre punts origen i destinació</string>
-    <string name="rendering_attr_hideIcons_name">Amaga les icones dels PDI</string>
+    <string name="rendering_attr_hideIcons_name">Icones dels PDI</string>
     <string name="item_removed">Element esborrat</string>
     <string name="n_items_removed">elements suprimits</string>
     <string name="shared_string_undo_all">DESFÉS-HO TOT</string>
@@ -1923,13 +1917,13 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="shared_string_remove">Esborra</string>
     <string name="clear_updates_proposition_message">Podeu esborrar les actualitzacions baixades i tornar a l\'edició original del mapa</string>
     <string name="road_blocked">Via tallada</string>
-    <string name="rendering_attr_hideUnderground_name">Amaga elements soterrats</string>
+    <string name="rendering_attr_hideUnderground_name">Elements soterrats</string>
     <string name="data_is_not_available">No es disposa de dades</string>
     <string name="shared_string_read_more">Llegeix més</string>
     <string name="shared_string_status">Estatus</string>
     <string name="shared_string_save_changes">Desa els canvis</string>
     <string name="shared_string_email_address">Adreça de correu electrònic</string>
-    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Mapes i Navegació - confecciona rutes i situa ubicacions al mapa sense connexió a Internet. Baixeu un mapa d\'un país abans de viatjar-hi per trobar llocs i rutes en una zona que no us sigui familiar. Opcions bàsiques: • Mapes detallats de 200 països • Navegador sense connexió amb guiatge de veu • Cerca d\'adreces en mode desconnexió • Informació sobre ubicacions al mapa: llocs d\'interès, cafeteries, aparcaments, botigues • Podeu afegir ubicacions als vostres preferits • Opcions addicionals de navegació en els modes Cotxe, Bicicleta i Vianant : • Capacitat de mostrar i gravar traces GPX • Descripcions a la Vikipèdia dels PDI • Afegiu fotografies, àudios i vídeos al mapa • Modes de mapa diurn i nocturn  per una conducció més convenient • Informació sobre rutes i parades de transport públic • Rutes ciclistes i camins • Pistes de senderisme per fer turisme a tot el món • Mapes en connexió de nombroses fonts • Informació sobre qualitat del paviment i il·luminació dels carrers • Addició, edició i eliminació de PDI (per usuaris de Openstreetmap.org) • OsMo - monitorització en temps real d\'altres dispositius Aconsegiu un navegador fiable pel vostre país - ja sigui França, Alemanya, Mèxic, Regne Unit, Espanya, Holanda, EE.UU., Rússia, Brasil o qualsevol altre estat. Extensions: • Mapes de contorn i ombrejat del terreny https://goo.gl/7mojP8 Dades de corbes de nivell i visualització de terreny afegits al mapa bàsic OsmAnd . • Mapes d\'esquí https://goo.gl/pX6DxJ La informació sobre pistes d\'esquí, pistes d\'esquí de fons, telecabines i ascensors d\'esquí. • Mapa nàutic https://goo.gl/0hEdxm Estil de mapa especial per veure senyals de navegació nàutica pers fluvials i navegació costera. • Posició de l\'aparcament https://goo.gl/6jxQXF Us ajuda a marcar l\'ubicació del vostre vehícle aparcat i controlar el temps que queda si l\'aparcament té limitació de temps. ¡Manteniu-vos informat! Twitter: https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Lloc: http://osmand.net Si us cal ajut per l\'aplicació OsmAnd, contacteu amb el nostre equip de suport: support@osmand.net. "</string>
+    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Mapes i Navegació - troba localitzacions del mapa i calcula rutes sense connexió a Internet. Baixeu un mapa d\'un país abans de viatjar-hi per trobar llocs i rutes en una zona que no us sigui familiar. Opcions bàsiques: • Mapes detallats de 200 països • Navegador sense connexió amb guiatge de veu • Cerca d\'adreces en mode desconnexió • Informació sobre ubicacions al mapa: llocs d\'interès, cafeteries, aparcaments, botigues • Podeu afegir ubicacions als vostres preferits • Opcions addicionals de navegació en els modes Cotxe, Bicicleta i Vianant : • Capacitat de mostrar i gravar traces GPX • Descripcions a la Vikipèdia dels PDI • Afegiu fotografies, àudios i vídeos al mapa • Modes de mapa diurn i nocturn  per una conducció més convenient • Informació sobre rutes i parades de transport públic • Rutes ciclistes i camins • Pistes de senderisme per fer turisme a tot el món • Mapes en connexió de nombroses fonts • Informació sobre qualitat del paviment i il·luminació dels carrers • Addició, edició i eliminació de PDI (per usuaris de Openstreetmap.org) • OsMo - monitorització en temps real d\'altres dispositius Aconsegiu un navegador fiable pel vostre país - ja sigui França, Alemanya, Mèxic, Regne Unit, Espanya, Holanda, EE.UU., Rússia, Brasil o qualsevol altre estat. Extensions: • Mapes de contorn i ombrejat del terreny https://goo.gl/7mojP8 Dades de corbes de nivell i visualització de terreny afegits al mapa bàsic OsmAnd . • Mapes d\'esquí https://goo.gl/pX6DxJ La informació sobre pistes d\'esquí, pistes d\'esquí de fons, telecabines i ascensors d\'esquí. • Mapa nàutic https://goo.gl/0hEdxm Estil de mapa especial per veure senyals de navegació nàutica pers fluvials i navegació costera. • Posició de l\'aparcament https://goo.gl/6jxQXF Us ajuda a marcar l\'ubicació del vostre vehícle aparcat i controlar el temps que queda si l\'aparcament té limitació de temps. ¡Manteniu-vos informat! Twitter: https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Lloc: http://osmand.net Si us cal ajut per l\'aplicació OsmAnd, contacteu amb el nostre equip de suport: support@osmand.net. "</string>
     <string name="show_polygons">Mostra els polígons</string>
     <string name="underlay_transparency">Transparència de la capa inferior</string>
     <string name="find_parking">Troba un aparcament</string>
@@ -1971,4 +1965,39 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="full_report">Informe complert</string>
     <string name="open_street_map_login_and_pass">Usuari i contrasenya d\'OpenStreetMap</string>
     <string name="osm_live_subscribe_btn">Subscriu</string>
+    <string name="release_2_3">" • OSM en directe. Recolzament a desenvolupadors i col·laboradors de mapes i obtenció de mapes actualitzats cada hora..
+\n\n • Marcadors de mapa. Una nova opció per seleccionar ràpidament llocs al mapa.\n\n • Els mapes OSM tenen més detalls amb la la simbologia específica de les carreteres del país i moltes noves característiques del mapa.\n\n • S\'ha millorat l\'aspecte i la experiència de la preparació de ruta.
+\n\n • Moltes millores al menú contextual de mapa, com la cerca contextual d\'adreces .\n\n i encara més… "</string>
+    <string name="osm_live_subscription">Subscripció a OSM en directe</string>
+    <string name="osm_live_email_desc">Ens cal per proporcionar-vos informació d\'aportacions</string>
+    <string name="osm_live_support_region">Zona de suport</string>
+    <string name="osm_live_thanks">Us agraïm haver-vos subscrit a les actualitzacions en directe!</string>
+    <string name="osm_live_region_desc">Una part del vostre donatiu s\'enviarà als usuaris d\'OSM que enviïn modificacions del mapa a aquesta regió</string>
+    <string name="osm_live_ask_for_purchase">Primer hauríeu de subscriure-os a OSM en directe</string>
+
+    <string name="select_map_marker">Seleccioneu un marcador de mapa</string>
+    <string name="map_markers_other">Altres marcadors</string>
+    <string name="show_transparency_seekbar">Mostreu la transparència de la barra de cerca</string>
+    <string name="upload_osm_note">Puja una nota OSM</string>
+    <string name="map_marker_1st">Primer marcador de mapa</string>
+    <string name="map_marker_2nd">Segon marcador de mapa</string>
+    <string name="add_points_to_map_markers_q">Voleu afegir tots els punts als marcadors de mapa?</string>
+    <string name="shared_string_add_to_map_markers">Afegeix als marcadors de mapa</string>
+    <string name="select_map_markers">Selecciona marcadors de mapa</string>
+    <string name="show_map_markers_description">Activa l\'opció de marcadors de mapa</string>
+    <string name="clear_active_markers_q">Voleu treure tots els marcadors actius?</string>
+    <string name="clear_markers_history_q">Voleu netejar l\'historial de marcadors de mapa?</string>
+    <string name="active_markers">Marcadors actius</string>
+    <string name="map_markers">Marcadors de mapa</string>
+    <string name="map_marker">Marcador de mapa</string>
+    <string name="file_name_containes_illegal_char">El nom de fitxer inclou un caràcter ilegal</string>
+<string name="no_map_markers_found">Afegiu els marcadors de mapa amb el mapa</string>
+    <string name="osm_live_header">"Aquesta subscripció permet actualitzacions horàries de tots els mapes del món. La major part dels ingressos es retornen a la comunitat OSM en retribuir cada contribució a OSM. Cas que aprecieu OsmAnd  i OSM i vulgueu ajudar-los, és una via perfecta per fer-ho."</string>
+    
+    <string name="upload_osm_note_description">Podeu pujar la vostra nota OSM anònimament si utilitzeu el vostre perfil OpenStreetMap.org.</string>
+    <string name="add_time_span">Afegeix un lapse de temps</string>
+    <string name="rec_split">Divisió d\'enregistrament</string>
+    <string name="rec_split_title">Utilitza divisió d\'enregistrament</string>
+    <string name="map_mode">Mode mapa</string>
+    <string name="number_of_gpx_files_selected_pattern">"Seleccionats  %s arxius GPX"</string>
     </resources>

OsmAnd/res/values-cs/strings.xml

@@ -13,8 +13,6 @@
     <string name="info_button">Informace</string>
     <string name="back_to_location">Zpět na zobrazení pozice</string>
     <string name="shared_string_help">Nápověda</string>
-    <string name="accessibility_extensions_descr">Moduly pro Usnadnění pro starší verze Androidu</string>
-    <string name="accessibility_extensions">Moduly pro Usnadnění</string>
     <string name="accessibility_mode">Režim usnadnění</string>
     <string name="accessibility_mode_descr">Aktivuje funkce usnadnění</string>
     <string name="shared_string_on">Zapnuto</string>
@@ -59,13 +57,9 @@
     <string name="settings_direction_style_descr">Vyberte způsob vyjádření relativního směru pohybu</string>
     <string name="auto_announce_on">Spustit automatické ohlašování</string>
     <string name="auto_announce_off">Zastavit automatické ohlašování</string>
-    <string name="scroll_map_by_gestures_descr">Posouvat mapu pohybem prstů po dotykovém displeji</string>
-    <string name="scroll_map_by_gestures">Přirozené posouvání mapy</string>
     <string name="i_am_here">Jsem zde</string>
     <string name="zoom_by_trackball_descr">Měnit zvětšení vodorovnými pohyby trackballu</string>
     <string name="zoom_by_trackball">Ovládat zvětšení pomocí trackballu</string>
-    <string name="use_short_object_names_descr">Použít krátká jména objektů</string>
-    <string name="use_short_object_names">Krátká jména objektů</string>
     <string name="accessibility_preferences_descr">Konfigurace usnadnění pro uživatele s omezením zraku</string>
     <string name="shared_string_accessibility">Usnadnění</string>
     <string name="use_fluorescent_overlays">Fluorescentní barvy</string>

OsmAnd/res/values-cy/strings.xml

@@ -178,8 +178,6 @@ Cyfrannol cof %4$s MB (terfyn Android %5$s MB, Dalvik %6$s MB).</string>
 <string name="info_button">Gwybodaeth</string>
 <string name="back_to_location">Gefn i leoliad</string>
 <string name="shared_string_help">Cymorth</string>
-<string name="accessibility_extensions_descr">Estyniadau Hygyrchedd ar gyfer fersiynau Android hen</string>
-<string name="accessibility_extensions">Estyniadau Hygyrchedd</string>
 <string name="accessibility_mode">Modd Hygyrchedd</string>
 <string name="accessibility_mode_descr">Troi ar y nodweddion hygyrchedd</string>
 <string name="shared_string_on">Ar</string>

OsmAnd/res/values-da/strings.xml

@@ -49,7 +49,7 @@
     <string name="download_regular_maps">Standard kort</string>
     <string name="download_roads_only_maps">Kort kun med veje</string>
 
-    <string name="rendering_attr_noAdminboundaries_name">Skjul grænser</string>
+    <string name="rendering_attr_noAdminboundaries_name">Grænser</string>
 
     <string name="intermediate_points_change_order">Ændre rækkefølge</string>
     <string name="av_video_format">Videoformat</string>
@@ -146,8 +146,8 @@
     <string name="osmand_plus_short_description_80_chars">Global mobilkort for visning &amp; navigation til offline og online OSM kort</string>
 
     <string name="filterpoi_activity">Opret interessepunkt-filter</string>
-    <string name="recalculate_route_to_your_location">Transportform:</string>
+    <string name="recalculate_route_to_your_location">Transporttilstand:</string>
-    <string name="select_navigation_mode">Vælg transportform</string>
+    <string name="select_navigation_mode">Vælg transporttilstand</string>
 	
 	<string name="day_night_info_description">Solopgang: %1$s
 \nSolnedgang: %2$s</string>
@@ -257,7 +257,7 @@
     <string name="osmand_plus_play_title_30_chars">OsmAnd+ kort &amp; navigation</string>
     <string name="show_traffic_warnings">Trafikadvarsler</string>
     <string name="rendering_attr_noPolygons_description">Gør alle overflader på kortet transparent</string>
-    <string name="rendering_attr_noPolygons_name">Skjul polygoner</string>
+    <string name="rendering_attr_noPolygons_name">Polygoner</string>
     <string name="rendering_attr_appMode_name">Optegningsmåde</string>
     <string name="rendering_attr_appMode_description">Optimer kort til</string>
     <string name="rendering_attr_contourLines_description">Vis fra zoom-niveau (kræver højdekurvedata):</string>
@@ -321,8 +321,6 @@
     <string name="show_ruler_level">Vis målestok</string>
     <string name="back_to_location">Tilbage til placering</string>
 
-    <string name="accessibility_extensions_descr">Tilgængelighedsudvidelser for gamle Android versioner</string>
-    <string name="accessibility_extensions">Tilgængelighedsudvidelser</string>
     <string name="accessibility_mode">Tilgængelighedstilstand</string>
     <string name="osmand_parking_pm">PM</string>
     <string name="default_buttons_support">Støt</string>
@@ -370,13 +368,9 @@
     <string name="settings_direction_style_descr">Vælg stil til at udtrykke relative retninger under bevægelse</string>
     <string name="auto_announce_on">Begynd autoannoncering</string>
     <string name="auto_announce_off">Stop autoannoncering</string>
-    <string name="scroll_map_by_gestures_descr">Rul kort med fagter på den berøringsfølsomme skærm</string>
-    <string name="scroll_map_by_gestures">Naturlig kortrulning</string>
     <string name="i_am_here">Jeg er her</string>
     <string name="zoom_by_trackball_descr">Skift kortzoom via vandrette trackball bevægelser</string>
     <string name="zoom_by_trackball">Brug trackball til zoom</string>
-    <string name="use_short_object_names_descr">Brug korte objektnavne i touch udforskning tilstand</string>
-    <string name="use_short_object_names">Objektnavne</string>
     <string name="accessibility_preferences_descr">Tilgængelighedsrelaterede indstillinger</string>
     <string name="shared_string_accessibility">Tilgængelighed</string>
     <string name="rendering_out_of_memory">Ikke nok proceshukommelse til at vise det valgte område</string>
@@ -435,7 +429,7 @@
     <string name="open_street_map_login_descr">Nødvendige for ændringer i openstreetmap.org</string>
     <string name="user_password">OSM-kodeord</string>
     <string name="user_password_descr">Nødvendig for ændringer i openstreetmap.org</string>
-    <string name="osmand_service">Kørsel i baggrunden</string>
+    <string name="osmand_service">Baggrundstilstand</string>
     <string name="osmand_service_descr">OsmAnd kører i baggrunden, mens skærmen er slukket</string>
 
 
@@ -1190,7 +1184,7 @@
     <string name="av_camera_focus_auto">Autofokus</string>
     <string name="av_camera_focus_hiperfocal">Hyperfokalafstand</string>
     <string name="av_camera_focus_infinity">Uendelig fokus</string>
-    <string name="av_camera_focus_macro">Makro (nærbillede) fokusindstilling</string>
+    <string name="av_camera_focus_macro">Makrofokustilstand (nærbillede)</string>
     <string name="av_camera_focus_edof">Udvidet dybdeskarphed (EDOF)</string>
     <string name="av_camera_focus_continuous">Kameraet forsøger løbende at fokusere</string>
     <string name="av_photo_play_sound_descr">Spil lyd når foto tages</string>
@@ -1524,14 +1518,14 @@
     <string name="osmo_group_information_desc">" - Oprettelse af en gruppe angiv et navn og udfyld beskrivelsen\n- Fra programmet kan kun oprettes en gruppe af simpel type, læs mere på hjemmesiden https://osmo.mobi/g/new\n- Via en hjemmeside kan administreres en gruppe, til at placere spor og punkter til rådighed for alle\n- Understøtter ikke brugen af en gruppe for kun én bruger, hvis dette ikke er IP-gruppen\n- Private grupper er begrænset til 8 personer\n- Detaljerede vilkår kan altid ses på hjemmesiden OsMo.mobi\n- Brug for  særlige vilkår - kontakt support: osmo.mobi@gmail.com "</string>
     <string name="osmo_auth_error_short">Autorisation fejlede</string>
     <string name="osmo_auth_error">"OsMo autorisation fejl: %1$s.\nDet kan være at tjenesten midlertidig  er nede eller registreringen er ududløbet. Fortsæt med en ny registrering?"</string>
-    <string name="rendering_attr_hideBuildings_name">Skjul bygninger</string>
+    <string name="rendering_attr_hideBuildings_name">Bygninger</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Skjul gang- og cykelstier</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Gang- og cykelstier</string>
-    <string name="rendering_attr_hideText_name">Skjul tekst</string>
+    <string name="rendering_attr_hideText_name">Tekst</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Skjul skov og beplantning</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Skov og beplantning</string>
     <string name="rendering_attr_buildings15zoom_name">Bygninger på zoomniveau 15</string>
     <string name="rendering_attr_moreDetailed_name">Flere detaljer</string>
     <string name="rendering_attr_lessDetailed_name">Færre detaljer</string>
-    <string name="rendering_attr_hideAccess_name">Skjul adgangsbegrænsninger</string>
+    <string name="rendering_attr_hideAccess_name">Adgangsbegrænsninger</string>
     <string name="rendering_attr_showAccess_name">Vis adgangsbegrænsninger</string>
     <string name="rendering_attr_showSurfaceGrade_name">Vis vejkvaliteten</string>
     <string name="rendering_attr_showSurfaces_name">Vis vejbelægning</string>
@@ -1552,9 +1546,9 @@
     <string name="map_preferred_locale_descr">Foretrukket sprog for etiketter på kortet (hvis sprog ikke findes skiftes til engelsk eller lokale navne)</string>
     <string name="map_preferred_locale">Foretrukket sprog på kort</string>
     <string name="stop_navigation_service">Stop</string>
-    <string name="enable_sleep_mode">Aktiver GPS baggrundstjenesten</string>
+    <string name="enable_sleep_mode">Aktiver GPS baggrundstilstand</string>
     <string name="gps_wake_up_timer">GPS vågn-op interval</string>
-    <string name="sleep_mode_stop_dialog">Stop GPS baggrundstjenesten?</string>
+    <string name="sleep_mode_stop_dialog">Stop GPS baggrundstilstand?</string>
     <string name="keep_navigation_service">Hold</string>
     <string name="lang_al">Albansk</string>
     <string name="lang_ar">Arabisk</string>
@@ -1888,7 +1882,7 @@
     <string name="storage_directory">Kortlagring</string>
     <string name="shared_string_copy">Kopier</string>
     <string name="application_dir_change_warning3">Skal OsmAnd også kopiere datafilerne til den nye placering?</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Skjul husnumre</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Husnumre</string>
     <string name="routing_attr_avoid_borders_description">Undgå at krydse landegrænser</string>
     <string name="routing_attr_height_name">Højdegrænse</string>
     
@@ -2117,7 +2111,7 @@
     
     
     <string name="shared_string_update">Opdatering</string>
-    <string name="rendering_attr_hideProposed_name">Skjul foreslåede objekter</string>
+    <string name="rendering_attr_hideProposed_name">Foreslåede objekter</string>
     <string name="read_more">Læs mere</string>
     <string name="whats_new">Hvad er nyt i</string>
     <!-- string name="map_legend_item_description">Signaturforklaring til OsmAnd standard kortformat, internetforbindelse er nødvendig</string -->
@@ -2225,7 +2219,7 @@
     <string name="item_removed">Emne fjernet</string>
     <string name="n_items_removed">Emner slettet</string>
     <string name="shared_string_undo_all">FORTRYD ALLE</string>
-    <string name="rendering_attr_hideIcons_name">Skjul IP ikoner</string>
+    <string name="rendering_attr_hideIcons_name">IP ikoner</string>
     <string name="switch_start_finish">Byt om på startpunkt og destination</string>
     <string name="number_of_contributors">Antal bidragydere</string>
     <string name="number_of_edits">Antal redigeringer</string>
@@ -2236,12 +2230,12 @@
     <string name="road_blocked">Spærret vej</string>
     <string name="shared_string_remove">Fjern</string>
     <string name="data_is_not_available">Data er ikke tilgængelig</string>
-    <string name="rendering_attr_hideUnderground_name">Skjul underjordiske objekter</string>
+    <string name="rendering_attr_hideUnderground_name">Underjordiske objekter</string>
     <string name="shared_string_read_more">Læs mere</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation - find steder på kortet og beregn ruter uden en internetforbindelse. Hent kort for et land, før rejsen og find steder og ruter i et ukendt område.
 \n\nGrundlæggende indstillinger:
 \n• Detaljerede kort for 200 lande
-\n• Offline navigation med stemmevejledning\n• Adressesøgning i offline mode
+\n• Offline navigation med stemmevejledning\n• Adressesøgning i offline tilstand
 \n• Info om steder på kortet: steder af interesse, caféer, parkeringspladser, butikker
 \n• Tilføj steder til foretrukne
 \n• Kørsel-, cykel- og fodgængernavigation
@@ -2339,4 +2333,6 @@
     <string name="rendering_value_thin_name">Tynd</string>
     <string name="rendering_value_medium_name">Mellem</string>
     <string name="rendering_value_bold_name">Fed</string>
+    <string name="number_of_gpx_files_selected_pattern">%s GPX filer valgt</string>
+    <string name="map_mode">Korttilstand</string>
     </resources>

OsmAnd/res/values-de/strings.xml

@@ -216,8 +216,6 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="back_to_location">Zurück zum Standort</string>
 	<string name="shared_string_help">Hilfe</string>
 	
-	<string name="accessibility_extensions_descr">Barrierefreiheit-Erweiterungen für alte Android-Versionen</string>
-	<string name="accessibility_extensions">Barrierefreiheit-Erweiterungen</string>
 	<string name="accessibility_mode">Barrierefreiheit-Modus</string>
 	<string name="accessibility_mode_descr">Schaltet die Eingabehilfen-Funktionen ein</string>
 	<string name="shared_string_on">An</string>
@@ -262,13 +260,9 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="settings_direction_style_descr">Wähle eine Art um relative Richtungen während der Bewegung auszudrücken</string>
 	<string name="auto_announce_on">Automatische Ankündigungen ein</string>
 	<string name="auto_announce_off">Automatische Ankündigungen aus</string>
-	<string name="scroll_map_by_gestures_descr">Scrolle die Karte mit Gesten auf dem Touchscreen</string>
-	<string name="scroll_map_by_gestures">Natürliches Scrollen der Karte</string>
 	<string name="i_am_here">Ich bin hier</string>
 	<string name="zoom_by_trackball_descr">Horizontale Trackball-Bewegung zoomt Karte</string>
 	<string name="zoom_by_trackball">Benutze den Trackball zum Zoomen</string>
-	<string name="use_short_object_names_descr">Benutze kurze Objektnamen im Touch-Entdeckungsmodus</string>
-	<string name="use_short_object_names">Benutze Objektnamen</string>
 	<string name="accessibility_preferences_descr">Einstellungen zur Barrierefreiheit</string>
 	<string name="shared_string_accessibility">Bedienungshilfen</string>
 	<string name="rendering_out_of_memory">Zu wenig Prozess-Speicher zum Anzeigen des gewählten Gebietes</string>
@@ -476,7 +470,7 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="map_underlay">Underlay-Karte</string>
 	<string name="map_underlay_descr">Wähle Underlay-Karte</string>
 	<string name="layer_overlay">Overlay-Karte…</string>
-	<string name="shared_string_none">Keine</string>
+	<string name="shared_string_none">Keine(r/s)</string>
 	<string name="map_overlay">Overlay-Karte</string>
 	<string name="map_overlay_descr">Wähle Overlay-Karte</string>
 	<string name="tile_source_already_installed">Karte schon installiert, Einstellungen werden aktualisiert</string>
@@ -1324,14 +1318,14 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="none_selected_gpx">Keine GPX-Spur ausgewählt. Zum Auswählen auf eine Spur lange drücken.</string>
 	
 	<string name="local_index_select_gpx_file">Zum Anzeigen auswählen</string>
-	<string name="rendering_attr_hideBuildings_name">Gebäude ausblenden</string>
+	<string name="rendering_attr_hideBuildings_name">Gebäude</string>
-	<string name="rendering_attr_hideNonVehicleHighways_name">Fußwege ausblenden</string>
+	<string name="rendering_attr_hideNonVehicleHighways_name">Fußwege</string>
-	<string name="rendering_attr_hideText_name">Text ausblenden</string>
+	<string name="rendering_attr_hideText_name">Text</string>
-	<string name="rendering_attr_hideWoodScrubs_name">Wälder und Gebüsch ausblenden</string>
+	<string name="rendering_attr_hideWoodScrubs_name">Wälder und Gebüsch</string>
 	<string name="rendering_attr_buildings15zoom_name">Gebäude ab Zoomstufe 15 anzeigen</string>
 	<string name="rendering_attr_moreDetailed_name">Mehr Details</string>
 	<string name="rendering_attr_lessDetailed_name">Weniger Details in Karte</string>
-	<string name="rendering_attr_hideAccess_name">Zugangsbeschränkungen verbergen</string>
+	<string name="rendering_attr_hideAccess_name">Zugangsbeschränkungen</string>
 	<string name="rendering_attr_showAccess_name">Zugangsbeschränkungen anzeigen</string>
 	<string name="rendering_attr_showSurfaceGrade_name">Straßenqualität anzeigen</string>
 	<string name="rendering_attr_showSurfaces_name">Straßenoberfläche anzeigen</string>
@@ -1681,7 +1675,7 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="shared_string_selected_lowercase">ausgewählt</string>
 	<string name="shared_string_open">Offen</string>
 
-	<string name="rendering_attr_hideHouseNumbers_name">Hausnummern verbergen</string>
+	<string name="rendering_attr_hideHouseNumbers_name">Hausnummern</string>
 	<string name="application_dir_change_warning3">Soll OsmAnd auch die Datendateien an den neuen Ort kopieren?</string>
 	<string name="specified_directiory_not_writeable">Karten konnten im angegebenen Verzeichnis nicht erstellt werden</string>
 	<string name="copying_osmand_file_failed">Das Kopieren der Dateien ist fehlgeschlagen!</string>
@@ -1872,7 +1866,7 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 	<string name="unsaved_changes_will_be_lost">Alle ungesicherten Änderungen gehen verloren. Fortfahren?</string>
 	<string name="roads">Straßen</string>
     <string name="show_free_version_banner_description">Auch bei der bezahlten Version ist das Banner der kostenlosen Version sichtbar</string>
-<string name="rendering_attr_hideProposed_name">Vorgeschlagene Objekte ausblenden</string>
+<string name="rendering_attr_hideProposed_name">Vorgeschlagene Objekte</string>
     <string name="shared_string_update">Aktualisieren</string>
 
     <string name="shared_string_upload">Hochladen</string>
@@ -2047,7 +2041,7 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
 <string name="shared_string_type">Typ</string>
     <string name="starting_point">Startpunkt</string>
     <string name="shared_string_undo_all">Alles rückgängig machen</string>
-    <string name="rendering_attr_hideIcons_name">POI Symbole ausblenden</string>
+    <string name="rendering_attr_hideIcons_name">POI Symbole</string>
     <string name="switch_start_finish">Start und Ziel tauschen</string>
 <string name="number_of_edits">Anzahl der Bearbeitungen</string>
     <string name="number_of_contributors">Anzahl der Mitwirkenden</string>
@@ -2057,7 +2051,7 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
     <string name="shared_string_select">Auswählen</string>
     <string name="clear_updates_proposition_message">Kartenaktualisierungen können gelöscht werden, um zur Originalkarte zurückzukehren</string>
     <string name="data_is_not_available">Daten nicht verfügbar</string>
-    <string name="rendering_attr_hideUnderground_name">Unterirdische Objekte ausblenden</string>
+    <string name="rendering_attr_hideUnderground_name">Unterirdische Objekte</string>
     <string name="shared_string_read_more">Mehr lesen</string>
     <string name="shared_string_status">Status</string>
     <string name="shared_string_save_changes">Änderungen speichern</string>
@@ -2133,4 +2127,6 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
     <string name="rendering_value_thin_name">Dünn</string>
     <string name="rendering_value_medium_name">Mittel</string>
     <string name="rendering_value_bold_name">Fett</string>
+    <string name="map_mode">Kartenmodus</string>
+    <string name="number_of_gpx_files_selected_pattern">%s GPX Dateien ausgewählt</string>
     </resources>

OsmAnd/res/values-el/strings.xml

@@ -202,8 +202,6 @@
 	<string name="info_button">Πληροφορίες</string>
 	<string name="back_to_location">Επιστροφή στη θέση</string>
 	
-	<string name="accessibility_extensions_descr">Επεκτάσεις προσβασιμότητας για παλιές εκδόσεις Android</string>
-	<string name="accessibility_extensions">Επεκτάσεις προσβασιμότητας</string>
 	<string name="accessibility_mode">Λειτουργία προσβασιμότητας</string>
 	<string name="accessibility_mode_descr">Ενεργοποιεί τις δυνατότητες προσβασιμότητας</string>
 	<string name="shared_string_on">Ενεργό</string>
@@ -248,13 +246,9 @@
 	<string name="settings_direction_style_descr">Επιλέξτε στυλ έκφρασης των σχετικών κατευθύνσεων κατά τη κίνηση</string>
 	<string name="auto_announce_on">Έναρξη αυτόματης εκφώνησης</string>
 	<string name="auto_announce_off">Διακοπή αυτόματης εκφώνησης</string>
-	<string name="scroll_map_by_gestures_descr">Μετακίνηση του χάρτη με χειρονομίες στην οθόνη αφής</string>
-	<string name="scroll_map_by_gestures">Φυσική κύλιση χάρτη</string>
 	<string name="i_am_here">Είμαι εδώ</string>
 	<string name="zoom_by_trackball_descr">Αλλαγή κλίμακας του χάρτη με οριζόντιες κινήσεις του trackball</string>
 	<string name="zoom_by_trackball">Χρήση του trackball για έλεγχο τις κλίμακας</string>
-	<string name="use_short_object_names_descr">Χρήση μικρών ονομάτων αντικειμένων στη λειτουργία αφής εξερεύνησης</string>
-	<string name="use_short_object_names">Χρήση ονομάτων αντικειμένων</string>
 	<string name="accessibility_preferences_descr">Προτιμήσεις σχετικές με προσβασιμότητα</string>
 	<string name="shared_string_accessibility">Προσβασιμότητα</string>
 	<string name="rendering_out_of_memory">Δεν υπάρχει αρκετή μνήμη για να εμφανιστεί η επιλεγμένη περιοχή</string>

OsmAnd/res/values-es-rAR/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
 
-    <string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
     <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
     <string name="storage_directory_external">Almacenamiento externo</string>
     <string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
@@ -164,8 +164,8 @@
     <string name="rendering_value_highContrastRoads_name">Caminos en alto contraste</string>
     <string name="traffic_warning_railways">Cruce de ferrocarril</string>
     <string name="traffic_warning_pedestrian">Cruce peatonal</string>
-    <string name="show_railway_warnings">Mostrar cruces de ferrocarril</string>
+    <string name="show_railway_warnings">Cruces de ferrocarril</string>
-    <string name="show_pedestrian_warnings">Mostrar cruces peatonales</string>
+    <string name="show_pedestrian_warnings">Cruces peatonales</string>
     <string name="rendering_value_americanRoadAtlas_name">Atlas de caminos americanos</string>
     <string name="routing_attr_no_new_routing_name">Sin reglas de navegación v1.9</string>
     <string name="routing_attr_no_new_routing_description">No usar reglas de navegación introducidas en v.1.9</string>
@@ -248,16 +248,16 @@
     <string name="local_map_names">Nombres locales</string>
     <string name="lang_he">Hebreo</string>
     <string name="gpx_start_new_segment">Iniciar nuevo segmento</string>
-    <string name="rendering_attr_hideBuildings_name">Ocultar edificios</string>
+    <string name="rendering_attr_hideBuildings_name">Edificios</string>
-    <string name="rendering_attr_hideText_name">Ocultar textos</string>
+    <string name="rendering_attr_hideText_name">Textos</string>
     <string name="rendering_attr_buildings15zoom_name">Edificios en ampliación 15</string>
     <string name="rendering_attr_moreDetailed_name">Más detalles</string>
     <string name="rendering_attr_lessDetailed_name">Menos detalles</string>
-    <string name="rendering_attr_hideAccess_name">Ocultar restricciones de acceso</string>
+    <string name="rendering_attr_hideAccess_name">Restricciones de acceso</string>
-    <string name="rendering_attr_showAccess_name">Mostrar restricciones de acceso</string>
+    <string name="rendering_attr_showAccess_name">Restricciones de acceso</string>
-    <string name="rendering_attr_showSurfaceGrade_name">Mostrar calidad de los caminos</string>
+    <string name="rendering_attr_showSurfaceGrade_name">Calidad de los caminos</string>
-    <string name="rendering_attr_showSurfaces_name">Mostrar superficie de los caminos</string>
+    <string name="rendering_attr_showSurfaces_name">Superficie de los caminos</string>
-    <string name="rendering_attr_showCycleRoutes_name">Mostrar rutas ciclistas</string>
+    <string name="rendering_attr_showCycleRoutes_name">Rutas ciclistas</string>
     <string name="osmo_auth_error_short">Falló la autorización</string>
     <string name="osmo_group_by_invite">Entrar por invitación</string>
     <string name="osmo_auto_connect">Autoconectar</string>
@@ -527,8 +527,8 @@
     <string name="live_monitoring_stop">Parar rastreo en línea</string>
     <string name="gpx_monitoring_start">Iniciar grabación GPX</string>
     <string name="gpx_monitoring_stop">Parar grabación GPX</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Ocultar vías no aptas para vehículos</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Vías no aptas para vehículos</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Ocultar bosques y matorrales</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Bosques y matorrales</string>
     <string name="osmo_auth_error">Error de autorización OsMo: %1$s.\n Puede deberse a que el servicio esté temporalmente caído o que tu registro expiró.\n ¿Quieres realizar un nuevo registro?</string>
     <string name="osmo_group_information_desc">" - Al crear un grupo, debes darle un nombre y completar la descripción.\n - Desde la aplicación, los grupo sólo se crean con el tipo Simple, lee más en el sitio web https://osmo.mobi/g/new\n - Puedes gestionar un grupo desde un sitio web, para ubicar todas las trazas y puntos disponibles\n - No avalamos el uso de grupos con sólo un usuario, si esto no es el grupo de PDI\n - Los grupos privados se limitan sólo a 8 personas\n - Los detalles sobre términos y condiciones, se encuentran en el sitio web OsMo.mobi\n - Si necesitas condiciones especiales, contacta con el soporte: osmo.mobi@gmail.com "</string>
     <string name="osmo_group_information">¡Lee antes de crear un grupo!</string>
@@ -772,7 +772,7 @@
     <string name="rendering_attr_alpineHiking_description">Dibujar senderos según la escala SAC</string>
     <string name="rendering_attr_hikingRoutesOSMC_name">Superponer símbolo de senderismo</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">Dibujar senderos según trazas OSMC</string>
-    <string name="rendering_attr_noAdminboundaries_name">Ocultar fronteras</string>
+    <string name="rendering_attr_noAdminboundaries_name">Fronteras</string>
     <string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5-9)</string>
     <string name="map_widget_max_speed">Límite de velocidad</string>
     <string name="monitoring_control_start">GPX</string>
@@ -964,7 +964,7 @@
     <string name="map_widget_day_night">Mapa día/noche</string>
     <string name="map_widget_renderer">Estilo del mapa</string>
     <string name="layer_map_appearance">Configurar pantalla</string>
-    <string name="show_lanes">Mostrar carriles</string>
+    <string name="show_lanes">Carriles</string>
     <string name="avoid_unpaved">Evitar caminos sin pavimentar</string>
     <string name="avoid_ferries">Evitar ferris/transbordadores</string>
     <string name="avoid_in_routing_title">Evitar…</string>
@@ -998,8 +998,8 @@
     <string name="bg_service_screen_unlock">Desbloquear pantalla</string>
     <string name="bg_service_screen_lock_toast">Pantalla bloqueada</string>
     <string name="bg_service_interval">Definir intervalo de activación:</string>
-    <string name="show_cameras">Mostrar radares</string>
+    <string name="show_cameras">Radares</string>
-    <string name="show_traffic_warnings">Mostrar límites de velocidad</string>
+    <string name="show_traffic_warnings">Límites de velocidad</string>
     <string name="avoid_toll_roads">Evitar peajes</string>
     <string name="continue_follow_previous_route_auto">La navegación anterior no finalizó. ¿Continuar siguiéndola? (%1$s segundos)</string>
     <string name="route_updated_loc_found">La ruta será calculada cuando se encuentre la ubicación</string>
@@ -1043,7 +1043,7 @@
     <string name="route_kl">Mantente a la izquierda y continúa por</string>
     <string name="route_kr">Mantente a la derecha y continúa por</string>
     <string name="rendering_attr_noPolygons_description">Hacer todas las funciones del terreno transparentes en el mapa</string>
-    <string name="rendering_attr_noPolygons_name">Ocultar polígonos</string>
+    <string name="rendering_attr_noPolygons_name">Polígonos</string>
     <string name="rendering_attr_appMode_name">Modo de dibujo</string>
     <string name="rendering_attr_appMode_description">Optimizar mapa para</string>
     <string name="rendering_attr_contourLines_description">Mostrar desde el nivel de ampliación (requiere datos de contorno):</string>
@@ -1093,8 +1093,6 @@
     <string name="show_ruler_level">Mostrar escala</string>
     <string name="info_button">Información</string>
     <string name="back_to_location">Volver a la ubicación</string>
-    <string name="accessibility_extensions_descr">Extensión de accesibilidad para versiones viejas de Android</string>
-    <string name="accessibility_extensions">Extensiones de accesibilidad</string>
     <string name="accessibility_mode">Modo accesibilidad</string>
     <string name="accessibility_mode_descr">Activa las funciones de accesibilidad</string>
     <string name="accessibility_default">Usar ajuste global del sistema</string>
@@ -1137,13 +1135,9 @@
     <string name="settings_direction_style_descr">Elige el estilo para expresar direcciones relativas en movimiento</string>
     <string name="auto_announce_on">Iniciar auto-anuncios</string>
     <string name="auto_announce_off">Parar auto-anuncios</string>
-    <string name="scroll_map_by_gestures_descr">Desplaza el mapa con gestos en la pantalla táctil</string>
-    <string name="scroll_map_by_gestures">Desplazamiento natural del mapa</string>
     <string name="i_am_here">Estoy aquí</string>
     <string name="zoom_by_trackball_descr">Cambia la ampliación del mapa con movimientos horizontales de la rueda de desplazamiento</string>
     <string name="zoom_by_trackball">Usar la rueda de desplazamiento para controlar la ampliación</string>
-    <string name="use_short_object_names_descr">Usa nombres cortos de objetos en modo de exploración táctil</string>
-    <string name="use_short_object_names">Usar nombre de objetos</string>
     <string name="accessibility_preferences_descr">Preferencias de accesibilidad</string>
     <string name="arrival_distance_factor_early">Cerca</string>
     <string name="arrival_distance_factor_normally">Normal</string>
@@ -1940,7 +1934,7 @@
     <string name="map_legend">Leyenda del mapa</string>
     <string name="shared_string_update">Actualizar</string>
     <string name="shared_string_upload">Subir</string>
-    <string name="rendering_attr_hideProposed_name">Ocultar objetos propuestos</string>
+    <string name="rendering_attr_hideProposed_name">Objetos propuestos</string>
 
 <string name="read_more">Leer más</string>
     <string name="whats_new">Novedades en</string>
@@ -2044,7 +2038,7 @@
     <string name="item_removed">Elemento quitado</string>
     <string name="n_items_removed">elementos borrados</string>
     <string name="shared_string_undo_all">DESHACER TODO</string>
-    <string name="rendering_attr_hideIcons_name">Ocultar iconos de PDI</string>
+    <string name="rendering_attr_hideIcons_name">Iconos de PDI</string>
     <string name="switch_start_finish">Invertir puntos de partida y destino</string>
     <string name="number_of_contributors">Número de contribuidores</string>
     <string name="number_of_edits">Número de ediciones</string>
@@ -2055,7 +2049,7 @@
     <string name="shared_string_select">Elegir</string>
     <string name="shared_string_remove">Quitar</string>
     <string name="data_is_not_available">Datos no disponibles</string>
-    <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterráneos</string>
+    <string name="rendering_attr_hideUnderground_name">Objetos subterráneos</string>
     <string name="shared_string_read_more">Leer más</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation (mapas y navegación de OsmAnd), encuentra ubicaciones en el mapa y calcula rutas sin conectarte a Internet. Descarga el mapa de un país antes de viajar para encontrar lugares y rutas en áreas desconocidas.\n\nOpciones básicas:\n• Mapas detallados en 200 países\n• Navegación sin conexión con avisos de voz\n• Búsqueda de direcciones en modo sin conexión\n• Información sobre ubicaciones en el mapa: lugares de interés, cafés, estacionamientos, tiendas\n• Añade tus ubicaciones a los favoritos\n• Navegación en automóvil, bicicleta y caminando\n\nOpciones adicionales:\n• Capacidad para ver y grabar trazas GPX\n• Descripción de Wikipedia en PDI
 \n• Añade notas de fotos, audios y videos en el mapa
@@ -2081,7 +2075,7 @@
     <string name="find_parking">Encontrar estacionamiento</string>
     <string name="show_polygons">Mostrar polígonos</string>
     <string name="underlay_transparency">Transparencia subyacente</string>
-    <string name="rendering_attr_showMtbRoutes_name">Mostrar rutas de BTT</string>
+    <string name="rendering_attr_showMtbRoutes_name">Rutas de BTT</string>
     <string name="shared_string_reverse_order">Invertir orden</string>
     <string name="show_map_markers">Marcadores del mapa</string>
     <string name="show_map_markers_description">Activar función de marcadores del mapa</string>
@@ -2146,7 +2140,9 @@
     <string name="file_name_containes_illegal_char">El nombre del archivo contiene caracteres ilegales</string>
 <string name="no_map_markers_found">Añade marcadores a través del mapa</string>
     <string name="no_waypoints_found">No se encontraron puntos de ruta</string>
-    <string name="rendering_value_thin_name">Delgado</string>
+    <string name="rendering_value_thin_name">Fino</string>
     <string name="rendering_value_medium_name">Mediano</string>
     <string name="rendering_value_bold_name">Grueso</string>
+    <string name="map_mode">Modo mapa</string>
+    <string name="number_of_gpx_files_selected_pattern">%s archivos GPX elegidos</string>
     </resources>

OsmAnd/res/values-es-rUS/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
 
-    <string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
     <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
     <string name="storage_directory_external">Almacenamiento externo</string>
     <string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
@@ -248,12 +248,12 @@
     <string name="local_map_names">Nombres locales</string>
     <string name="lang_he">Hebreo</string>
     <string name="gpx_start_new_segment">Iniciar nuevo segmento</string>
-    <string name="rendering_attr_hideBuildings_name">Ocultar edificios</string>
+    <string name="rendering_attr_hideBuildings_name">Edificios</string>
-    <string name="rendering_attr_hideText_name">Ocultar textos</string>
+    <string name="rendering_attr_hideText_name">Textos</string>
     <string name="rendering_attr_buildings15zoom_name">Edificios en ampliación 15</string>
     <string name="rendering_attr_moreDetailed_name">Más detalles</string>
     <string name="rendering_attr_lessDetailed_name">Menos detalles</string>
-    <string name="rendering_attr_hideAccess_name">Ocultar restricciones de acceso</string>
+    <string name="rendering_attr_hideAccess_name">Restricciones de acceso</string>
     <string name="rendering_attr_showAccess_name">Mostrar restricciones de acceso</string>
     <string name="rendering_attr_showSurfaceGrade_name">Mostrar calidad de las carreteras</string>
     <string name="rendering_attr_showSurfaces_name">Mostrar superficie de las carreteras</string>
@@ -527,8 +527,8 @@
     <string name="live_monitoring_stop">Parar rastreo en línea</string>
     <string name="gpx_monitoring_start">Iniciar grabación GPX</string>
     <string name="gpx_monitoring_stop">Parar grabación GPX</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Ocultar vías no aptas para vehículos</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Carreteras no aptas para vehículos</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Ocultar bosques y matorrales</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Bosques y matorrales</string>
     <string name="osmo_auth_error">Error de autorización OsMo: %1$s.\n Puede deberse a que el servicio esté temporalmente caído o que tu registro expiró.\n ¿Quieres realizar un nuevo registro?</string>
     <string name="osmo_group_information_desc">" - Al crear un grupo, debes darle un nombre y completar la descripción.\n - Desde la aplicación del grupo, sólo se crean con el tipo Simple, lee más en el sitio web https://osmo.mobi/g/new\n - Puedes gestionar un grupo desde un sitio web, para ubicar todas las trazas y puntos disponibles\n - No avalamos el uso de grupos con sólo un usuario, si esto no es el grupo de PDI\n - Los grupos privados se limitan sólo a 8 personas\n - Los detalles sobre términos y condiciones, se encuentran en el sitio web OsMo.mobi\n - Si necesitas condiciones especiales, contacta con el soporte: osmo.mobi@gmail.com "</string>
     <string name="osmo_group_information">¡Lee antes de crear un grupo!</string>
@@ -1093,8 +1093,6 @@
     <string name="show_ruler_level">Mostrar escala</string>
     <string name="info_button">Información</string>
     <string name="back_to_location">Volver a la ubicación</string>
-    <string name="accessibility_extensions_descr">Extensión de accesibilidad para versiones viejas de Android</string>
-    <string name="accessibility_extensions">Extensiones de accesibilidad</string>
     <string name="accessibility_mode">Modo accesibilidad</string>
     <string name="accessibility_mode_descr">Activa las funciones de accesibilidad</string>
     <string name="accessibility_default">Usar ajuste global del sistema</string>
@@ -1137,13 +1135,9 @@
     <string name="settings_direction_style_descr">Elige el estilo para expresar direcciones relativas en movimiento</string>
     <string name="auto_announce_on">Iniciar auto-anuncios</string>
     <string name="auto_announce_off">Parar auto-anuncios</string>
-    <string name="scroll_map_by_gestures_descr">Desplaza el mapa con gestos en la pantalla táctil</string>
-    <string name="scroll_map_by_gestures">Desplazamiento natural del mapa</string>
     <string name="i_am_here">Estoy aquí</string>
     <string name="zoom_by_trackball_descr">Cambia la ampliación del mapa con movimientos horizontales de la rueda de desplazamiento</string>
     <string name="zoom_by_trackball">Usar la rueda de desplazamiento para controlar la ampliación</string>
-    <string name="use_short_object_names_descr">Usa nombres cortos de objetos en modo de exploración táctil</string>
-    <string name="use_short_object_names">Usar nombre de objetos</string>
     <string name="accessibility_preferences_descr">Preferencias de accesibilidad</string>
     <string name="arrival_distance_factor_early">Cerca</string>
     <string name="arrival_distance_factor_normally">Normal</string>
@@ -1940,7 +1934,7 @@
     <string name="map_legend">Leyenda del mapa</string>
     <string name="shared_string_update">Actualizar</string>
     <string name="shared_string_upload">Subir</string>
-    <string name="rendering_attr_hideProposed_name">Ocultar objetos propuestos</string>
+    <string name="rendering_attr_hideProposed_name">Objetos propuestos</string>
 
 <string name="read_more">Leer más</string>
     <string name="whats_new">Novedades en</string>
@@ -2044,7 +2038,7 @@
     <string name="item_removed">Elemento quitado</string>
     <string name="n_items_removed">elementos borrados</string>
     <string name="shared_string_undo_all">DESHACER TODO</string>
-    <string name="rendering_attr_hideIcons_name">Ocultar iconos de PDI</string>
+    <string name="rendering_attr_hideIcons_name">Iconos de PDI</string>
     <string name="switch_start_finish">Invertir puntos de partida y destino</string>
     <string name="number_of_contributors">Número de contribuidores</string>
     <string name="number_of_edits">Número de ediciones</string>
@@ -2055,7 +2049,7 @@
     <string name="shared_string_select">Elegir</string>
     <string name="shared_string_remove">Quitar</string>
     <string name="data_is_not_available">Datos no disponibles</string>
-    <string name="rendering_attr_hideUnderground_name">Ocultar objetos subterráneos</string>
+    <string name="rendering_attr_hideUnderground_name">Objetos subterráneos</string>
     <string name="shared_string_read_more">Leer más</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Maps &amp; Navigation (mapas y navegación de OsmAnd), encuentra ubicaciones en el mapa y calcula rutas sin conectarte a Internet. Descarga el mapa de un país antes de viajar para encontrar lugares y rutas en áreas desconocidas.\n\nOpciones básicas:\n• Mapas detallados en 200 países\n• Navegación sin conexión con avisos de voz\n• Búsqueda de direcciones en modo sin conexión\n• Información sobre ubicaciones en el mapa: lugares de interés, cafés, estacionamientos, tiendas\n• Añade tus ubicaciones a los favoritos\n• Navegación en automóvil, bicicleta y caminando\n\nOpciones adicionales:\n• Capacidad para ver y grabar trazas GPX\n• Descripción de Wikipedia en PDI
 \n• Añade notas de fotos, audios y videos en el mapa
@@ -2146,7 +2140,9 @@
     <string name="file_name_containes_illegal_char">El nombre del archivo contiene caracteres ilegales</string>
 <string name="no_map_markers_found">Añade marcadores a través del mapa</string>
     <string name="no_waypoints_found">No se encontraron puntos de ruta</string>
-    <string name="rendering_value_thin_name">Delgado</string>
+    <string name="rendering_value_thin_name">Fino</string>
     <string name="rendering_value_medium_name">Mediano</string>
     <string name="rendering_value_bold_name">Grueso</string>
+    <string name="map_mode">Modo mapa</string>
+    <string name="number_of_gpx_files_selected_pattern">%s archivos GPX elegidos</string>
     </resources>

OsmAnd/res/values-es/strings.xml

@@ -651,8 +651,6 @@
     <string name="info_button">Información</string>
     <string name="back_to_location">Volver a la posición</string>
     <string name="shared_string_help">Ayuda</string>
-    <string name="accessibility_extensions_descr">Extensión de accesibilidad para versiones viejas de Android</string>
-    <string name="accessibility_extensions">Extensiones de accesibilidad</string>
     <string name="accessibility_mode">Modo accesibilidad</string>
     <string name="accessibility_mode_descr">Activa las características de accesibilidad</string>
     <string name="shared_string_on">Activado</string>
@@ -697,13 +695,9 @@
     <string name="settings_direction_style_descr">Selecciona el estilo para expresar direcciones relativas mientras se mueve</string>
     <string name="auto_announce_on">Comenzar anuncios automáticos</string>
     <string name="auto_announce_off">Parar anuncios automáticos</string>
-    <string name="scroll_map_by_gestures_descr">Desplaza el mapa por gestos en la pantalla táctil</string>
-    <string name="scroll_map_by_gestures">Desplazamiento de mapa natural</string>
     <string name="i_am_here">Estoy aquí</string>
     <string name="zoom_by_trackball_descr">Cambia el acercamiento del mapa con los movimientos horizontales de la bola de desplazamiento</string>
     <string name="zoom_by_trackball">Utilizar la bola de desplazamiento para control del acercamiento</string>
-    <string name="use_short_object_names_descr">Usa nombres cortos de objetos en modo de exploración táctil</string>
-    <string name="use_short_object_names">Utilizar nombre de objetos</string>
     <string name="accessibility_preferences_descr">Preferencias relativas a la accesibilidad</string>
     <string name="shared_string_accessibility">Accesibilidad</string>
     <string name="local_index_routing_data">Datos de la navegación</string>
@@ -1293,8 +1287,8 @@
     <string name="interrupt_music">Interrumpir música</string>
     <string name="osmo_settings_uuid">Identificador único del dispositivo</string>
     <string name="osmo_settings_descr">Configura los ajustes de rastreo y configura el canal de rastreo personal</string>
-    <string name="osmo_plugin_description">"Este extra proporciona parcialmente la funcionalidad de Monitorización OpenStreetMap, ver https://osmo.mobi\n\nPuedes rastrear en tiempo real todos los dispositivos de un grupo  en el que participes. También se pueden ver el punto y las pistas subidas al grupo al que perteneces.
+    <string name="osmo_plugin_description">"Este extra proporciona parcialmente la funcionalidad de Monitorización OpenStreetMap, ver https://osmo.mobi\n\nPuedes rastrear en tiempo real todos los dispositivos de un grupo en el que participes. También puedes ver el punto y las pistas subidas al grupo al que perteneces.
-\n\nEl grupo no ha sido eliminado después de meses, armonizarla con las normas que crear grupos en el sitio web OsMo.mobi "</string>
+\n\nEl grupo no ha sido eliminado después de meses, actívalo con las normas que crear grupos en el sitio web OsMo.mobi "</string>
     <string name="osmo_plugin_name">Monitorización OpenStreetMap</string>
     <string name="osmo_settings">OsMo</string>
     <string name="share_route_as_gpx">Compartir la ruta como archivo GPX</string>
@@ -1422,14 +1416,14 @@
     <string name="none_selected_gpx">No hay archivos GPX seleccionados. Para seleccionar presione y mantenga presionado en la traza disponible.</string>
     <string name="local_index_select_gpx_file">Marcar para mostrar</string>
     <string name="no_index_file_to_download">No se encontraron descargas, compruebe su conexión a Internet.</string>
-    <string name="rendering_attr_hideBuildings_name">Ocultar edificios</string>
+    <string name="rendering_attr_hideBuildings_name">Edificios</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Ocultar vías no aptas para vehículos</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Vías no aptas para vehículos</string>
-    <string name="rendering_attr_hideText_name">Ocultar textos</string>
+    <string name="rendering_attr_hideText_name">Textos</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Ocultar bosques y matorrales</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Bosques y matorrales</string>
     <string name="rendering_attr_buildings15zoom_name">Edificios en acercamiento 15</string>
     <string name="rendering_attr_moreDetailed_name">Más detalles</string>
     <string name="rendering_attr_lessDetailed_name">Menos detalles</string>
-    <string name="rendering_attr_hideAccess_name">Ocultar restricciones de acceso</string>
+    <string name="rendering_attr_hideAccess_name">Restricciones de acceso</string>
     <string name="rendering_attr_showAccess_name">Mostrar restricciones de acceso</string>
     <string name="rendering_attr_showSurfaceGrade_name">Mostrar calidad de carreteras</string>
     <string name="rendering_attr_showSurfaces_name">Mostrar superficie de carreteras</string>
@@ -1729,7 +1723,7 @@
     <string name="storage_directory">Almacenamiento del mapa</string>
     <string name="shared_string_copy">Copiar</string>
     <string name="application_dir_change_warning3">¿Quiere que OsmAnd también copie los archivos de datos al nuevo destino?</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
     <string name="routing_attr_avoid_borders_description">Evita cruzar una frontera hacia otro país</string>
     <string name="routing_attr_height_name">Límite de altura</string>
     <string name="routing_attr_height_description">Especifique la altura del vehículo que se permite en las rutas</string>
@@ -1939,7 +1933,7 @@
     <string name="map_legend">Leyenda del mapa</string>
     <string name="shared_string_update">Actualizar</string>
     <string name="shared_string_upload">Subir</string>
-    <string name="rendering_attr_hideProposed_name">Ocultar objetos propuestos</string>
+    <string name="rendering_attr_hideProposed_name">Objetos propuestos</string>
     <string name="read_more">Leer más</string>
     <string name="whats_new">Novedades en</string>
     <string name="lang_nds">Bajo Alemán</string>
@@ -2051,11 +2045,11 @@
     <string name="road_blocked">Carretera bloqueada</string>
     <string name="shared_string_select">Seleccionar</string>
     <string name="switch_start_finish">Invertir punto de partida y destino</string>
-    <string name="rendering_attr_hideIcons_name">Ocultar iconos de PDI</string>
+    <string name="rendering_attr_hideIcons_name">Iconos de PDI</string>
     <string name="number_of_contributors">Número de colaboradores</string>
     <string name="number_of_edits">Número de ediciones</string>
     <string name="reports_for">Informe para</string>
-<string name="rendering_attr_hideUnderground_name">Ocultar objetos subterráneos</string>
+<string name="rendering_attr_hideUnderground_name">Objetos subterráneos</string>
     <string name="data_is_not_available">No hay datos disponibles</string>
     <string name="shared_string_read_more">Leer más</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd Mapas y Navegación - encuentra ubicaciones en el mapa y calcula rutas sin conexión a Internet. Descarga un mapa de un país antes de que viajes para encontrar sitios y rutas en un área que no te sea familiar. Opciones básicas: • Mapas detallados de 200 países • Navegador fuera de línea con avisos de voz • Búsqueda de direcciones en modo sin conexión • Información sobre ubicaciones en el mapa: sitios de interés, cafeterías, aparcamientos, tiendas • Añadir ubicaciones a tus favoritos • Opciones adicionales de navegación en modos Conducción, Ciclismo y Pedestre : • Capacidad de ver y grabar trazas GPX • Descripciones de Wikipedia de los PDI • Añadir notas de foto, audio y vídeo al mapa • Modos de mapa Día y Noche  para una conducción más conveniente • Información sobre rutas y paradas de transporte público • Vías ciclistas y caminos • Vías de senderismo para hacer turismo en todo el mundo • Mapas en línea de numerosas fuentes • Información sobre calidad del pavimento e iluminación de las calles • Añadir, editar y eliminar PDI (para usuarios deOpenstreetmap.org) • OsMo - monitorización de directo de otros dispositivos Consigue un explorador fiable en tu país - ya sea Francia, Alemania, México, Reino Unido, España, Holanda, EE.UU., Rusia, Brasil o cualquiera otro estado. Extras: • Mapas de contorno y sombreado del terreno https://goo.gl/7mojP8 Datos de curvas de nivel y visualización de terreno añadidos al mapa básico OsmAnd . • Mapas de esquí https://goo.gl/pX6DxJ La información sobre pistas de esquí, pistas de esquí de fondo, telecabinas y ascensores de esquí. • Mapa náutico https://goo.gl/0hEdxm Estilo de mapa especial para ver señales de navegación náutica para arteriales y navegación costera. • Posición de aparcamiento https://goo.gl/6jxQXF Te ayuda a marcar la ubicación de tu vehículo aparcado y ver cuánto tiempo queda si el aparcamiento es por tiempo limitado. ¡Mantente informado! Twitter: https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Sitio: http://osmand.net Si necesitas ayuda con la aplicación OsmAnd, por favor contacta con nuestro equipo de soporte: support@osmand.net. "</string>
@@ -2132,4 +2126,9 @@
     <string name="no_map_markers_found">Por favor, añade marcadores de mapa via mapa</string>
     <string name="no_waypoints_found">No se han encontrado puntos intermedios</string>
     <string name="file_name_containes_illegal_char">El nombre de archivo contiene caracteres ilegales</string>
+<string name="map_mode">Modo mapa</string>
+    <string name="number_of_gpx_files_selected_pattern">%s archivos GPX seleccionados</string>
+    <string name="rendering_value_thin_name">Fino</string>
+    <string name="rendering_value_medium_name">Mediano</string>
+    <string name="rendering_value_bold_name">Negrita</string>
     </resources>

OsmAnd/res/values-eu/strings.xml

@@ -441,8 +441,6 @@
   <string name="back_to_location">Kokapenera itzuli</string>
   <string name="shared_string_help">Laguntza</string>
   
-  <string name="accessibility_extensions_descr">Androiden bertsio zaharreko erabilerraztasunerako luzapenak</string>
-  <string name="accessibility_extensions">Erabilerraztasunerako luzapenak</string>
   <string name="accessibility_mode">Erabilerraztasun modua</string>
   <string name="accessibility_mode_descr">Erabilerraztasun ezaugarriak gaitu</string>
   <string name="shared_string_on">On</string>
@@ -487,13 +485,9 @@
   <string name="settings_direction_style_descr">Aukeratu mugimenduan egotean ematen diren argibide erlatiboen estiloa</string>
   <string name="auto_announce_on">Iragarpen automatikoa hasi</string>
   <string name="auto_announce_off">Iragarpen automatikoa gelditu</string>
-  <string name="scroll_map_by_gestures_descr">Korritu mapa ukipen-pantailaren keinuen bidez</string>
-  <string name="scroll_map_by_gestures">Maparen korritze naturala</string>
   <string name="i_am_here">Hemen nago</string>
   <string name="zoom_by_trackball_descr">Maparen zooma aldatu trackball-aren mugimendu orizontalaren bidez</string>
   <string name="zoom_by_trackball">Trackball-a erabili zooma kontrolatzeko</string>
-  <string name="use_short_object_names_descr">Objektuen izen motzak erabili ukipen-esplorazio moduan</string>
-  <string name="use_short_object_names">Objetuen izenak erabili</string>
   <string name="accessibility_preferences_descr">Erabilerraztasunari erlazionaturiko hobespenak</string>
   <string name="shared_string_accessibility">Erabilerraztasuna</string>
   <string name="rendering_out_of_memory">Aukeratutako area erakusteko ez dago memoria nahikorik</string>

OsmAnd/res/values-fa/strings.xml

@@ -1232,17 +1232,11 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
 	<string name="play_commands_of_currently_selected_voice">پخش دستورات صوتی صدای انتخاب شده</string>
 	<string name="native_rendering">رندر بومی</string>
 	
-	<string name="accessibility_extensions_descr">افزونه دسترسی برای نسخه های قدیمی آندروید</string>
-	<string name="accessibility_extensions">افزونه دسترسی</string>
 	<string name="accessibility_mode">حالت دسترسی</string>
 	<string name="accessibility_mode_descr">روشن کردن ویژگی های دسترسی</string>
 	<string name="direction_style_sidewise">راه های جانبی (۸ بخشی)</string>
-	<string name="scroll_map_by_gestures_descr">حرکات نقشه بر روی صفحه نمایش لمسی</string>
-	<string name="scroll_map_by_gestures">حرکات طبیعی نقشه</string>
 	<string name="zoom_by_trackball_descr">تغییر زوم نقشه توسط حرکت افقی گوی مکان نما</string>
 	<string name="zoom_by_trackball">استفاده از گوی مکان نما برای کنترل زوم</string>
-	<string name="use_short_object_names_descr">استفاده از نام کوتاه شی در حالت اکتشاف لمسی</string>
-	<string name="use_short_object_names">استفاده از نام شی</string>
 	<string name="accessibility_preferences_descr">تنظیمات مربوط به دسترسی</string>
 	<string name="shared_string_accessibility">دسترسی</string>
 	

OsmAnd/res/values-fi/strings.xml

@@ -543,8 +543,6 @@
 	<string name="native_rendering">Natiivi renderöinti</string>
 	<string name="send_files_to_osm">Lähetä GPX-tiedostot OSM:iin?</string>
 	<string name="gpx_visibility_txt">Näkyvyys</string>
-	<string name="accessibility_extensions_descr">Esteettömyys laajennokset vanhoille Android versioille</string>
-	<string name="accessibility_extensions">Esteettömyys laajennokset</string>
 	<string name="accessibility_mode">Esteettömyys moodi</string>
 	<string name="accessibility_default">Globaalien systeemiasetusten mukaan</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing viivakoodinlukusovellusta ei ole asennettuna. Etsitäänkö se Marketisa?</string>

OsmAnd/res/values-fr/strings.xml

@@ -715,8 +715,6 @@
     <string name="back_to_location">Retourner à la position</string>
     <string name="shared_string_help">Aide</string>
 
-    <string name="accessibility_extensions_descr">Extensions d\'accessibilité pour les anciennes versions Android</string>
-    <string name="accessibility_extensions">Extensions d\'accessibilité</string>
     <string name="accessibility_mode">Mode accessibilité</string>
     <string name="accessibility_mode_descr">Activer les fonctionnalités d\'accessibilité</string>
     <string name="shared_string_on">Oui</string>
@@ -761,13 +759,9 @@
     <string name="settings_direction_style_descr">Sélectionnez un style pour indiquer la direction générale lors du déplacement</string>
     <string name="auto_announce_on">Démarrer les annonces automatiques</string>
     <string name="auto_announce_off">Arrêter les annonces automatiques</string>
-    <string name="scroll_map_by_gestures_descr">Faire défiler la carte par gestes sur l\'écran</string>
-    <string name="scroll_map_by_gestures">Défilement naturel de la carte</string>
     <string name="i_am_here">Je suis ici</string>
     <string name="zoom_by_trackball_descr">Modifier le niveau de zoom par mouvements horizontaux du trackball</string>
     <string name="zoom_by_trackball">Utiliser le trackball pour le contrôle du zoom</string>
-    <string name="use_short_object_names_descr">Utiliser les noms d\'objets courts</string>
-    <string name="use_short_object_names">Utiliser les noms d\'objets</string>
     <string name="accessibility_preferences_descr">Configurer les paramètres liés à l\'accessibilité</string>
     <string name="shared_string_accessibility">Accessibilité</string>
     <string name="use_fluorescent_overlays">Sur-couche fluorescente</string>
@@ -1484,14 +1478,14 @@
     <string name="gpx_monitoring_start">Démarrer l\'enregistrement GPX</string>
     <string name="gpx_monitoring_stop">Arrêter l\'enregistrement GPX</string>
     <string name="gpx_start_new_segment">Débuter un nouveau segment</string>
-    <string name="rendering_attr_hideBuildings_name">Masquer les bâtiments</string>
+    <string name="rendering_attr_hideBuildings_name">Bâtiments</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Masquer les voies non adaptées aux véhicules</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Voies non adaptées aux véhicules</string>
-    <string name="rendering_attr_hideText_name">Masquer les textes</string>
+    <string name="rendering_attr_hideText_name">Texte</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Masquer la végétation</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Végétation</string>
     <string name="rendering_attr_buildings15zoom_name">Bâtiments en zoom 15</string>
     <string name="rendering_attr_moreDetailed_name">Plus détaillé</string>
     <string name="rendering_attr_lessDetailed_name">Moins détaillé</string>
-    <string name="rendering_attr_hideAccess_name">Masquer les restrictions d\'accès</string>
+    <string name="rendering_attr_hideAccess_name">Accès restreints</string>
     <string name="rendering_attr_showAccess_name">Afficher les restrictions d\'accès</string>
     <string name="rendering_attr_showSurfaceGrade_name">Afficher la qualité des routes</string>
     <string name="rendering_attr_showSurfaces_name">Afficher la surface des routes</string>
@@ -1777,7 +1771,7 @@
     <string name="storage_directory">Stockage de la carte</string>
     <string name="shared_string_copy">Copier</string>
     <string name="application_dir_change_warning3">Souhaitez-vous aussi qu\'OsmAnd copie ses fichiers de données vers la nouvelle destination ?</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Masquer les numéros dans les rues</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Numéros dans les rues</string>
     
     <string name="routing_attr_avoid_borders_description">Éviter de franchir les frontières entre pays</string>
     <string name="routing_attr_height_name">Limite de hauteur</string>
@@ -2010,7 +2004,7 @@
     <string name="shared_string_update">Mise à jour</string>
     <string name="read_more">Lire plus</string>
     <string name="whats_new">Quoi de neuf dans</string>
-    <string name="rendering_attr_hideProposed_name">Masquer les objets proposés</string>
+    <string name="rendering_attr_hideProposed_name">Objets proposés</string>
     <string name="lang_mk">Macédonien</string>
     <string name="lang_fy">Frison occidental</string>
     <string name="lang_als">Tosque</string>
@@ -2111,7 +2105,7 @@
     <string name="rec_split_storage_size_desc">Espace maximum alloué pour tous les enregistrements</string>
     <string name="shared_string_type">Type</string>
     <string name="switch_start_finish">Inverser Départ et Destination</string>
-    <string name="rendering_attr_hideIcons_name">Masquer les icônes des PI</string>
+    <string name="rendering_attr_hideIcons_name">Icônes des PI</string>
     <string name="number_of_contributors">Nombre de contributeurs</string>
     <string name="number_of_edits">Nombre de modifications</string>
     <string name="reports_for">Signaler pour</string>
@@ -2121,7 +2115,7 @@
     <string name="road_blocked">Route barrée</string>
     <string name="add_time_span">Ajouter un laps de temps</string>
     <string name="data_is_not_available">Donnée indisponible</string>
-    <string name="rendering_attr_hideUnderground_name">Cacher les objets souterrains</string>
+    <string name="rendering_attr_hideUnderground_name">Objets souterrains</string>
     <string name="shared_string_read_more">Lire la suite</string>
     <string name="shared_string_email_address">Adresse email</string>
     <string name="shared_string_status">Statut</string>
@@ -2195,4 +2189,6 @@
     <string name="rendering_value_thin_name">Fin</string>
     <string name="rendering_value_medium_name">Moyen</string>
     <string name="rendering_value_bold_name">Épais</string>
+    <string name="number_of_gpx_files_selected_pattern">%s fichiers GPX sélectionnés</string>
+    <string name="map_mode">Mode Carte</string>
     </resources>

OsmAnd/res/values-gl/strings.xml

@@ -813,8 +813,6 @@
 	<string name="back_to_location">Regresar á posición</string>
 	<string name="shared_string_help">Axuda</string>
 	
-	<string name="accessibility_extensions_descr">Extensións de accesibibidade para versións antigas de Android</string>
-	<string name="accessibility_extensions">Extensións de accesibilidade</string>
 	<string name="accessibility_mode">Modo de accesibilidade</string>
 	<string name="accessibility_mode_descr">Activa as funcionalidades de accesibibidade</string>
 	<string name="shared_string_on">Activar</string>
@@ -859,13 +857,9 @@
 	<string name="settings_direction_style_descr">Escolla o estilo para expresar as direccións relativas cando se estea en movemento</string>
 	<string name="auto_announce_on">Iniciar os anuncios automáticos</string>
 	<string name="auto_announce_off">Parar os anuncios automáticos</string>
-	<string name="scroll_map_by_gestures_descr">Desprazar o mapa con xestos na pantalla táctil</string>
-	<string name="scroll_map_by_gestures">Desprazamento natural do mapa</string>
 	<string name="i_am_here">Estou aquí</string>
 	<string name="zoom_by_trackball_descr">Cambiar a ampliación do mapa con movementos horizontais da trackball</string>
 	<string name="zoom_by_trackball">Empregar a trackball para controlar a ampliación</string>
-	<string name="use_short_object_names_descr">Empregar os nomes curtos dos obxectos no modo de exploración con toques</string>
-	<string name="use_short_object_names">Empregar os nomes dos obxectos</string>
 	<string name="accessibility_preferences_descr">Preferencias relacionadas coa accesibilidade</string>
 	<string name="shared_string_accessibility">Accesibilidade</string>
     <string name="arrival_distance_factor_early">Cedo</string>

OsmAnd/res/values-he/strings.xml

@@ -228,8 +228,6 @@
 	<string name="back_to_location">חזרה למיקום</string>
 	<string name="shared_string_help">עזרה</string>
 	
-	<string name="accessibility_extensions_descr">הרחבות נגישות לגרסאות ישנות של אנדרויד</string>
-	<string name="accessibility_extensions">הרחבות נגישות</string>
 	<string name="accessibility_mode">מצב נגישות</string>
 	<string name="accessibility_mode_descr">הפעלת תכונות הנגישות</string>
 	<string name="shared_string_on">פעיל</string>
@@ -274,13 +272,9 @@
 	<string name="settings_direction_style_descr">נא לבחור את הסגנון להבעת יחס ההכוונה בעת התזוזה</string>
 	<string name="auto_announce_on">התחלת הכרזה אוטומטית</string>
 	<string name="auto_announce_off">הפסקת ההכרזה האוטומטית</string>
-	<string name="scroll_map_by_gestures_descr">ניתן לגלול את המפה על ידי נגיעה במסך</string>
-	<string name="scroll_map_by_gestures">גלילת מפה טבעית</string>
 	<string name="i_am_here">הנני כאן</string>
 	<string name="zoom_by_trackball_descr">החלפת התקריב למפה על ידי תזוזות אופקיות של כדור המעקב</string>
 	<string name="zoom_by_trackball">שימוש בכדור המעקב לצורך שליטה בתקריב</string>
-	<string name="use_short_object_names_descr">שימוש בשמות קצרים לפריטים במצב חקירה במגע</string>
-	<string name="use_short_object_names">שימוש בשמות של פריטים</string>
 	<string name="accessibility_preferences_descr">העדפות הקשורות בנגישות</string>
 	<string name="shared_string_accessibility">נגישות</string>
 	<string name="rendering_out_of_memory">אין די זיכרון לתהליך כדי להציג את האיזור הנבחר</string>

OsmAnd/res/values-hr/strings.xml

@@ -261,7 +261,6 @@
 	<string name="towards">prema</string>
 	<string name="no_info">Nema informacija</string>
 	<string name="i_am_here">Ja sam ovdje</string>
-	<string name="use_short_object_names">Koristite imena objekata</string>
 	<string name="rendering_out_of_memory">Nedovoljno memorije za prikaz odabranog područja</string>
 	<string name="email">E-pošta</string>
 

OsmAnd/res/values-hu/strings.xml

@@ -13,8 +13,6 @@
     <string name="back_to_location">Vissza a pozícióra</string>
     <string name="shared_string_help">Súgó</string>
 
-    <string name="accessibility_extensions_descr">Akadálymentesítési kiegészítés régi Android verzióhoz</string>
-    <string name="accessibility_extensions">Akadálymentesítési kiegészítés</string>
     <string name="accessibility_mode">Akadálymentesítési mód</string>
     <string name="accessibility_mode_descr">Akadálymentesítési lehetőségek bekapcsolása</string>
     <string name="shared_string_on">Be</string>
@@ -59,13 +57,9 @@
     <string name="settings_direction_style_descr">Mozgás közbeni relatív irány megjelenítés stílusának kiválasztása</string>
     <string name="auto_announce_on">Automatikus bemondás indítása</string>
     <string name="auto_announce_off">Automatikus bemondás leállítása</string>
-    <string name="scroll_map_by_gestures_descr">Térkép görgetése érintőképernyős gesztusokkal</string>
-    <string name="scroll_map_by_gestures">Természetes térképgörgetés</string>
     <string name="i_am_here">Itt vagyok</string>
     <string name="zoom_by_trackball_descr">Térképnagyítás vízszintes \'trackball\' mozdulatokkal</string>
     <string name="zoom_by_trackball">\'trackball\' használata térképnagyításhoz</string>
-    <string name="use_short_object_names_descr">Rövid objektumnevek használata felfedező módban</string>
-    <string name="use_short_object_names">Objektumnevek használata</string>
     <string name="accessibility_preferences_descr">Akadálymentesítéssel kapcsolatos beállítások</string>
     <string name="shared_string_accessibility">Akadálymentesítés</string>
     <string name="rendering_out_of_memory">Kevés a folyamatmemória a terület megjelenítéséhez</string>

OsmAnd/res/values-it/strings.xml

@@ -677,8 +677,6 @@
     <string name="info_button">Info</string>
     <string name="back_to_location">Torna alla posizione</string>
 
-    <string name="accessibility_extensions_descr">Estensioni per l\'accessibilità per vecchie versioni di Android</string>
-    <string name="accessibility_extensions">Estensioni per l\'accessibilità</string>
     <string name="accessibility_mode">Modalità accessibile</string>
     <string name="accessibility_mode_descr">Abilita le funzioni relative all\'accessibilità</string>
     <string name="accessibility_default">Basata sulle impostazioni globali di sistema</string>
@@ -721,13 +719,9 @@
     <string name="settings_direction_style_descr">Scegli lo stile in cui vengono espresse in movimento le direzioni relative</string>
     <string name="auto_announce_on">Avvia gli annunci automatici</string>
     <string name="auto_announce_off">Ferma gli annunci automatici</string>
-    <string name="scroll_map_by_gestures_descr">Muovi la mappa con i gesti sullo schermo tattile</string>
-    <string name="scroll_map_by_gestures">Scorrimento naturale della mappa</string>
     <string name="i_am_here">Io sono qui</string>
     <string name="zoom_by_trackball_descr">Cambia lo zoom della mappa con movimenti orizzontali della trackball</string>
     <string name="zoom_by_trackball">Usa la trackball per il controllo dello zoom</string>
-    <string name="use_short_object_names_descr">Usa i nomi corti degli oggetti in modalità esplorazione col tocco</string>
-    <string name="use_short_object_names">Usa i nomi degli oggetti</string>
     <string name="accessibility_preferences_descr">Preferenze relative all\'accessibilità</string>
     <string name="shared_string_accessibility">Accessibilità</string>
     <string name="index_name_north_america">Nord America</string>
@@ -1443,14 +1437,14 @@
     <string name="osmo_group_information_desc">" - Quando crei un gruppo, per favore, dagli un nome e una descrizione\n - Dall\'app possono essere creati solo gruppi di tipo Semplice, più informazioni su sito https://osmo.mobi/g/new\n - Attraverso il sito è possibile gestire il gruppo e aggiungere tracce e punti disponibili per tutti\n - Non auspichiamo l\'utilizzo dei gruppi con un solo membro, se questo non è il gruppo dei PDI\n - I gruppi privati sono limitati a 8 persone\n - Termini e condizioni dell\'utilizzo sono sempre disponibili su OsMo.mobi\n - Se avete altre necessità particolari - per favore contattate il supporto osmo.mobi@gmail.com "</string>
     <string name="osmo_group_information">Per favore leggere prima di creare un gruppo!</string>
     <string name="osmo_auth_error">Errore di autorizzazione OsMo: %1$s.\nPotrebbe essere un disservizio temporaneo oppure che la registrazione è scaduta.\nVuoi procedere con una nuova registrazione?</string>
-    <string name="rendering_attr_hideBuildings_name">Nascondi gli edifici</string>
+    <string name="rendering_attr_hideBuildings_name">Edifici</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Nascondi le strade non carrabili</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Strade non carrabili</string>
-    <string name="rendering_attr_hideText_name">Nascondi il testo</string>
+    <string name="rendering_attr_hideText_name">Testo</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Nascondi foreste e boscaglie</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Foreste e boscaglie</string>
     <string name="rendering_attr_buildings15zoom_name">Edifici da zoom 15</string>
     <string name="rendering_attr_moreDetailed_name">Più dettagli</string>
     <string name="rendering_attr_lessDetailed_name">Meno dettagli</string>
-    <string name="rendering_attr_hideAccess_name">Nascondi le limitazioni di accesso</string>
+    <string name="rendering_attr_hideAccess_name">Limitazioni di accesso</string>
     <string name="rendering_attr_showAccess_name">Mostra le limitazioni di accesso</string>
     <string name="rendering_attr_showSurfaceGrade_name">Mostra qualità strade</string>
     <string name="rendering_attr_showSurfaces_name">Mostra il tipo di superficie delle strade</string>
@@ -1810,7 +1804,7 @@
     <string name="rendering_value__name">Default</string>
     <string name="rendering_value_highContrastRoads_name">Strade ad alto contrasto</string>
     <string name="storage_directory_multiuser">Memorizzazione multiutente</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Nascondi i numeri civici</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Numeri civici</string>
 
     <string name="routing_attr_avoid_borders_description">Evita l\'attraversamento di una frontiera verso un\'altra nazione</string>
     <string name="routing_attr_height_name">Limite di altezza</string>
@@ -2037,7 +2031,7 @@
 
 
 
-    <string name="rendering_attr_hideProposed_name">Nascondi gli oggetti proposti</string>
+    <string name="rendering_attr_hideProposed_name">Oggetti proposti</string>
     <string name="read_more">Altro</string>
     <string name="whats_new">Novità</string>
     <string name="share_osm_edits_subject">Modifiche OSM condivise tramite OsmAnd</string>
@@ -2139,7 +2133,7 @@
     <string name="n_items_removed">oggetti cancellati</string>
     <string name="shared_string_undo_all">ANNULLA TUTTO</string>
     <string name="switch_start_finish">Inverti punti di partenza e destinazione</string>
-    <string name="rendering_attr_hideIcons_name">Nascondi le icone dei PDI</string>
+    <string name="rendering_attr_hideIcons_name">Icone dei PDI</string>
     <string name="number_of_edits">Numero di modifiche</string>
     <string name="number_of_contributors">Numero di contributori</string>
     <string name="shared_string_select">Scegli</string>
@@ -2149,7 +2143,7 @@
     <string name="road_blocked">Strada bloccata</string>
     <string name="add_time_span">Aggiungi durata</string>
     <string name="data_is_not_available">Dati non disponibili</string>
-    <string name="rendering_attr_hideUnderground_name">Nascondi gli oggetti sotterranei</string>
+    <string name="rendering_attr_hideUnderground_name">Oggetti sotterranei</string>
     <string name="shared_string_read_more">Approfondisci</string>
     <string name="shared_string_email_address">Indirizzo email</string>
     <string name="shared_string_status">Stato</string>
@@ -2226,4 +2220,9 @@
 \n\n • Molti miglioramenti nel menu contestuale della mappa e nella ricerca contestuale degli indirizzi.\n\n e altro… "</string>
     <string name="rec_split">Frazionatore delle registrazioni</string>
     <string name="rec_split_title">Usa il frazionamento delle registrazioni</string>
+    <string name="rendering_value_thin_name">Sottile</string>
+    <string name="rendering_value_medium_name">Medio</string>
+    <string name="rendering_value_bold_name">Grosso</string>
+    <string name="map_mode">Modalità mappa</string>
+    <string name="number_of_gpx_files_selected_pattern">%s file GPX selezionati</string>
     </resources>

OsmAnd/res/values-ja/strings.xml

@@ -1016,8 +1016,6 @@ POIの更新は利用できません</string>
 	<string name="back_to_location">現在位置に戻す</string>
 	<string name="shared_string_help">ヘルプ</string>
 	
-	<string name="accessibility_extensions_descr">古いバージョンのAndroid用アクセシビリティ拡張します</string>
-	<string name="accessibility_extensions">アクセシビリティ拡張</string>
 	<string name="accessibility_mode">アクセシビリティモード</string>
 	<string name="accessibility_mode_descr">アクセシビリティ(ユーザー補助)機能を設定します</string>
 	<string name="shared_string_on">オン</string>
@@ -1062,13 +1060,9 @@ POIの更新は利用できません</string>
 	<string name="settings_direction_style_descr">移動中での相対方向を示す方法を選択します</string>
 	<string name="auto_announce_on">自動アナウンスの開始</string>
 	<string name="auto_announce_off">自動アナウンスの停止</string>
-	<string name="scroll_map_by_gestures_descr">タッチスクリーン上のジェスチャーでマップをスクロールします</string>
-	<string name="scroll_map_by_gestures">自然なマップスクロール</string>
 	<string name="i_am_here">私はここです(現在位置)</string>
 	<string name="zoom_by_trackball_descr">トラックボールを水平方向に動かすことでマップズームを変更できます</string>
 	<string name="zoom_by_trackball">ズームコントロールにトラックボールを使用</string>
-	<string name="use_short_object_names_descr">タッチで検索する場合に短いオブジェクト名を使用します</string>
-	<string name="use_short_object_names">オブジェクト名を使用</string>
 	<string name="accessibility_preferences_descr">アクセシビリティ関連の設定をします</string>
 	<string name="shared_string_accessibility">アクセシビリティ</string>
 	<string name="use_fluorescent_overlays">蛍光色の重ね表示</string>

OsmAnd/res/values-ka/strings.xml

@@ -55,8 +55,6 @@
   <string name="back_to_location">ადგილზე დაბრუნება</string>
   <string name="shared_string_help">დახმარება</string>
   
-  <string name="accessibility_extensions_descr">წვდომადობის გაფართოებები ანდროიდის ძველი ვერსიებისათვის</string>
-  <string name="accessibility_extensions">წვდომადობის გაფართოებები</string>
   <string name="accessibility_mode">წვდომადობის რეჟიმი</string>
   <string name="accessibility_mode_descr">რთავს წვდომადობის თვისებებს</string>
   <string name="shared_string_on">ჩართული</string>
@@ -101,13 +99,9 @@
   <string name="settings_direction_style_descr">მიუთითეთ მოძრაობისას მიმართულებაზე დამოკიდებული მიმართულების სტილი</string>
   <string name="auto_announce_on">თვითგამოცხადების ჩართვა</string>
   <string name="auto_announce_off">თვითგამოცხადების გამორთვა</string>
-  <string name="scroll_map_by_gestures_descr">რუკის მოძრაობა ეკრანზე შეხებით</string>
-  <string name="scroll_map_by_gestures">რუკის ავტომატური გადახვევა</string>
   <string name="i_am_here">აქ ვარ</string>
   <string name="zoom_by_trackball_descr">რუკის გადიდება ტრეკბოლის ჰორიზონტალური მოძრაობით</string>
   <string name="zoom_by_trackball">ტრეკბოლის გამოყენება გასადიდებლად</string>
-  <string name="use_short_object_names_descr">დათვალიერების რეჟიმში ობიექტების მოკლე დასახელებების გამოყენება</string>
-  <string name="use_short_object_names">ობიექტების სახელების გამოყენება</string>
   <string name="accessibility_preferences_descr">წვდომადობის პარამეტრები</string>
   <string name="shared_string_accessibility">წვდომა</string>
   <string name="rendering_out_of_memory">არასაკმარისი მეხსიერება არჩეული ადგილის საჩვენებლად</string>

OsmAnd/res/values-ko/strings.xml

@@ -23,8 +23,6 @@
 	<string name="back_to_location">위치로 돌아감</string>
 	
 	
-	<string name="accessibility_extensions_descr">이전 안드로이드 버전에 대한 접근성(내게 필요한 옵션) 확장</string>
-	<string name="accessibility_extensions">접근성 확장</string>
 	<string name="accessibility_mode">접근성 모드</string>
 	<string name="accessibility_mode_descr">접근성(내게 필요한 옵션) 기능을 켭니다</string>
 	<string name="accessibility_default">글로벌 시스템 설정에 따름</string>
@@ -38,13 +36,9 @@
 	<string name="settings_direction_style_descr">이동하면서 상대적인 방향을 표현하는스타일을 선택합니다</string>
 	<string name="auto_announce_on">자동알림 시작</string>
 	<string name="auto_announce_off">자동알림 정지</string>
-	<string name="scroll_map_by_gestures_descr">터치스크린에서 제스쳐를 통해 지도를 스크롤합니다</string>
-	<string name="scroll_map_by_gestures">자연스런 지도 스크롤</string>
 	<string name="i_am_here">현재 나의 위치</string>
 	<string name="zoom_by_trackball_descr">수평으로 트랙볼을 움직여 지도의 확대와 축소를 변경합니다</string>
 	<string name="zoom_by_trackball">줌 제어를 위한 트랙볼 사용</string>
-	<string name="use_short_object_names_descr">터치 탐색 모드에서 짧은 개체 이름을 사용합니다</string>
-	<string name="use_short_object_names">개체 이름 사용</string>
 	<string name="accessibility_preferences_descr">접근성(내게 필요한 옵션) 관련 선호도를 선택합니다</string>
 	<string name="shared_string_accessibility">접근성</string>
 	

OsmAnd/res/values-lt/strings.xml

@@ -104,8 +104,6 @@
     <string name="back_to_location">Atgal į vietą</string>
     <string name="shared_string_help">Pagalba</string>
 
-    <string name="accessibility_extensions_descr">Prieigos plėtiniai skirti senesnėms Android versijoms</string>
-    <string name="accessibility_extensions">Prieigos plėtiniai</string>
     <string name="accessibility_mode">Prieigos režimas</string>
     <string name="accessibility_mode_descr">Įjungia prieigos savybes</string>
     <string name="shared_string_on">Įjungta</string>
@@ -150,13 +148,9 @@
     <string name="settings_direction_style_descr">Pasirinkite stilių, kuriuo bus duodami reliatyvios krypties nurodymai važiuojant</string>
     <string name="auto_announce_on">Pradėti automatinį pranešinėjimą</string>
     <string name="auto_announce_off">Stabdyti automatinį pranešinėjimą</string>
-    <string name="scroll_map_by_gestures_descr">Stumdyti žemėlapį judesiais ant ekrano</string>
-    <string name="scroll_map_by_gestures">Natūralus žemėlapio slinkimas</string>
     <string name="i_am_here">Aš čia</string>
     <string name="zoom_by_trackball_descr">Keisti žemėlapio didinimą horizontaliais rutulio valdiklio judesiais</string>
     <string name="zoom_by_trackball">Naudoti rytulio valdiklį žemėlapio didinimo valdymui</string>
-    <string name="use_short_object_names_descr">Rodyti trumpus objektų pavadinimus tyrinėjimo režime</string>
-    <string name="use_short_object_names">Naudoti objektų pavadinimus</string>
     <string name="accessibility_preferences_descr">Su prieiga susiję nustatymai</string>
     <string name="shared_string_accessibility">Prieiga</string>
     <string name="rendering_out_of_memory">Pasirinktos vietos atvaizdavimui nepakanka atminties</string>

OsmAnd/res/values-lv/strings.xml

@@ -27,8 +27,6 @@
   <string name="back_to_location">Atgriezties atrašanās vietā</string>
   <string name="shared_string_help">Palīdzība</string>
   
-  <string name="accessibility_extensions_descr">Pieejamības paplašinājumi vecākām Android versijām</string>
-  <string name="accessibility_extensions">Pieejamības paplašinājumi</string>
   <string name="accessibility_mode">Pieejamības režīms</string>
   <string name="accessibility_mode_descr">Ieslēdz pieejamības iespējas</string>
   <string name="shared_string_on">Ieslēgts</string>
@@ -73,13 +71,9 @@
   <string name="settings_direction_style_descr">Izvēlaties relatīvās virziena norādes izteiksmes stilus kustības laikā</string>
   <string name="auto_announce_on">Sākt automātisku ziņošanu</string>
   <string name="auto_announce_off">Pārtraukt automātisku ziņošanu</string>
-  <string name="scroll_map_by_gestures_descr">Ritināt karti ar kustībām uz ekrāna</string>
-  <string name="scroll_map_by_gestures">Dabīga kartes ritināšana</string>
   <string name="i_am_here">Es esmu šeit</string>
   <string name="zoom_by_trackball_descr">Mainīt mērogu ar horizontālā rulīša kustībām</string>
   <string name="zoom_by_trackball">Mērogošana ar rullīti</string>
-  <string name="use_short_object_names_descr">Lietot īsos objektu nosaukumus pieskārienu skata režīmā</string>
-  <string name="use_short_object_names">Lietot objektu vārdus</string>
   <string name="accessibility_preferences_descr">Ar pieejamību saistītās izvēles</string>
   <string name="shared_string_accessibility">Pieejamība</string>
   <string name="rendering_out_of_memory">Nepietiek atmiņas, lai attēlotu izvēlēto apgabalu</string>

OsmAnd/res/values-nb/strings.xml

@@ -128,8 +128,6 @@
     <string name="info_button">Info</string>
     <string name="back_to_location">Tilbake til posisjon</string>
 
-    <string name="accessibility_extensions_descr">Tilgjengelighetsmoduler for gamle Android-versjoner</string>
-    <string name="accessibility_extensions">Tilgjengelighetsmoduler</string>
     <string name="accessibility_mode">Tilgjengelighetsmodus</string>
     <string name="accessibility_mode_descr">Slår på tilgjengelighetsfunksjonene</string>
     <string name="shared_string_on">På</string>
@@ -174,13 +172,9 @@
     <string name="settings_direction_style_descr">Velg stil til å uttrykke relative retninger under bevegelse</string>
     <string name="auto_announce_on">Start auto-annonsering</string>
     <string name="auto_announce_off">Stopp auto-annonsering</string>
-    <string name="scroll_map_by_gestures_descr">Rull kartet med bevegelser på berøringsskjermen</string>
-    <string name="scroll_map_by_gestures">Naturlig kartrulling</string>
     <string name="i_am_here">Jeg er her</string>
     <string name="zoom_by_trackball_descr">Endre kartzooming ved horisontale styrekulebevegelser</string>
     <string name="zoom_by_trackball">Bruk styrekule for zoomkontroll</string>
-    <string name="use_short_object_names_descr">Bruk korte objektnavn i berøringsmodus</string>
-    <string name="use_short_object_names">Bruk objektnavn</string>
     <string name="accessibility_preferences_descr">Tilgjengelighetsrelaterte innstillinger</string>
     <string name="shared_string_accessibility">Tilgjengelighet</string>
     <string name="rendering_out_of_memory">Ikke nok prosessminne til å vise valgt område</string>
@@ -275,7 +269,7 @@
     <string name="local_index_mi_restore">Aktiver</string>
     <string name="local_index_mi_backup">Deaktiver</string>
 
-    <string name="local_index_mi_reload">Last på nytt fra sd-kort</string>
+    <string name="local_index_mi_reload">Last på nytt fra SD-kort</string>
     <string name="shared_string_download">Last ned</string>
 
     <string name="local_index_poi_data">Interessepunkt-data</string>
@@ -571,7 +565,7 @@
     <string name="edit_filter_delete_message">Filter {0} har blitt slettet</string>
     <string name="edit_filter_create_message">Filter {0} har blitt opprettet</string>
 
-    <string name="email">E-post</string>
+    <string name="email">e-post</string>
     <string name="map_widget_gps_info">GPS-info</string>
     <string name="access_arrival_time">Ankomsttid</string>
     <string name="prefer_motorways">Foretrekk motorveier</string>
@@ -702,7 +696,7 @@
     <string name="lang_hr">Kroatisk</string>
     <string name="calculate_osmand_route_without_internet">Beregn OsmAnd-rutesegment uten internett</string>
     <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd-rute for første og siste rutesegment</string>
-    <string name="osmo_settings_uuid">Unik enhets-id</string>
+    <string name="osmo_settings_uuid">Unik enhets-ID</string>
     <string name="osmo_settings_descr">Still inn overvåking og personlig overvåkingskanal</string>
     <string name="osmo_plugin_name">OpenStreetMap-overvåking</string>
     <string name="osmo_settings">OsMo</string>
@@ -713,7 +707,7 @@
     <string name="rendering_attr_showCycleRoutes_name">Vis sykkelruter</string>
     <string name="show_zoom_buttons_navigation_descr">Vis zoom-knapper under navigering</string>
     <string name="show_zoom_buttons_navigation">Vis zoom-knapper</string>
-    <string name="map_widget_plain_time">Gjeldende tid</string>
+    <string name="map_widget_plain_time">Nåtid</string>
     <string name="osmo_edit_color">Visningsfarge</string>
     <string name="always_center_position_on_map">Vis posisjon alltid i midten</string>
     <string name="guidance_preferences_descr">Navigeringsinnstillinger</string>
@@ -797,7 +791,7 @@
     <string name="gpx_wpt">Rutepunkt</string>
     <string name="voice_pref_title">Tale</string>
     <string name="misc_pref_title">Diverse</string>
-    <string name="localization_pref_title">Lokaltilpassing</string>
+    <string name="localization_pref_title">Lokaltilpasning</string>
     <string name="lang_al">Albansk</string>
     <string name="lang_ar">Arabisk</string>
     <string name="lang_fa">Persisk</string>
@@ -858,7 +852,7 @@
     <string name="incomplete_locale">ufullstendig</string>
     <string name="context_menu_item_add_waypoint">Legg til GPX-rutepunkt</string>
     <string name="voice_is_not_available_title">Ingen taleveiledning valgt</string>
-    <string name="select_max_zoom_preload_area">Velg maksimum zoom til å forhåndslaste</string>
+    <string name="select_max_zoom_preload_area">Velg maksimalt zoomnivål å forhåndslaste</string>
     <string name="voice_data_initializing">Initialiserer taledata…</string>
     <string name="update_poi_is_not_available_for_zoom">Oppdatering av interessepunkter er ikke tilgjengelig ved lave zoomnivåer</string>
     <string name="arrived_at_destination">Du har ankommet ditt reisemål</string>
@@ -932,7 +926,7 @@
     <string name="srtm_paid_version_title">Programtillegg for koter</string>
     <string name="av_settings_descr">Still inn lyd og video</string>
     <string name="av_settings">"Lyd/video-innstillinger "</string>
-    <string name="osmand_srtm_short_description_80_chars">OsmAnd-programtillegg for offline koter</string>
+    <string name="osmand_srtm_short_description_80_chars">OsmAnd-programtillegg for frakoblede koter</string>
     <string name="map_widget_distancemeasurement">Avstandsmåling</string>
 
     <string name="index_srtm_ele">Koter</string>
@@ -975,7 +969,7 @@
     <string name="loading_postcodes">Laster postnummer…</string>
     <string name="loading_data">Laster data…</string>
 	
-	<string name="srtm_plugin_description">"Dette programtillegget gir både et lag med koter og et lag med relieffskygger til å vises oppå standardkartet til OsmAnd. Denne funksjonen vil bli satt stor pris på av idrettsutøvere, turgåere og enhver som er interessert i relieff-strukturen til et landskap.
+	<string name="srtm_plugin_description">"Dette programtillegget gir både et lag med koter og et lag med skråningsskygger som kan vises vises oppå standardkartene til OsmAnd. Denne funksjonen vil bli satt stor pris på av idrettsutøvere, turgåere og enhver som er interessert i relieff-strukturen til et landskap.
 \n\nDe globale dataene (mellom 70 grader nord og 70 grader sør) er basert på målinger av SRTM (Shuttle Radar Topography Mission) og ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), et bildeinstrument ombord på Terra, flaggskipsatellitten til NASA\'s Earth Observing System. ASTER er et samarbeid mellom NASA, Japans finansdepartement, Trade and Industry (METI), og Japan Space Systems (J-spacesystems). "</string>
 
     <string name="first_time_msg">Takk for at du bruker OsmAnd. For mange funksjoner i dette programmet trenger du noen regionale offline-data som du kan laste ned via \'Innstillinger\' → \'Karthåndtering\'. Etterpå vil du være i stand til å se kart, finne adresser, lete etter interessepunkter og finne offentlig transport.</string>
@@ -1046,7 +1040,7 @@
     <string name="route_descr_destination">Reisemål</string>
     <string name="gpx_file_name">GPX-filnavn</string>
     <string name="osmand_distance_planning_plugin_name">Distansekalkulator &amp; planleggingsverktøy</string>
-    <string name="layer_hillshade">Relieffskyggelag</string>
+    <string name="layer_hillshade">Skråningsskyggelag</string>
 
     <string name="download_hillshade_maps">Relieffskygger</string>
 
@@ -1095,7 +1089,7 @@
     <string name="rendering_attr_roadStyle_name">Veistil</string>
     <string name="rendering_value_default_name">Standard</string>
     <string name="rendering_value_orange_name">Orange</string>
-    <string name="rendering_value_germanRoadAtlas_name">Tysk veiatlas</string>
+    <string name="rendering_value_germanRoadAtlas_name">Tyskt veiatlas</string>
     <string name="traffic_warning_railways">Jernbaneovergang</string>
     <string name="traffic_warning_pedestrian">Fotgjengerovergang</string>
     <string name="show_railway_warnings">Vis jernbaneoverganger</string>
@@ -1127,7 +1121,7 @@
     <string name="map_overlay_descr">Velg overleggskart</string>
     <string name="audionotes_plugin_name">Audio/video-notater</string>
     <string name="osm_settings">OSM-redigering</string>
-	<string name="osmand_srtm_long_description_1000_chars">"Dette programtillegget gir både et lag med koter og et lag med relieffskygger til å vises oppå standardkartet til OsmAnd. Denne funksjonen vil bli satt stor pris på av idrettsutøvere, turgåere og enhver som er interessert i relieff-strukturen til et landskap.
+	<string name="osmand_srtm_long_description_1000_chars">"Dette programtillegget gir både et lag med koter og et lag med skråningsskygger som kan vises oppå standardkartene til OsmAnd. Denne funksjonen vil bli satt stor pris på av idrettsutøvere, turgåere og enhver som er interessert i relieff-strukturen til et landskap.
 \n\nDe globale dataene (mellom 70 grader nord og 70 grader sør) er basert på målinger av SRTM (Shuttle Radar Topography Mission) og ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), et bildeinstrument ombord på Terra, flaggskipsatellitten til NASA\'s Earth Observing System. ASTER er et samarbeid mellom NASA, Japans finansdepartement, Trade and Industry (METI), og Japan Space Systems (J-spacesystems). "</string>
     <string name="plugin_ski_name">Skikartvisning</string>
     <string name="osmand_accessibility_description">Dette programtillegget gjør enhetens tilgjengelighetsfunksjoner tilgjengelige direkte i OsmAnd. Det muliggjør f.eks justering av talehastigheten for TTS-tale, innstilling av styrekors-skjermnavigering ved hjelp av en styrekule for zoomkontroll, eller bruke tekst-til-tale-tilbakemelding, f.eks auto-annonsering av din posisjon.</string>
@@ -1171,7 +1165,7 @@
     <string name="shared_string_help">Hjelp</string>
     <string name="shared_string_settings">Innstillinger</string>
     <string name="shared_string_history">Historikk</string>
-    <string name="shared_string_select_on_map">Velg på kart</string>
+    <string name="shared_string_select_on_map">Velg i kart</string>
     <string name="shared_string_save">Lagre</string>
     <string name="shared_string_save_as_gpx">Lagre som GPX-spor</string>
     <string name="shared_string_rename">Endre navn</string>
@@ -1263,8 +1257,8 @@
     <string name="shared_string_copy">Kopier</string>
     <string name="rendering_attr_hideHouseNumbers_name">Skjul husnumre</string>
     <string name="shared_string_release">Utgitt</string>
-    <string name="local_index_items_backuped">%1$d av %2$d element(er) vellykket deaktivert.</string>
+    <string name="local_index_items_backuped">Vellykket deaktivering av %1$d av %2$d element(er).</string>
-    <string name="local_index_items_deleted">%1$d av %2$d element(er) vellykket slettet.</string>
+    <string name="local_index_items_deleted">Vellykket sletting av %1$d av %2$d element(er).</string>
     <string name="local_index_items_restored">%1$d av %2$d element(er) vellykket aktivert.</string>
     <string name="local_index_no_items_to_do">Aksjon %1$s: Ingen elementer finnes</string>
     <string name="local_index_action_do">%1$s: %2$s element(er). Fortsette?</string>
@@ -1393,7 +1387,7 @@
     <string name="regions">Regioner</string>
     <string name="region_maps">Regionkart</string>
     <string name="world_maps">Verdenskart</string>
-    <string name="hillshade_layer_disabled">Relieffskyggelag deaktivert</string>
+    <string name="hillshade_layer_disabled">Skråningsskyggelag avskrudd</string>
     <string name="share_menu_location">Del posisjon</string>
     <string name="shared_string_send">Send</string>
     <string name="map_downloaded">Kart lastet ned</string>
@@ -1405,7 +1399,7 @@
     <string name="update_all">Oppdater alle (%1$s MB)</string>
     <string name="free_downloads_used">Gratis nedlastinger brukt</string>
     <string name="application_dir_description">Velg hvor du vil lagre kartfiler.</string>
-    <string name="enter_country_name">Oppfør navn på land</string>
+    <string name="enter_country_name">Oppgi navn på land</string>
     <string name="world_map_download_descr">Basiskart verden (som dekker hele verden ved lav zoom) mangler eller er utdatert. Vurder å laste ned Basiskart verden for et komplett miljø.</string>
     <string name="shared_string_qr_code">QR-kode</string>
     <string name="basemap_was_selected_to_download">Basiskart er nødvendig for at programmet skal fungere riktig og ble valgt for å laste ned.</string>
@@ -1526,8 +1520,8 @@
     <string name="recalculate_route">Beregn rute på nytt</string>
     <string name="no_map_markers_found">Legg til kartmarkører via kart</string>
     <string name="no_waypoints_found">Ingen rutepunkter funnet</string>
-    <string name="shared_string_move_up">Flytt opp</string>
+    <string name="shared_string_move_up">Flytt oppover</string>
-    <string name="shared_string_move_down">Flytt ned</string>
+    <string name="shared_string_move_down">Flytt nedover</string>
     <string name="finish_navigation">Avslutt navigering</string>
     <string name="avoid_road">Unngå vei</string>
     <string name="storage_directory_shared">Delt minne</string>
@@ -1549,4 +1543,66 @@
     <string name="looking_up_address">Ser etter adresse</string>
     <string name="cancel_route">Forkast rute</string>
     <string name="file_name_containes_illegal_char">Filnavn inneholder ulovlig tegn</string>
+<string name="rendering_value_thin_name">Tynt</string>
+    <string name="rendering_value_medium_name">Middels</string>
+    <string name="rendering_value_bold_name">Fet</string>
+    <string name="osmo_connect_to_group_id">Gruppe-ID</string>
+    <string name="osmo_connect_to_my_nickname">Kallenavn</string>
+    <string name="donations">Donasjoner</string>
+    <string name="number_of_recipients">Antall mottakere</string>
+    <string name="osm_live_subscribe_btn">Abonner</string>
+    <string name="osm_live_user_public_name">Offentlig navn</string>
+    <string name="osm_live_month_cost">Månedlig kostnad</string>
+    <string name="osm_live_month_cost_desc">Månedlig avdrag</string>
+    <string name="osm_live_active">Aktiv</string>
+    <string name="osm_live_not_active">Inaktiv</string>
+    <string name="osm_live_enter_email">Skriv inn en gyldig E-postadresse</string>
+    <string name="osm_live_enter_user_name">Skriv inn offentlig navn</string>
+    <string name="osm_live_subscription_settings">Abonnementsinnstillinger</string>
+    <string name="shared_string_logoff">Logg av</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Fargelegger i henhold til OSMC</string>
+    <string name="proxy_pref_title">Mellomtjener</string>
+    <string name="gpx_selection_number_of_points">" %1$s punkter"</string>
+    <string name="osmo_group_policy">Praksis</string>
+    <string name="osmo_connect_to_device_name">Brukernavn</string>
+    <string name="osmo_group_name">Gruppenavn</string>
+    <string name="osmo_connect_to_device">Lenk med enheten</string>
+    <string name="osmo_connect_to_group">Lenk med gruppe</string>
+    <string name="osmo_create_group">Opprett gruppe</string>
+    <string name="osmo_connected_devices">Tilkoblede enheter</string>
+    <string name="osmo_session_token">Øktsymbol: %1$s</string>
+    <string name="osmo_settings_debug">Feilrettingsinformasjon</string>
+    <string name="accessibility_options">Tilgjengelighetsvalg</string>
+    <string name="local_openstreetmap_act_title">OSM-endringer</string>
+    <string name="download_wikipedia_maps">Wikipedia</string>
+    <string name="intermediate_points_change_order">Endre rekkefølge</string>
+    <string name="av_def_action_choose">Velg på forespørsel</string>
+    <string name="av_def_action_video">Ta opp video</string>
+    <string name="av_def_action_audio">Ta opp lyd</string>
+    <string name="recording_context_menu_delete">Slett opptak</string>
+    <string name="recording_context_menu_play">Spill av</string>
+    <string name="int_continuosly">Sammenhengende</string>
+    <string name="gpxup_trackable">Sporbar</string>
+    <string name="gpxup_identifiable">Identifiserbar</string>
+    <string name="context_menu_item_delete_parking_point">Slett en parkeringsmarkering</string>
+    <string name="asap">Omgående</string>
+    <string name="share_route_subject">Rute delt via OsmAnd</string>
+    <string name="confirm_interrupt_download">Ønsker du å avbryte nedlasting av fila?</string>
+    <string name="gpx_tags_txt">Merkelapper</string>
+    <string name="default_buttons_support">Brukerstøtte</string>
+    <string name="first_time_continue">Senere</string>
+    <string name="transport_to_go_after">tidligere distanse</string>
+    <string name="transport_to_go_before">påfølgende distanse</string>
+    <string name="transport_stops_to_pass">stopp å passere</string>
+    <string name="finished_task">Fullført</string>
+    <string name="poi_action_delete">slett</string>
+    <string name="poi_error_io_error_template">I/O-feil under utførelse av handlingen {0}.</string>
+    <string name="user_hates_app_get_feedback">Fortell oss hvorfor.</string>
+    <string name="failed_to_upload">Klarte ikke å laste opp</string>
+    <string name="buy">KJØP</string>
+    <string name="faq_item">O-S-S</string>
+    <string name="number_of_edits">Antall endringer</string>
+    <string name="number_of_contributors">Antall bidragsytere</string>
+    <string name="morning">Morgen</string>
+    <string name="night">Natt</string>
     </resources>

OsmAnd/res/values-nl/strings.xml

@@ -39,8 +39,6 @@
   <string name="info_button">Info</string>
   <string name="back_to_location">Terug naar locatie</string>
   
-  <string name="accessibility_extensions_descr">Toegankelijkheidsmodules voor oude Android versies</string>
-  <string name="accessibility_extensions">Toegankelijkheidsmodules</string>
   <string name="accessibility_mode">Toegankelijkheidsmodus</string>
   <string name="accessibility_mode_descr">Zet toegankelijkheidsmodus aan</string>
   <string name="accessibility_default">Gelijk aan systeeminstelling</string>
@@ -82,13 +80,9 @@
   <string name="settings_direction_style_descr">Kies stijl van richtingsaanduidingen tijdens het verplaatsen</string>
   <string name="auto_announce_on">Start automatische aankondigingen</string>
   <string name="auto_announce_off">Stop automatische aankondigingen</string>
-  <string name="scroll_map_by_gestures_descr">Verschuif de kaart door beweging van het scherm</string>
-  <string name="scroll_map_by_gestures">Natuurlijke kaartverschuivingen</string>
   <string name="i_am_here">Hier ben ik</string>
   <string name="zoom_by_trackball_descr">Zoom kaart door trackball horizontaal te bewegen</string>
   <string name="zoom_by_trackball">Gebruik trackball om te zoomen</string>
-  <string name="use_short_object_names_descr">Gebruik korte objectnamen in aanraakmodus</string>
-  <string name="use_short_object_names">Gebruik korte objectnamen</string>
   <string name="accessibility_preferences_descr">Toegankelijkheidsgerelateerde instellingen</string>
   <string name="shared_string_accessibility">Toegankelijkheid</string>
   <string name="rendering_out_of_memory">Niet genoeg werkgeheugen voor weergave van het geselecteerde gebied</string>
@@ -1483,14 +1477,14 @@
     <string name="osmo_group_by_invite">Alleen toegang met uitnodiging</string>
     <string name="osmo_auth_error_short">Aanmelding mislukt</string>
     <string name="osmo_auth_error">OsMo aanmeldings fout: %1$s.\nMogelijk is de service tijdelijk niet beschikbaar of is uw registratie verlopen.\nWilt u verder gaan met een nieuwe registratie?</string>
-    <string name="rendering_attr_hideBuildings_name">Verberg gebouwen</string>
+    <string name="rendering_attr_hideBuildings_name">Gebouwen</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Verberg voetpaden</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Voet- en fietspaden</string>
-    <string name="rendering_attr_hideText_name">Verberg tekst</string>
+    <string name="rendering_attr_hideText_name">Tekst</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Verberg bossen en beplanting</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Bossen en beplanting</string>
     <string name="rendering_attr_buildings15zoom_name">Gebouwen tonen vanaf zoomstap 15</string>
     <string name="rendering_attr_moreDetailed_name">Toon meer details</string>
     <string name="rendering_attr_lessDetailed_name">Minder details</string>
-    <string name="rendering_attr_hideAccess_name">Toegankelijkheid niet tonen</string>
+    <string name="rendering_attr_hideAccess_name">Toegangsbeperkingen</string>
     <string name="rendering_attr_showAccess_name">Toegangsbeperkingen tonen</string>
     <string name="rendering_attr_showSurfaceGrade_name">Kwaliteit van wegen tonen</string>
     <string name="rendering_attr_showSurfaces_name">Wegoppervlak tonen</string>
@@ -1827,7 +1821,7 @@
 	<string name="shared_string_message">Bericht</string>
 	<string name="shared_string_do_not_use">Niet gebruiken</string>
 	<string name="shared_string_address">Adres</string>
-	<string name="rendering_attr_hideHouseNumbers_name">Verberg huisnummers</string>
+	<string name="rendering_attr_hideHouseNumbers_name">Huisnummers</string>
     <string name="application_dir_change_warning3">Moet OsmAnd de gegevensbestanden ook naar de nieuwe locatie kopiëren?</string>
     <string name="specified_directiory_not_writeable">In de opgegeven directory kunnen geen kaarten opgeslagen worden</string>
 	<string name="copying_osmand_file_failed">Het kopiëren van bestanden is niet gelukt</string>    
@@ -2058,7 +2052,7 @@
     <string name="map_legend">Legenda</string>
 <string name="read_more">Meer lezen</string>
     <string name="whats_new">Wat is er nieuw in</string>
-    <string name="rendering_attr_hideProposed_name">Verberg voorgestelde objecten</string>
+    <string name="rendering_attr_hideProposed_name">Voorgestelde objecten</string>
     <string name="share_osm_edits_subject">Via OsmAnd gedeelde OSM-bewerkingen</string>
     <string name="lang_nds">Nederduits</string>
     <string name="lang_mk">Macedonisch</string>
@@ -2163,7 +2157,7 @@
     <string name="item_removed">Item verwijderd</string>
     <string name="n_items_removed">items verwijderd</string>
     <string name="shared_string_undo_all">Alles terugzetten</string>
-    <string name="rendering_attr_hideIcons_name">Verberg POI-iconen</string>
+    <string name="rendering_attr_hideIcons_name">POI-iconen</string>
     <string name="switch_start_finish">Start en bestemming verwisselen</string>
     <string name="number_of_contributors">Aantal Bijdragers</string>
     <string name="number_of_edits">Aantal Bewerkingen</string>
@@ -2174,7 +2168,7 @@
     <string name="shared_string_select">Blokkeer...</string>
     <string name="reports_for">Verslag voor:</string>
 <string name="data_is_not_available">Gegevens niet beschikbaar</string>
-    <string name="rendering_attr_hideUnderground_name">Verberg ondergrondse objecten</string>
+    <string name="rendering_attr_hideUnderground_name">Ondergrondse objecten</string>
     <string name="shared_string_read_more">Lees meer...</string>
     <string name="shared_string_status">Status</string>
     <string name="shared_string_save_changes">Wijzigingen opslaan</string>
@@ -2249,4 +2243,6 @@
     <string name="rendering_value_thin_name">Dun</string>
     <string name="rendering_value_medium_name">Normaal</string>
     <string name="rendering_value_bold_name">Vet</string>
+    <string name="map_mode">Dag-Nacht stijl</string>
+    <string name="number_of_gpx_files_selected_pattern">%s GPX-files geselecteerd</string>
     </resources>

OsmAnd/res/values-pl/strings.xml

@@ -660,8 +660,6 @@
     <string name="back_to_location">Powróć do pozycji</string>
     <string name="shared_string_help">Pomoc</string>
 
-    <string name="accessibility_extensions_descr">Rozszerzenia ułatwienia dostępu dla starych wersji Androida</string>
-    <string name="accessibility_extensions">Rozszerzenia ułatwień dostępu</string>
     <string name="accessibility_mode">Tryb ułatwień dostępu</string>
     <string name="accessibility_mode_descr">Przełącza funkcje ułatwień dostępu</string>
     <string name="shared_string_on">Włączone</string>
@@ -706,13 +704,9 @@
     <string name="settings_direction_style_descr">Wybierz styl określania kierunków względnych podczas ruchu</string>
     <string name="auto_announce_on">Włącz automatyczne ogłaszanie</string>
     <string name="auto_announce_off">Wyłącz automatyczne ogłaszanie</string>
-    <string name="scroll_map_by_gestures_descr">Przesuwaj mapę za pomocą gestów na ekranie dotykowym</string>
-    <string name="scroll_map_by_gestures">Naturalne przewijanie mapy</string>
     <string name="i_am_here">Jestem tutaj</string>
     <string name="zoom_by_trackball_descr">Zmienia stopień przybliżenia mapy poziomymi ruchami trackballa</string>
     <string name="zoom_by_trackball">Przybliżanie mapy za pomocą trackballa</string>
-    <string name="use_short_object_names_descr">Używa krótkich nazw obiektów w trybie eksploracji dotykowej</string>
-    <string name="use_short_object_names">Nazwy obiektów</string>
     <string name="accessibility_preferences_descr">Ustawienia ułatwień dostępu</string>
     <string name="shared_string_accessibility">Ułatwienia dostępu</string>
     <string name="use_fluorescent_overlays">Odblaskowe nakładki</string>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -1023,8 +1023,6 @@
 	<string name="info_button">Informação</string>
 	<string name="back_to_location">Voltar à posição</string>
 	
-	<string name="accessibility_extensions_descr">Extensões de acessibilidade para versões antigas do Android</string>
-	<string name="accessibility_extensions">Extensões de acessibilidade</string>
 	<string name="accessibility_mode">Modo de acessibilidade</string>
 	<string name="accessibility_mode_descr">Ativar as opções de acessibilidade</string>
 	<string name="accessibility_default">De acordo com a configuração do sistema global</string>
@@ -1062,13 +1060,9 @@
 	<string name="direction_style_clockwise">No sentido horário (12 setores)</string>
 	<string name="settings_direction_style">Estilo de direção</string>
 	<string name="settings_direction_style_descr">Escolher o estilo para expressar sentidos relativos ao mover</string>
-	<string name="scroll_map_by_gestures_descr">Deslizar na tela para mover o mapa</string>
-	<string name="scroll_map_by_gestures">Movimentação natural do mapa</string>
 	<string name="i_am_here">Estou aqui</string>
 	<string name="zoom_by_trackball_descr">Alterar zoom do mapa por movimentos horizontais do trackball</string>
 	<string name="zoom_by_trackball">Usar trackball para controle de zoom</string>
-	<string name="use_short_object_names_descr">Usar nomes curtos de objetos em modo de exploração por toque</string>
-	<string name="use_short_object_names">Usar nomes de objetos</string>
 	<string name="accessibility_preferences_descr">Preferências relacionadas com a acessibilidade</string>
     <string name="arrival_distance_factor_early">Adiantado</string>
     <string name="arrival_distance_factor_normally">Normal</string>

OsmAnd/res/values-pt/strings.xml

@@ -500,8 +500,6 @@
   <string name="back_to_location">Back to location</string>
   <string name="shared_string_help">Ajuda</string>
   
-  <string name="accessibility_extensions_descr">Extensões de acessibilidade para versões Android antigas</string>
-  <string name="accessibility_extensions">Extensões de acessibilidade</string>
   <string name="accessibility_mode">Modo de acessibilidade</string>
   <string name="accessibility_mode_descr">Activa as opções de acessibilidade</string>
   <string name="shared_string_on">Ligado</string>
@@ -546,13 +544,9 @@
   <string name="settings_direction_style_descr">Escolha o estilo para expressar sentidos relativos ao movimento</string>
   <string name="auto_announce_on">Começar auto-anunciar</string>
   <string name="auto_announce_off">Parar auto-anunciar</string>
-  <string name="scroll_map_by_gestures_descr">Usar gestos no ecrã táctil para mover o mapa</string>
-  <string name="scroll_map_by_gestures">Movimentação natural do mapa</string>
   <string name="i_am_here">Estou aqui</string>
   <string name="zoom_by_trackball_descr">Alterar zoom do mapa por movimentos horizontais da trackball</string>
   <string name="zoom_by_trackball">Usar trackball para controle de zoom</string>
-  <string name="use_short_object_names_descr">Use nomes curtos de objetos em modo de exploração por toque</string>
-  <string name="use_short_object_names">Usar nomes de objetos</string>
   <string name="accessibility_preferences_descr">Preferências relacionadas com a acessibilidade</string>
   <string name="shared_string_accessibility">Acessibilidade</string>
   <string name="use_fluorescent_overlays">Sobreposições Fluorescentes</string>

OsmAnd/res/values-ro/strings.xml

@@ -234,8 +234,6 @@
 	<string name="back_to_location">Înapoi la poziție</string>
 	<string name="shared_string_help">Ajutor</string>
 	
-	<string name="accessibility_extensions_descr">Extensii de accesibilitate pentru versiuni mai vechi de de Android</string>
-	<string name="accessibility_extensions">Extensii de accesibilitate</string>
 	<string name="accessibility_mode">Modul de accesibilitate</string>
 	<string name="accessibility_mode_descr">Activează funcțiile de accesibilitate</string>
 	<string name="shared_string_on">Pornit</string>
@@ -280,13 +278,9 @@
 	<string name="settings_direction_style_descr">Alegeți sistemul de exprimare a direcțiilor relative pe timpul deplasării</string>
 	<string name="auto_announce_on">Pornește anunțurile automate</string>
 	<string name="auto_announce_off">Oprește anunțurile automate</string>
-	<string name="scroll_map_by_gestures_descr">Defilați harta prin gesturi pe display</string>
-	<string name="scroll_map_by_gestures">Defilare automată hartă</string>
 	<string name="i_am_here">Sunt aici</string>
 	<string name="zoom_by_trackball_descr">Schimbați nivelul de zoom prin mișcări orizontale ale trackball-ului</string>
 	<string name="zoom_by_trackball">Folosește trackball-ul pentru controlul zoom-ului</string>
-	<string name="use_short_object_names_descr">Folosește prescurtări ale denumirilor în modul explorare a hărții</string>
-	<string name="use_short_object_names">Folosește prescurtări</string>
 	<string name="accessibility_preferences_descr">Preferințe pentru accesibilitate</string>
 	<string name="shared_string_accessibility">Accesibilitate</string>
 	<string name="rendering_out_of_memory">Nu există suficientă memorie disponibilă pentru a afișa zona selectată</string>

OsmAnd/res/values-sc/strings.xml

@@ -446,14 +446,14 @@
     <string name="gpx_monitoring_start">Inghitza sa registratzione GPX</string>
     <string name="gpx_monitoring_stop">Firma sa registratzione GPX</string>
     <string name="gpx_start_new_segment">Inghitza unu segmentu nou</string>
-    <string name="rendering_attr_hideBuildings_name">Cua sos edifìtzios</string>
+    <string name="rendering_attr_hideBuildings_name">Edifìtzios</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Cua sas istradas non carrabiles</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Istradas non carràbiles</string>
-    <string name="rendering_attr_hideText_name">Cua su testu</string>
+    <string name="rendering_attr_hideText_name">Testu</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Cua padentes e buschedos</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Padentes e buschedos</string>
     <string name="rendering_attr_buildings15zoom_name">Edifìtzios dae su zoom 15</string>
     <string name="rendering_attr_moreDetailed_name">Prus minujas (a sa minuda)</string>
     <string name="rendering_attr_lessDetailed_name">Minujas de mancu</string>
-    <string name="rendering_attr_hideAccess_name">Cua sas restritziones de atzessu</string>
+    <string name="rendering_attr_hideAccess_name">Restritziones de atzessu</string>
     <string name="rendering_attr_showAccess_name">Ammustra sas restritziones de atzessu</string>
     <string name="rendering_attr_showSurfaceGrade_name">Ammustra sa calidade de sas istradas</string>
     <string name="rendering_attr_showSurfaces_name">Ammustra su tipu de superfìtzie de sas istradas</string>
@@ -776,7 +776,6 @@
     <string name="direction_style_clockwise">Bùssola (12 setores)</string>
     <string name="settings_direction_style">Istile de sa diretzione</string>
     <string name="i_am_here">Deo so inoghe</string>
-    <string name="use_short_object_names">Imprea sos nùmenes de sos ogetos</string>
     <string name="accessibility_preferences_descr">Preferèntzias ligadas a s’atzessibilidade</string>
     <string name="shared_string_accessibility">Atzessibilidade</string>
     <string name="local_openstreetmap_uploading">Carrigamentu …</string>
@@ -891,8 +890,6 @@
     <string name="switch_to_raster_map_to_see">Peruna mapa vetoriale est disponìbile pro custa positzione. Ne podes iscarrigare una in Impostatziones (Amministra sos documentos de sas mapas), o colare a sas mapas in lìnia (abìlita sas mapas in lìnia pro lu fàghere).</string>
 
     <string name="support_new_features_descr">Faghe una donatzione pro tènnere funtzionalidades noas implementadas in s’àplicu</string>
-    <string name="accessibility_extensions_descr">Estensiones pro s’atzessibilidade pro versiones betzas de Android</string>
-    <string name="accessibility_extensions">Estensiones pro s’atzessibilidade</string>
     <string name="accessibility_default">Basada in supra de sas impostatziones globales de sistema</string>
     <string name="zoomOut">Ismanniamentu in segus</string>
     <string name="zoomIn">Ismanniamentu in antis</string>
@@ -906,11 +903,8 @@
     <string name="settings_direction_style_descr">Issèbera s’istile in su cale benint espressadas in movimentu sas diretziones relativas</string>
     <string name="auto_announce_on">Incumentza s’autosinnalatzione</string>
     <string name="auto_announce_off">Firma s’autosinnalatzione</string>
-    <string name="scroll_map_by_gestures_descr">Move sa mapa cun sos gestos in s’ischermu tàtile</string>
-    <string name="scroll_map_by_gestures">Iscurrimentu naturale de sa mapa</string>
     <string name="zoom_by_trackball_descr">Muda su zoom de sa mapa cun movimentos orizontales de sa trackball</string>
     <string name="zoom_by_trackball">Imprea sa trackball pro controllare su zoom</string>
-    <string name="use_short_object_names_descr">Imprea sos nùmenes curtzos de sos ogetos in sa modalidade esploratzione tàtile</string>
     <string name="arrival_distance_factor_early">Chitzo</string>
     <string name="arrival_distance_factor_normally">Normale</string>
     <string name="arrival_distance_factor_late">Tardu</string>
@@ -1752,7 +1746,7 @@
     <string name="rendering_value_highContrastRoads_name">Istradas a cuntrastu artu</string>
     <string name="storage_directory_multiuser">Memòria multi-impreadore</string>
     <string name="storage_directory">Memòria de sas mapas</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Cua sos nùmeros de sas domos</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Nùmeros de sas domos</string>
     <string name="routing_attr_height_name">Lìmite de artària</string>
     <string name="routing_attr_height_description">Dislinda s’artària de su veìculu permitida pro sas istradas</string>
     <string name="routing_attr_avoid_borders_description">Non rugrare sas fronteras intre sos istados</string>
@@ -1981,7 +1975,7 @@
     <string name="shared_string_update">Agiorna</string>
     <string name="read_more">Leghe àteru</string>
     <string name="whats_new">Ite b\'est de nou in</string>
-    <string name="rendering_attr_hideProposed_name">Cua sos ogetos propostos</string>
+    <string name="rendering_attr_hideProposed_name">Ogetos propostos</string>
     <string name="lang_nds">Bassu-tedescu</string>
     <string name="lang_mk">Matzèdone</string>
     <string name="lang_fy">Frisonu otzidentale</string>
@@ -2083,7 +2077,7 @@
     <string name="rec_split">Intervallu de registratzione</string>
     <string name="rec_split_title">Imprea un’intervallu de registratzione</string>
     <string name="switch_start_finish">Furria puntos de incumintzu e destinatzione</string>
-    <string name="rendering_attr_hideIcons_name">Cua sas iconas de sos PDI</string>
+    <string name="rendering_attr_hideIcons_name">Iconas de sos PDI</string>
     <string name="number_of_contributors">Nùmeru de cuntribuidores</string>
     <string name="number_of_edits">Nùmeru de modìficas</string>
     <string name="reports_for">Sinnala pro</string>
@@ -2093,7 +2087,7 @@
     <string name="add_time_span">Annanghe intervallu de tempus</string>
     <string name="road_blocked">Àndala blocada</string>
     <string name="shared_string_select">Ischerta</string>
-    <string name="rendering_attr_hideUnderground_name">Cua ogetos suta de terra</string>
+    <string name="rendering_attr_hideUnderground_name">Ogetos suta de terra</string>
     <string name="shared_string_read_more">Leghe àteru</string>
     <string name="find_parking">Agata unu parchègiu</string>
     <string name="shared_string_status">Istadu</string>
@@ -2170,4 +2164,6 @@
 <string name="rendering_value_thin_name">Fine</string>
     <string name="rendering_value_medium_name">Mesanu</string>
     <string name="rendering_value_bold_name">Grussu</string>
+    <string name="map_mode">Modalidade mapa</string>
+    <string name="number_of_gpx_files_selected_pattern">%s documentos GPX ischertados</string>
     </resources>

OsmAnd/res/values-sk/strings.xml

@@ -100,8 +100,6 @@
     <string name="show_ruler_level">Zobraziť pravítko</string>
     <string name="info_button">Info</string>
     <string name="back_to_location">Späť na umiestnenie</string>
-    <string name="accessibility_extensions_descr">Rozšírenia uľahčenia prístupu pre staršie verzie Androidu</string>
-    <string name="accessibility_extensions">Rozšírenia uľahčenia prístupu</string>
     <string name="accessibility_mode">Režim uľahčenia prístupu</string>
     <string name="accessibility_mode_descr">Zapnutie funkcií uľahčenia prístupu</string>
     <string name="accessibility_default">Podľa globálnych nastavení systému</string>
@@ -144,13 +142,9 @@
     <string name="settings_direction_style_descr">Výber štýlu na vyjadrenie relatívneho smerovania počas pohybu</string>
     <string name="auto_announce_on">Spustiť autom. oznamovanie</string>
     <string name="auto_announce_off">Zastaviť autom. oznamovanie</string>
-    <string name="scroll_map_by_gestures_descr">Posúvať mapu pohybmi po obrazovke</string>
-    <string name="scroll_map_by_gestures">Prirodzené posúvanie mapy</string>
     <string name="i_am_here">Tu som</string>
     <string name="zoom_by_trackball_descr">Zmeniť priblíženie mapy horizontálnymi pohybmi trackballu</string>
     <string name="zoom_by_trackball">Použiť trackball na približovanie</string>
-    <string name="use_short_object_names_descr">Použiť skrátené názvy objektov v režime prezerania dotykom</string>
-    <string name="use_short_object_names">Použiť názvy objektov</string>
     <string name="accessibility_preferences_descr">Predvoľby týkajúce sa uľahčenia prístupu</string>
     <string name="shared_string_accessibility">Uľahčenie prístupu</string>
     <string name="rendering_out_of_memory">Nedostatok procesnej pamäte na zobrazenie zvolenej oblasti</string>
@@ -1282,14 +1276,14 @@
     <string name="gpx_monitoring_start">Zapnúť zaznamenávanie GPX</string>
     <string name="gpx_monitoring_stop">Zastaviť zaznamenávanie GPX</string>
     <string name="gpx_start_new_segment">Začať nový segment</string>
-    <string name="rendering_attr_hideBuildings_name">Skryť budovy</string>
+    <string name="rendering_attr_hideBuildings_name">Budovy</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Skryť cesty, ktoré nie sú pre vozidlá</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Cesty, ktoré nie sú pre vozidlá</string>
-    <string name="rendering_attr_hideText_name">Skryť text</string>
+    <string name="rendering_attr_hideText_name">Text</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Skryť lesy a kríky</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Lesy a kríky</string>
     <string name="rendering_attr_buildings15zoom_name">Budovy pri priblížení 15</string>
     <string name="rendering_attr_moreDetailed_name">Viac detailov</string>
     <string name="rendering_attr_lessDetailed_name">Menej detailov</string>
-    <string name="rendering_attr_hideAccess_name">Skryť obmedzenia prístupu</string>
+    <string name="rendering_attr_hideAccess_name">Obmedzenia prístupu</string>
     <string name="rendering_attr_showAccess_name">Zobraziť obmedzenia prístupu</string>
     <string name="rendering_attr_showSurfaceGrade_name">Zobraziť kvalitu ciest</string>
     <string name="rendering_attr_showSurfaces_name">Zobraziť povrch ciest</string>
@@ -1603,7 +1597,7 @@
     <string name="storage_directory">Úložisko máp</string>
     <string name="shared_string_copy">Kopírovať</string>
     <string name="application_dir_change_warning3">Chcete aby OsmAnd skopíroval svoje údaje do nového cieľa?</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Skryť čísla domov</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Čísla domov</string>
     
     <string name="routing_attr_avoid_borders_description">Vyhnúť sa prekročeniu hranice do inej krajiny</string>
     <string name="routing_attr_height_name">Výškový limit</string>
@@ -1815,7 +1809,7 @@
     <string name="map_legend">Vysvetlivky k mape</string>
     <string name="shared_string_upload">Odoslať</string>
     <string name="shared_string_update">Aktualizovať</string>
-    <string name="rendering_attr_hideProposed_name">Skryť plánované objekty</string>
+    <string name="rendering_attr_hideProposed_name">Plánované objekty</string>
 
 <string name="read_more">Prečítať viac</string>
     <string name="whats_new">Čo je nové v</string>
@@ -1928,7 +1922,7 @@
     <string name="road_blocked">Cesta zablokovaná</string>
     <string name="shared_string_select">Vybrať</string>
     <string name="switch_start_finish">Vymeniť východzí a cieľový bod</string>
-    <string name="rendering_attr_hideIcons_name">Skryť ikony bodov záujmu (POI)</string>
+    <string name="rendering_attr_hideIcons_name">Ikony bodov záujmu (POI)</string>
     <string name="number_of_contributors">Počet prispievateľov</string>
     <string name="number_of_edits">Počet zmien</string>
     <string name="reports_for">Výkaz pre</string>
@@ -1936,7 +1930,7 @@
     <string name="shared_string_status">Stav</string>
     <string name="shared_string_save_changes">Uložiť zmeny</string>
     <string name="shared_string_email_address">E-mailová adresa</string>
-    <string name="rendering_attr_hideUnderground_name">Skryť podzemné objekty</string>
+    <string name="rendering_attr_hideUnderground_name">Podzemné objekty</string>
     <string name="shared_string_read_more">Prečítať viac</string>
     <string name="find_parking">Nájsť parkovanie</string>
     <string name="show_polygons">Zobraziť polygóny</string>
@@ -2011,4 +2005,6 @@
 <string name="rendering_value_thin_name">Tenké</string>
     <string name="rendering_value_medium_name">Stredné</string>
     <string name="rendering_value_bold_name">Tučné</string>
+    <string name="map_mode">Režim mapy</string>
+    <string name="number_of_gpx_files_selected_pattern">%s vybraných GPX súborov</string>
     </resources>

OsmAnd/res/values-sl/strings.xml

@@ -573,8 +573,6 @@
     <string name="back_to_location">Nazaj na mesto</string>
     <string name="shared_string_help">Pomoč</string>
 
-    <string name="accessibility_extensions_descr">Razširitve dostopnosti za starejše različice na Androidu</string>
-    <string name="accessibility_extensions">Razširitve dostopnosti</string>
     <string name="accessibility_mode">Način dostopnosti</string>
     <string name="accessibility_mode_descr">Vklopi zmožnosti dostopnosti</string>
     <string name="shared_string_on">Omogočeno</string>
@@ -609,12 +607,8 @@
     <string name="local_indexes_cat_tile">Spletni in shranjeni zemljevidi</string>
     <string name="map_online_data">Spletni in shranjeni zemljevidi</string>
     <string name="shared_string_clear">Počisti</string>
-    <string name="scroll_map_by_gestures_descr">Drsanje po zemljevidi s potezami na zaslonu na dotik</string>
-    <string name="scroll_map_by_gestures">Naravno drsenje zemljevida</string>
     <string name="zoom_by_trackball_descr">Spremeni povečavo zemljevida z vodoravnimi premiki sledilne kroglice</string>
     <string name="zoom_by_trackball">Uporabi sledilno kroglico za nadzor povečave</string>
-    <string name="use_short_object_names_descr">Uporabi kratka imena predmetov v načinu raziskovanja dotika</string>
-    <string name="use_short_object_names">Uporabi imena predmetov</string>
     <string name="accessibility_preferences_descr">Z dostopnostjo povezane možnosti</string>
     <string name="shared_string_accessibility">Dostopnost</string>
     <string name="rendering_out_of_memory">Ni dovolj pomnilnika za prikaz izbranega področja</string>

OsmAnd/res/values-sv/strings.xml

@@ -152,8 +152,6 @@
     <string name="gpx_description_txt">Beskrivning</string>
     <string name="validate_gpx_upload_name_pwd">Vänligen ange OSM användarnamn och lösenord för att ladda upp GPX-filer.</string>
 
-    <string name="accessibility_extensions_descr">Tillgänglighetstillägg för gamla Android-versioner</string>
-    <string name="accessibility_extensions">Tillgänglighetstillägg</string>
     <string name="accessibility_mode">Tillgänglighetsläge</string>
     <string name="accessibility_mode_descr">Sätter på tillgänglighetsfunktioner</string>
     <string name="shared_string_on">På</string>
@@ -264,13 +262,9 @@
     <string name="settings_direction_style_descr">Välj sätt att uttrycka relativa riktningar under rörelse</string>
     <string name="auto_announce_on">Börja meddela automatiskt</string>
     <string name="auto_announce_off">Sluta meddela automatiskt</string>
-    <string name="scroll_map_by_gestures_descr">Bläddra i kartan med gester på pekskärmen</string>
-    <string name="scroll_map_by_gestures">Naturlig kartrullning</string>
     <string name="i_am_here">Jag är här</string>
     <string name="zoom_by_trackball_descr">Ändra kartzoom med horisontell flyttning av styrkulan</string>
     <string name="zoom_by_trackball">Använd styrkula för zoom-kontroll</string>
-    <string name="use_short_object_names_descr">Använd korta objektnamn i \"touch exploration mode\"</string>
-    <string name="use_short_object_names">Använd objektnamn</string>
     <string name="accessibility_preferences_descr">Tillgänglighetsrelaterade inställningar</string>
     <string name="shared_string_accessibility">Tillgänglighet</string>
     <string name="rendering_out_of_memory">Inte tillräckligt med processminne för att visa valt område</string>
@@ -1393,7 +1387,7 @@
 
     <string name="osmo_not_signed_in">Inloggningen till OsMo misslyckades</string>
     <string name="osmo_group_by_invite">Anslut via inbjudan</string>
-    <string name="osmo_group_information_desc">" - Alla skapade grupper är offentliga! Om du vill vara anonym, anslut enheter direkt via Tracker-id-\n- Privata grupper är begränsade till åtta personer.\n- Grupper tas bort i fall av inaktivitet eller aktivitet av endast en (1) person under två veckor.\n- Du kan begränsa inträde i grupp (som t.ex. endast via inbjudan) men för att kontrollera gruppen måste du gå till adminkonsollen.\n- Om du behöver skapa en grupp med andra villkor kontakta http://osmo.mobi"</string>
+    <string name="osmo_group_information_desc">" - När du skapar en grupp, ge den ett namn och fyll i beskrivningen\n- Läs mer på webbplatsen https://osmo.mobi/g/new\n- Via en webbsajt kan du hantera en grupp och placera ut spår och punkter tillgängliga för alla\n- Vi tillåter inte grupper med endast 1 användare om det inte är en POI-grupp\n- Privata grupper är begränsade till 8 personer\n- Mer detaljer finns på webbsajten OsMo.mobi\n- Om du behöver skapa en grupp med andra villkor kontakta http://osmo.mobi "</string>
     <string name="osmo_group_information">Läs detta innan du skapar en grupp!</string>
     <string name="keep_navigation_service">Behåll</string>
     <string name="stop_navigation_service">Stoppa</string>
@@ -1414,14 +1408,14 @@
     <string name="gpx_monitoring_start">Starta GPX-loggning</string>
     <string name="gpx_monitoring_stop">Stoppa GPX-loggning</string>
     <string name="gpx_start_new_segment">Starta nytt segment</string>
-    <string name="rendering_attr_hideBuildings_name">Dölj byggnader</string>
+    <string name="rendering_attr_hideBuildings_name">Byggnader</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Visa endast vägar för motorfordon</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Vägar, inte för motorfordon</string>
-    <string name="rendering_attr_hideText_name">Dölj text</string>
+    <string name="rendering_attr_hideText_name">Text</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Dölj skog och vegetation</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Skog och vegetation</string>
     <string name="rendering_attr_buildings15zoom_name">Byggnader vid zoom 15</string>
     <string name="rendering_attr_moreDetailed_name">Fler detaljer</string>
     <string name="rendering_attr_lessDetailed_name">Färre detaljer</string>
-    <string name="rendering_attr_hideAccess_name">Dölj tillfartsinskränkningar</string>
+    <string name="rendering_attr_hideAccess_name">Tillfartsinskränkningar</string>
     <string name="rendering_attr_showAccess_name">Visa tillfartsinskränkningar</string>
     <string name="rendering_attr_showSurfaceGrade_name">Visa vägkvalitet</string>
     <string name="rendering_attr_showSurfaces_name">Visa vägbeläggning</string>
@@ -1747,7 +1741,7 @@
     <string name="storage_directory_default">Internminne</string>
     <string name="storage_directory">Kartlagring</string>
     <string name="shared_string_copy">Kopiera</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Dölj husnummer</string>
+    <string name="rendering_attr_hideHouseNumbers_name">Husnummer</string>
     <string name="routing_attr_avoid_borders_description">Undvik att korsa gränsen till ett annat land</string>
     <string name="routing_attr_height_name">Höjdgräns</string>
     <string name="use_fast_recalculation">Smart omräkning av rutt</string>
@@ -1967,7 +1961,7 @@
     <string name="feedback">Återkoppling</string>
     <string name="read_more">Läs mer</string>
     <string name="whats_new">Nyheter</string>
-    <string name="rendering_attr_hideProposed_name">Dölj föreslagna objekt</string>
+    <string name="rendering_attr_hideProposed_name">Föreslagna objekt</string>
 <string name="lang_nds">Lågtyska</string>
     <string name="lang_mk">Makedonska</string>
     <string name="lang_fy">Frisiska</string>
@@ -2064,7 +2058,7 @@
     <string name="item_removed">Post borttagen</string>
     <string name="n_items_removed">poster raderade</string>
     <string name="shared_string_undo_all">ÅNGRA ALLA</string>
-    <string name="rendering_attr_hideIcons_name">Dölj POI-ikoner</string>
+    <string name="rendering_attr_hideIcons_name">POI-ikoner</string>
     <string name="switch_start_finish">Skifta startpunkt och destination</string>
     <string name="number_of_contributors">Antal bidragsgivare</string>
     <string name="number_of_edits">Antal redigeringar</string>
@@ -2075,7 +2069,7 @@
     <string name="add_time_span">Lägg till tidsspann</string>
     <string name="road_blocked">Blockerad väg</string>
     <string name="data_is_not_available">Inga data tillgängliga</string>
-    <string name="rendering_attr_hideUnderground_name">Dölj underjordiska objekt</string>
+    <string name="rendering_attr_hideUnderground_name">Underjordiska objekt</string>
     <string name="shared_string_read_more">Läs mer</string>
     <string name="rec_split_storage_size">Lagringsutrymme</string>
     <string name="shared_string_email_address">E-postadress</string>

OsmAnd/res/values-tr/strings.xml

@@ -538,8 +538,6 @@
 	<string name="show_ruler_level">Ekran cetveli</string>	
 	<string name="info_button">Bilgi</string>
 	<string name="back_to_location">Konuma geri dön</string>
-	<string name="accessibility_extensions_descr">Eski Android sürümleri için Erişilebilirlik uzantıları</string>
-	<string name="accessibility_extensions">Erişilebilirlik uzantıları</string>
 	<string name="accessibility_mode">Erişilebilirlik modu</string>
 	<string name="accessibility_mode_descr">Erişilebilirlik özelliklerine dön</string>
 	<string name="accessibility_default">Global sistem ayarına göre</string>
@@ -578,12 +576,8 @@
 	<string name="settings_direction_style_descr">Hareket ederken göreceli yönleri ifade etmek için bir stil seçin</string>
 	<string name="auto_announce_on">Duyuruyu otomatik başlat</string>
 	<string name="auto_announce_off">Duyuruyu otomatik durdur</string>
-	<string name="scroll_map_by_gestures_descr">Dokunmatik ekrandaki hareketler ile ilerleyin haritası</string>
-	<string name="scroll_map_by_gestures">Doğal harita kaydırma</string>
 	<string name="zoom_by_trackball_descr">Yatay topunu hamle ile yakınlaştırarak haritayı değiştirme</string>
 	<string name="zoom_by_trackball">Zoom kontrolü için topunu kullan</string>
-	<string name="use_short_object_names_descr">Dokunarak keşfetme modunda kısa nesne adları kullan</string>
-	<string name="use_short_object_names">Nesne adları kullan</string>
 	<string name="accessibility_preferences_descr">Erişilebilirlik ile ilgili tercihler</string>
 	<string name="shared_string_accessibility">Erişilebilirlik</string>
 	<string name="rendering_out_of_memory">Seçilen alanı görüntülemek için işlem belleği yeterli değil</string>

OsmAnd/res/values-uk/strings.xml

@@ -77,8 +77,6 @@
   <string name="back_to_location">Повернутись</string>
   <string name="shared_string_help">Допомога</string>
   
-  <string name="accessibility_extensions_descr">Допоміжні можливості для старих версій Android</string>
-  <string name="accessibility_extensions">Розширення допоміжних можливостей</string>
   <string name="accessibility_mode">Режим допоміжних можливостей</string>
   <string name="accessibility_mode_descr">Вмикає допоміжні можливості</string>
   <string name="shared_string_on">Увімкнено</string>
@@ -123,13 +121,9 @@
   <string name="settings_direction_style_descr">Виберіть стиль вказівника відносних напрямків під час руху</string>
   <string name="auto_announce_on">Увімкнути автоповідомлення</string>
   <string name="auto_announce_off">Вимкнути автоповідомлення</string>
-  <string name="scroll_map_by_gestures_descr">Пересувати карту жестами на сенсорному екрані</string>
-  <string name="scroll_map_by_gestures">Звичайне управління картою</string>
   <string name="i_am_here">Я тут</string>
   <string name="zoom_by_trackball_descr">Змінювати масштаб горизонтальним рухом трекбола</string>
   <string name="zoom_by_trackball">Використовувати трекбол для зміни масштабу</string>
-  <string name="use_short_object_names_descr">Використовувати короткі назви для об’єктів при огляді мапи</string>
-  <string name="use_short_object_names">Використовувати короткі назви для об’єктів</string>
   <string name="accessibility_preferences_descr">Налаштування для невізуального доступу</string>
   <string name="shared_string_accessibility">Спеціальні можливості</string>
   <string name="rendering_out_of_memory">Недостатньо пам’яті для процесу показу мапи для виділеної ділянки</string>

OsmAnd/res/values-zh-rCN/strings.xml

@@ -135,8 +135,6 @@
 	<string name="info_button">信息</string>
 	<string name="shared_string_help">帮助</string>
 	
-	<string name="accessibility_extensions_descr">无障碍扩展旧的Android版本</string>
-	<string name="accessibility_extensions">无障碍扩展</string>
 	<string name="accessibility_mode">无障碍模式</string>
 	<string name="accessibility_mode_descr">打开辅助功能</string>
 	<string name="shared_string_on">开</string>
@@ -169,9 +167,7 @@
 	<string name="accuracy">准确性</string>
 	<string name="altitude">海拔</string>
 	<string name="no_info">没有资料</string>
-	<string name="scroll_map_by_gestures">天然地图滚动</string>
 	<string name="i_am_here">我在这里</string>
-	<string name="use_short_object_names">使用对象名</string>
 	<string name="accessibility_preferences_descr">无障碍相关的喜好</string>
 	<string name="shared_string_accessibility">无障碍</string>
 	<string name="offline_edition">离线编辑</string>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -218,8 +218,6 @@
     <string name="info_button">資訊</string>
     <string name="back_to_location">回到目前位置</string>
 
-    <string name="accessibility_extensions_descr">給舊 Android 版本的無障礙擴展</string>
-    <string name="accessibility_extensions">無障礙擴展</string>
     <string name="accessibility_mode">無障礙模式</string>
     <string name="accessibility_mode_descr">開啟無障礙功能</string>
     <string name="shared_string_on">開啟</string>
@@ -264,13 +262,9 @@
     <string name="settings_direction_style_descr">在行進當中，以選擇的樣式來表示相對的方向</string>
     <string name="auto_announce_on">啟動自動告知</string>
     <string name="auto_announce_off">關閉自動告知</string>
-    <string name="scroll_map_by_gestures_descr">在觸控螢幕上用手勢移動地圖</string>
-    <string name="scroll_map_by_gestures">自然的捲動地圖</string>
     <string name="i_am_here">我的位置</string>
     <string name="zoom_by_trackball_descr">以軌跡球水平移動改變地圖縮放</string>
     <string name="zoom_by_trackball">以軌跡球控制地圖縮放</string>
-    <string name="use_short_object_names_descr">在觸摸探索模式中用簡短的物件名稱</string>
-    <string name="use_short_object_names">使用物件名稱</string>
     <string name="accessibility_preferences_descr">無障礙相關的偏好設定</string>
     <string name="shared_string_accessibility">無障礙</string>
     <string name="rendering_out_of_memory">處理記憶體不足，無法顯示已選取的區域</string>
@@ -1393,14 +1387,14 @@
     <string name="osmo_not_signed_in">OsMo 登入失敗</string>
     <string name="osmo_auth_error_short">授權失敗</string>
     <string name="osmo_auth_error">OsMo 授權時遇到錯誤：%1$s。\n這可能是服務臨時當機或是您的註冊已過期。\n您想要繼續進行和新的註冊嗎？</string>
-    <string name="rendering_attr_hideBuildings_name">隱藏建築物</string>
+    <string name="rendering_attr_hideBuildings_name">建築物</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">隱藏非車輛的公路</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">非車輛的公路</string>
-    <string name="rendering_attr_hideText_name">隱藏文字</string>
+    <string name="rendering_attr_hideText_name">文字</string>
-    <string name="rendering_attr_hideWoodScrubs_name">隱藏樹木和灌樹叢</string>
+    <string name="rendering_attr_hideWoodScrubs_name">樹木和灌樹叢</string>
     <string name="rendering_attr_buildings15zoom_name">建築物在 15 級縮放</string>
     <string name="rendering_attr_moreDetailed_name">更多細節</string>
     <string name="rendering_attr_lessDetailed_name">較少細節</string>
-    <string name="rendering_attr_hideAccess_name">隱藏存取限制</string>
+    <string name="rendering_attr_hideAccess_name">存取限制</string>
     <string name="rendering_attr_showAccess_name">顯示存取限制</string>
     <string name="rendering_attr_showSurfaceGrade_name">顯示道路品質</string>
     <string name="rendering_attr_showSurfaces_name">顯示路面</string>
@@ -1739,7 +1733,7 @@
     <string name="storage_directory_default">內部記憶體</string>
     <string name="storage_directory">地圖存儲</string>
     <string name="shared_string_copy">複製</string>
-    <string name="rendering_attr_hideHouseNumbers_name">隱藏門牌號碼</string>
+    <string name="rendering_attr_hideHouseNumbers_name">門牌號碼</string>
     
     <string name="routing_attr_avoid_borders_description">防止越過邊界進入別國</string>
     <string name="routing_attr_height_name">高度限制</string>
@@ -1965,7 +1959,7 @@
     
     
     <string name="shared_string_update">更新</string>
-    <string name="rendering_attr_hideProposed_name">隱藏已提出的物件</string>
+    <string name="rendering_attr_hideProposed_name">已提出的物件</string>
 <string name="read_more">讀取更多</string>
     <string name="whats_new">有什麼新的在</string>
     <!-- string name="map_legend_item_description">圖例為 OsmAnd 預設的地圖樣式，網路需連接以去顯示</string -->
@@ -2071,7 +2065,7 @@
     <string name="item_removed">項目已移除</string>
     <string name="n_items_removed">項目已刪除</string>
     <string name="shared_string_undo_all">全部取消</string>
-    <string name="rendering_attr_hideIcons_name">隱藏 POI 圖示</string>
+    <string name="rendering_attr_hideIcons_name">POI 圖示</string>
     <string name="switch_start_finish">起始點與目的地對調</string>
     <string name="number_of_contributors">貢獻者數</string>
     <string name="number_of_edits">編輯次數</string>
@@ -2082,7 +2076,7 @@
     <string name="add_time_span">增加時間跨度</string>
     <string name="road_blocked">道路堵塞</string>
     <string name="data_is_not_available">無法獲得資料</string>
-    <string name="rendering_attr_hideUnderground_name">隱藏地面下的物件</string>
+    <string name="rendering_attr_hideUnderground_name">地面下的物件</string>
     <string name="shared_string_read_more">讀取更多</string>
     <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd 地圖與導航 - 無須網路連線即可在地圖上尋找地點和計算路線。在去一個陌生的地方旅行前，下載一個國家的地圖，找到地點和路線。基本選項： • 200個國家的詳細地圖 • 離線導航附帶語音提示 • 在離線模式下的地址查尋 • 在地圖上關於所在地的資訊：感興趣的地方、咖啡廳、停車場、商店 • 增加場所到我的收藏 • 開車，騎自行車和行人導航附加選項：• 有能力去查看和記錄 GPX 軌跡 • 維基百科的 POI 介紹 • 加入照片、音訊、視訊和註釋到地圖 • 更方便駕駛的白天和夜晚地圖模式 • 相關的大眾運輸路線和停靠站資訊 • 自行車道和人行道 • 旅遊全世界各地的步行小徑 • 從眾多來源的線上地圖 • 有關道路鋪設品質及街道照明的資訊 • 增加編輯和刪除 POI (對於 OpenStreetMap.org 使用者) • OsMo - 在您的國家即時監控其它裝置獲得可靠的導航 - 無論是法國、德國、墨西哥、英國、西班牙、荷蘭、美國、俄羅斯、巴西或任何其他國家。外掛元件：• 等高線地圖和山體陰影，https://goo.gl/7mojP8 等高線資料和地形顯現增加到基本的 OsmAnd 地圖上。 • 滑雪地圖 https://goo.gl/pX6DxJ 有關滑雪道、越野滑雪道、纜車和滑雪索道的資訊。 • 航海地圖 https://goo.gl/0hEdxm 專用的地圖式樣，用在幹線和近岸航海導引來查看海上導航標誌。 • 停車位置 https://goo.gl/6JxQXF 幫助您標記您停放車輛的位置，如果有停車場有時限，還可查看剩餘多少時間。持續關注！Twitter：https://twitter.com/osmandapp Facebook：https://www.facebook.com/osmandapp 網站：http://osmand.net 如果您需要 OsmAnd 應用程式相關的幫助，請聯絡我們的支援團隊：support@osmand.net "</string>
     <string name="shared_string_email_address">E-mail 地址</string>
@@ -2159,4 +2153,6 @@
     <string name="rendering_value_medium_name">中等</string>
     <string name="rendering_value_bold_name">粗的</string>
     <string name="rendering_value_thin_name">細的</string>
+    <string name="number_of_gpx_files_selected_pattern">%s GPX 檔案已選擇</string>
+    <string name="map_mode">地圖模式</string>
     </resources>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,8 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="map_mode">Map mode</string>
+    <string name="number_of_gpx_files_selected_pattern">%s GPX files selected</string>
     <string name="rendering_value_thin_name">Thin</string>
     <string name="rendering_value_medium_name">Medium</string>
     <string name="rendering_value_bold_name">Bold</string>
@@ -123,7 +125,7 @@
     <string name="shared_string_status">Status</string>
     <string name="shared_string_save_changes">Save changes</string>
     <string name="shared_string_email_address">E-mail address</string>
-    <string name="rendering_attr_hideUnderground_name">Hide underground objects</string>
+    <string name="rendering_attr_hideUnderground_name">Underground objects</string>
     <string name="data_is_not_available">Data is not available</string>
     <string name="shared_string_remove">Remove</string>
     <string name="shared_string_read_more">Read more</string>
@@ -132,7 +134,7 @@
     <string name="road_blocked">Road blocked</string>
     <string name="shared_string_select">Select</string>
     <string name="switch_start_finish">Reverse starting point &amp; destination</string>
-    <string name="rendering_attr_hideIcons_name">Hide POI icons</string>
+    <string name="rendering_attr_hideIcons_name">POI icons</string>
     <string name="item_removed">Item removed</string>
     <string name="n_items_removed">items removed</string>
     <string name="shared_string_undo_all">UNDO ALL</string>
@@ -220,7 +222,7 @@
     <string name="lang_als">Albanian (Tosk)</string>
     <string name="read_more">Read more</string>
     <string name="whats_new">What\'s new in</string>
-    <string name="rendering_attr_hideProposed_name">Hide proposed objects</string>
+    <string name="rendering_attr_hideProposed_name">Proposed objects</string>
     <string name="shared_string_update">Update</string>
     <string name="shared_string_upload">Upload</string>
     <string name="osm_edit_created_poi">Created OSM POI</string>
@@ -348,7 +350,7 @@
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Coloring according to route scope</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Coloring according to OSMC</string>
     <string name="shared_string_logoff">Log Off</string>
-    <string name="rendering_attr_hideHouseNumbers_name">Hide house numbers</string>
+    <string name="rendering_attr_hideHouseNumbers_name">House numbers</string>
     <string name="application_dir_change_warning3">Do you want OsmAnd to also copy its data files to the new destination?</string>
     <string name="specified_directiory_not_writeable">Maps could not be created in specified directory</string>
     <string name="copying_osmand_file_failed">Copying files failed</string>
@@ -702,14 +704,14 @@
     <string name="gpx_monitoring_start">Start GPX logging</string>
     <string name="gpx_monitoring_stop">Stop GPX logging</string>
     <string name="gpx_start_new_segment">Start new segment</string>
-    <string name="rendering_attr_hideBuildings_name">Hide buildings</string>
+    <string name="rendering_attr_hideBuildings_name">Buildings</string>
-    <string name="rendering_attr_hideNonVehicleHighways_name">Hide non-vehicle highways</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">Non-vehicle highways</string>
-    <string name="rendering_attr_hideText_name">Hide text</string>
+    <string name="rendering_attr_hideText_name">Text</string>
-    <string name="rendering_attr_hideWoodScrubs_name">Hide wood and scrubs</string>
+    <string name="rendering_attr_hideWoodScrubs_name">Wood and scrubs</string>
     <string name="rendering_attr_buildings15zoom_name">Buildings on zoom 15</string>
     <string name="rendering_attr_moreDetailed_name">More details</string>
     <string name="rendering_attr_lessDetailed_name">Fewer details</string>
-    <string name="rendering_attr_hideAccess_name">Hide access restrictions</string>
+    <string name="rendering_attr_hideAccess_name">Access restrictions</string>
     <string name="rendering_attr_showAccess_name">Show access restrictions</string>
     <string name="rendering_attr_showSurfaceGrade_name">Show road quality</string>
     <string name="rendering_attr_showSurfaces_name">Show road surface</string>
@@ -1425,7 +1427,6 @@ If you need help with OsmAnd application, please contact our support team: suppo
     <string name="select_navigation_mode">Select transport mode</string>
     <string name="day_night_info_description">Sunrise: %1$s \nSunset: %2$s</string>
     <string name="day_night_info">Day/night info</string>
-    <string name="map_widget_day_night">Day/night map</string>
     <string name="map_widget_renderer">Map style</string>
     <string name="layer_map_appearance">Configure screen</string>
     <string name="show_lanes">Show lanes</string>
@@ -1560,8 +1561,6 @@ If you need help with OsmAnd application, please contact our support team: suppo
     <string name="info_button">Info</string>
     <string name="back_to_location">Back to position</string>
 
-    <string name="accessibility_extensions_descr">Accessibility extensions for old Android versions</string>
-    <string name="accessibility_extensions">Accessibility extensions</string>
     <string name="accessibility_mode">Accessibility mode</string>
     <string name="accessibility_mode_descr">Turns on the accessibility features</string>
     <string name="accessibility_default">According to the global system setting</string>
@@ -1604,13 +1603,9 @@ If you need help with OsmAnd application, please contact our support team: suppo
     <string name="settings_direction_style_descr">Choose style to express relative directions while moving</string>
     <string name="auto_announce_on">Start auto announcing</string>
     <string name="auto_announce_off">Stop auto announcing</string>
-    <string name="scroll_map_by_gestures_descr">Scroll map by gestures on the touchscreen</string>
-    <string name="scroll_map_by_gestures">Natural map scrolling</string>
     <string name="i_am_here">I am here</string>
     <string name="zoom_by_trackball_descr">Change map zooming by horizontal trackball moves</string>
     <string name="zoom_by_trackball">Use trackball for zoom control</string>
-    <string name="use_short_object_names_descr">Use short object names in touch exploration mode</string>
-    <string name="use_short_object_names">Use object names</string>
     <string name="accessibility_preferences_descr">Accessibility related preferences</string>
     <string name="arrival_distance_factor_early">Early</string>
     <string name="arrival_distance_factor_normally">Normal</string>

OsmAnd/res/values/styles.xml

@@ -365,7 +365,12 @@
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
-    <style name="TextAppearance.OsmandListItemTitle" parent="TextAppearance.AppCompat.Subhead">
+    <style name="TextAppearance.ListItemTitle" parent="TextAppearance.AppCompat.Subhead">
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
+
+    <style name="TextAppearance.ListItemCategoryTitle" parent="TextAppearance.AppCompat.Subhead">
+        <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="typeface">@string/font_roboto_medium</item>
+    </style>
 </resources>

OsmAnd/src/net/osmand/access/AccessibleActivity.java

@@ -1,28 +0,0 @@
-package net.osmand.access;
-
-import net.osmand.plus.activities.OsmandActionBarActivity;
-import android.view.MotionEvent;
-
-// Provide some additional accessibility means for activity view elements.
-//
-// To make use of these capabilities simply derive your activity from this class
-// and then add view elements you wish to be accessible
-// to the accessibleContent list.
-//
-public class AccessibleActivity extends OsmandActionBarActivity implements AccessibleContent.Callback {
-
-    // List of accessible views. Use accessibleContent.add(element)
-    // to add element to it.
-    public final AccessibleContent accessibleContent = new AccessibleContent(this);
-
-    @Override
-    public boolean dispatchNativeTouchEvent(MotionEvent event) {
-        return super.dispatchTouchEvent(event);
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent event) {
-        return accessibleContent.dispatchTouchEvent(event, this);
-    }
-
-}

OsmAnd/src/net/osmand/access/AccessibleAlertBuilder.java

@@ -1,50 +0,0 @@
-package net.osmand.access;
-
-import android.content.Context;
-import android.support.v7.app.AlertDialog;
-
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.R;
-
-// Since usual message in an AlertDialog that is set by
-// AlertDialog.Builder.setMessage() is spoken only once
-// at the best case and there is no way to explore or even repeat it,
-// this class provides more accessible alternative
-// that wraps the message into a dedicated view.
-// Such message will be focusable and so it can be repeated
-// by selecting.
-//
-// Note: when accessibility extensions option is not checked
-// or system accessibility service is turned off this class
-// acts just identical to it's direct parent.
-//
-public class AccessibleAlertBuilder extends AlertDialog.Builder {
-
-    // The method getContext() is only available
-    // starting from API level 11, so store it here.
-    private final Context context;
-
-    // Conventional constructor.
-    public AccessibleAlertBuilder(Context context) {
-        super(context);
-        this.context = context;
-    }
-
-
-    // Provided setMessage() alternatives.
-
-    @Override
-    public AlertDialog.Builder setMessage(CharSequence msg) {
-        if (((OsmandApplication) context.getApplicationContext()).accessibilityExtensions())
-            return setView(TextMessage.makeView(context, msg, R.layout.alert));
-        return super.setMessage(msg);
-    }
-
-    @Override
-    public AlertDialog.Builder setMessage(int msgid) {
-        if (((OsmandApplication) context.getApplicationContext()).accessibilityExtensions())
-            return setView(TextMessage.makeView(context, msgid, R.layout.alert));
-        return super.setMessage(msgid);
-    }
-
-}

OsmAnd/src/net/osmand/access/AccessibleContent.java

@@ -1,85 +0,0 @@
-package net.osmand.access;
-
-import java.util.ArrayList;
-
-import net.osmand.plus.OsmandApplication;
-import android.content.Context;
-import android.graphics.Rect;
-import android.os.SystemClock;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
-
-// Provide some additional accessibility means for individual view elements.
-// These elements will be spoken on touch. Thus, you can slide your finger
-// across the screen and hear available controls.
-// Lift finger up on a control to make click.
-//
-// To make use of these capabilities instantiate an object of this class
-// and pass touch event to it via dispatchTouchEvent() method.
-// Then you can add view elements you wish to be accessible to this list.
-//
-public class AccessibleContent extends ArrayList<View> {
-
-    protected interface Callback {
-        public boolean dispatchNativeTouchEvent(MotionEvent event);
-    }
-
-    private final Rect testFrame = new Rect();
-    private View nowTouched;
-	private final Context ctx;
-
-    public AccessibleContent(Context ctx) {
-		this.ctx = ctx;
-	}
-
-	private View findTouch(MotionEvent event) {
-        int x = (int)event.getX();
-        int y = (int)event.getY();
-        for (View v : this)
-            if ((v.getVisibility() != View.INVISIBLE) && v.getGlobalVisibleRect(testFrame) && testFrame.contains(x, y))
-                return v;
-        return null;
-    }
-
-    public boolean dispatchTouchEvent(MotionEvent event, Callback callback) {
-        if (((OsmandApplication) ctx.getApplicationContext()).accessibilityExtensions()) {
-            int action = event.getAction();
-            View newTouch;
-            switch (action) {
-            case MotionEvent.ACTION_MOVE:
-                newTouch = findTouch(event);
-                if ((newTouch != null) && (newTouch != nowTouched)) {
-                    float x = event.getX();
-                    float y = event.getY();
-                    float pressure = event.getPressure();
-                    float size = event.getSize();
-                    int metaState = event.getMetaState();
-                    float xPrecision = event.getXPrecision();
-                    float yPrecision = event.getYPrecision();
-                    int deviceId = event.getDeviceId();
-                    int edgeFlags = event.getEdgeFlags();
-                    event.setAction(MotionEvent.ACTION_CANCEL);
-                    callback.dispatchNativeTouchEvent(event);
-                    newTouch.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-                    long now = SystemClock.uptimeMillis();
-                    event.recycle();
-                    event = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, x, y, pressure, size,
-                                               metaState, xPrecision, yPrecision, deviceId, edgeFlags);
-                }
-                nowTouched = newTouch;
-                break;
-            case MotionEvent.ACTION_DOWN:
-                nowTouched = findTouch(event);
-                if (nowTouched != null)
-                    nowTouched.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-                break;
-            default:
-                nowTouched = null;
-                break;
-            }
-        }
-        return callback.dispatchNativeTouchEvent(event);
-    }
-
-}

OsmAnd/src/net/osmand/access/AccessibleLayout.java

@@ -1,118 +0,0 @@
-package net.osmand.access;
-
-import net.osmand.plus.OsmandApplication;
-import android.content.Context;
-import android.graphics.Rect;
-import android.os.SystemClock;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-// This class can be used in place of FrameLayout in order to provide
-// a sort of touch exploration capability for enclosing View hierarchy.
-// It means that elements will be spoken on touch.
-// Thus, you can slide your finger across the screen
-// and hear available controls and items.
-// Lift finger up on a control to make click.
-//
-public class AccessibleLayout extends FrameLayout {
-
-    private final Rect testFrame = new Rect();
-    private View nowTouched;
-
-
-    // Conventional public constructors
-
-    public AccessibleLayout(Context context) {
-        super(context);
-    }
-
-    public AccessibleLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public AccessibleLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-
-    // Recursive search through View tree.
-    private View findTouch(MotionEvent event) {
-        if (!getGlobalVisibleRect(testFrame))
-            return null;
-        final int x = (int)event.getX() + testFrame.left;
-        final int y = (int)event.getY() + testFrame.top;
-        View root = this;
-        View control = null;
-        View text = null;
-        while (root instanceof ViewGroup) {
-            int nBranches = ((ViewGroup)root).getChildCount();
-            int i;
-            for (i = 0; i < nBranches; i++) {
-                View child = ((ViewGroup)root).getChildAt(i);
-                if ((child.getVisibility() != View.INVISIBLE) && child.getGlobalVisibleRect(testFrame) && testFrame.contains(x, y)) {
-                    if (child.isClickable())
-                        control = child;
-                    else if (child instanceof TextView)
-                        text = child;
-                    root = child;
-                    break;
-                }
-            }
-            if (i == nBranches)
-                break;
-        }
-        if (control != null)
-            return control;
-        return text;
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent event) {
-        final boolean swallow = ((OsmandApplication) getContext().getApplicationContext()).accessibilityExtensions();
-        if (swallow) {
-            int action = event.getAction();
-            View newTouch;
-            switch (action) {
-            case MotionEvent.ACTION_MOVE:
-                newTouch = findTouch(event);
-                if ((newTouch != null) && (newTouch != nowTouched)) {
-                    if (newTouch.isClickable()) {
-                        float x = event.getX();
-                        float y = event.getY();
-                        float pressure = event.getPressure();
-                        float size = event.getSize();
-                        int metaState = event.getMetaState();
-                        float xPrecision = event.getXPrecision();
-                        float yPrecision = event.getYPrecision();
-                        int deviceId = event.getDeviceId();
-                        int edgeFlags = event.getEdgeFlags();
-                        event.setAction(MotionEvent.ACTION_CANCEL);
-                        super.dispatchTouchEvent(event);
-                        long now = SystemClock.uptimeMillis();
-                        event.recycle();
-                        event = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, x, y, pressure, size,
-                                                   metaState, xPrecision, yPrecision, deviceId, edgeFlags);
-                    }
-                    newTouch.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-                }
-                nowTouched = newTouch;
-                break;
-            case MotionEvent.ACTION_DOWN:
-                nowTouched = findTouch(event);
-                if (nowTouched != null)
-                    nowTouched.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-                break;
-            default:
-                nowTouched = null;
-                break;
-            }
-        }
-        return super.dispatchTouchEvent(event) || swallow;
-    }
-
-}

OsmAnd/src/net/osmand/access/AccessibleToast.java

@@ -1,44 +0,0 @@
-package net.osmand.access;
-
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.R;
-import android.content.Context;
-import android.view.accessibility.AccessibilityEvent;
-import android.widget.Toast;
-
-// Use this class instead of regular Toast to have
-// accessibility feedback on toast messages.
-//
-public class AccessibleToast extends Toast {
-
-    public AccessibleToast(Context context) {
-        super(context);
-    }
-
-    public static Toast makeText(Context context, int msg, int duration) {
-        if (((OsmandApplication) context.getApplicationContext()).accessibilityExtensions()) {
-            final Toast toast = new AccessibleToast(context);
-            toast.setView(TextMessage.makeView(context, msg, R.layout.notification));
-            toast.setDuration(duration);
-            return toast;
-        }
-        return Toast.makeText(context, msg, duration);
-    }
-
-    public static Toast makeText(Context context, CharSequence msg, int duration) {
-        if (((OsmandApplication) context.getApplicationContext()).accessibilityExtensions()) {
-            final Toast toast = new AccessibleToast(context);
-            toast.setView(TextMessage.makeView(context, msg, R.layout.notification));
-            toast.setDuration(duration);
-            return toast;
-        }
-        return Toast.makeText(context, msg, duration);
-    }
-
-    @Override
-    public void show() {
-        getView().sendAccessibilityEvent(AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED);
-        super.show();
-    }
-
-}

OsmAnd/src/net/osmand/access/ExplorableTextView.java

@@ -1,103 +0,0 @@
-package net.osmand.access;
-
-import net.osmand.plus.OsmandApplication;
-import android.content.Context;
-import android.text.Layout;
-import android.text.method.ArrowKeyMovementMethod;
-import android.text.method.MovementMethod;
-import android.util.AttributeSet;
-import android.view.accessibility.AccessibilityEvent;
-import android.widget.TextView;
-
-// This class is intended to be used in place of the TextView
-// to provide accessible exploration capability by arrow keys.
-//
-public class ExplorableTextView extends TextView {
-
-    private int cursor;
-    private int selectionStart;
-    private int selectionLength;
-    private boolean cursorTrackingEnabled = true;
-
-
-    // Conventional constructors.
-
-    public ExplorableTextView(Context context) {
-        super(context);
-    }
-
-    public ExplorableTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ExplorableTextView(Context context, AttributeSet attrs, int style) {
-        super(context, attrs, style);
-    }
-
-    
-    private boolean accessibilityExtensions() {
-    	return ((OsmandApplication) getContext().getApplicationContext()).accessibilityExtensions();
-    }
-
-    // Overridden callback methods to provide accessible exploration means.
-
-    @Override
-    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
-        if (!accessibilityExtensions())
-            return super.dispatchPopulateAccessibilityEvent(event);
-        cursorTrackingEnabled = false;
-        boolean result = super.dispatchPopulateAccessibilityEvent(event);
-        if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED) {
-            if (isFocused()) {
-                event.getText().clear();
-                event.getText().add(getText().subSequence(selectionStart, selectionStart + selectionLength));
-            }
-            event.setAddedCount(selectionLength);
-            event.setRemovedCount(0);
-            event.setFromIndex(0);
-            event.setBeforeText(null);
-            result = true;
-        }
-        cursorTrackingEnabled =true;
-        return result;
-    }
-
-    @Override
-    protected MovementMethod getDefaultMovementMethod() {
-        if (accessibilityExtensions())
-            return ArrowKeyMovementMethod.getInstance();
-        return super.getDefaultMovementMethod();
-    }
-
-    @Override
-    protected void onTextChanged(CharSequence text, int start, int before, int after) {
-        super.onTextChanged(text, start, before, after);
-        if (accessibilityExtensions() && !isFocused()) {
-            selectionLength = Math.min(text.length(), AccessibilityEvent.MAX_TEXT_LENGTH);
-            sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED);
-        }
-    }
-
-    @Override
-    protected void onSelectionChanged(int start, int end) {
-        super.onSelectionChanged(start, end);
-        if (accessibilityExtensions() && cursorTrackingEnabled && isFocused()) {
-            if (end >= getText().length()) {
-                cursor = getText().length();
-            } else if (cursor != end) {
-                if (Math.abs(cursor - end) > 1) {
-                    final Layout layout = getLayout();
-                    final int line = layout.getLineForOffset(end);
-                    selectionStart = layout.getLineStart(line);
-                    selectionLength = Math.min(layout.getLineEnd(line) - selectionStart, AccessibilityEvent.MAX_TEXT_LENGTH);
-                } else {
-                    selectionStart = end;
-                    selectionLength = 1;
-                }
-                sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED);
-                cursor = end;
-            }
-        }
-    }
-
-}

OsmAnd/src/net/osmand/access/MapExplorer.java

@@ -1,119 +0,0 @@
-package net.osmand.access;
-
-import android.graphics.PointF;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.MotionEvent;
-
-import net.osmand.data.LatLon;
-import net.osmand.data.PointDescription;
-import net.osmand.data.QuadPoint;
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.R;
-import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
-import net.osmand.plus.views.OsmandMapTileView;
-
-import java.util.List;
-import java.util.Map;
-
-// Provide touch exploration mode for map view
-// when scrolling it by gestures is disabled.
-//
-public class MapExplorer extends SimpleOnGestureListener implements IContextMenuProvider {
-
-    private static final float VICINITY_RADIUS = 15;
-
-    private OsmandMapTileView mapView;
-    private SimpleOnGestureListener fallback;
-    private Map<Object, IContextMenuProvider> selectedObjects = null;
-
-
-    // OnGestureListener specified as a second argument
-    // will be used when scrolling map by gestures
-    // is enabled.
-    public MapExplorer(OsmandMapTileView mapView, SimpleOnGestureListener fallback) {
-        this.mapView = mapView;
-        this.fallback = fallback;
-    }
-
-
-    // OnGestureListener interface implementation.
-
-    @Override
-    public boolean onDown(MotionEvent e) {
-        return fallback.onDown(e);
-    }
-
-    @Override
-    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-        return fallback.onFling(e1, e2, velocityX / 3, velocityY / 3);
-    }
-
-    @Override
-    public void onLongPress(MotionEvent e) {
-        fallback.onLongPress(e);
-    }
-
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-        return fallback.onScroll(e1, e2, distanceX, distanceY);
-    }
-
-    @Override
-    public void onShowPress(MotionEvent e) {
-        fallback.onShowPress(e);
-    }
-
-	@Override
-	public boolean onSingleTapConfirmed(MotionEvent e) {
-		return fallback.onSingleTapConfirmed(e);
-	}
-
-	@Override
-	public boolean onDoubleTap(MotionEvent e) {
-		return fallback.onDoubleTap(e);
-	}
-
-	// IContextMenuProvider interface implementation.
-
-    @Override
-    public boolean disableSingleTap() {
-        return false;
-    }
-
-    @Override
-    public boolean disableLongPressOnMap() {
-        return false;
-    }
-
-    @Override
-    public boolean isObjectClickable(Object o) {
-        return false;
-    }
-
-    @Override
-    public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects) {
-        int radius = (int)(VICINITY_RADIUS * tileBox.getDensity());
-	    final QuadPoint p = tileBox.getCenterPixelPoint();
-	    int dx = (int)Math.abs(point.x - p.x);
-        int dy = (int)Math.abs(point.y - p.y);
-        if ((dx < radius) && (dy < radius))
-            objects.add(this);
-    }
-
-    @Override
-    public LatLon getObjectLocation(Object o) {
-	    final RotatedTileBox tb = mapView.getCurrentRotatedTileBox();
-	    return tb.getCenterLatLon();
-    }
-
-    @Override
-    public String getObjectDescription(Object o) {
-        return mapView.getContext().getString(R.string.i_am_here);
-    }
-
-    @Override
-    public PointDescription getObjectName(Object o) {
-        return new PointDescription(PointDescription.POINT_TYPE_MARKER, mapView.getContext().getString(R.string.i_am_here));
-    }
-
-}

OsmAnd/src/net/osmand/access/NotificationTextView.java

@@ -1,41 +0,0 @@
-package net.osmand.access;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.accessibility.AccessibilityEvent;
-import android.widget.TextView;
-
-// This class is intended to be used in place of the TextView
-// when constructing toast notifications to provide accessibility feedback.
-//
-public class NotificationTextView extends TextView {
-
-    // Conventional constructors.
-
-    public NotificationTextView(Context context) {
-        super(context);
-    }
-
-    public NotificationTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public NotificationTextView(Context context, AttributeSet attrs, int style) {
-        super(context, attrs, style);
-    }
-
-
-    // Overridden callback methods to provide accessible exploration means.
-
-    @Override
-    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
-        boolean result = super.dispatchPopulateAccessibilityEvent(event);
-        if (event.getEventType() == AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED) {
-            event.getText().clear();
-            event.getText().add(getText().subSequence(0, Math.min(getText().length(), AccessibilityEvent.MAX_TEXT_LENGTH)));
-            result = true;
-        }
-        return result;
-    }
-
-}

OsmAnd/src/net/osmand/access/OsmAndAccessibilityDelegate.java

@@ -1,80 +0,0 @@
-package net.osmand.access;
-
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.FrameLayout;
-
-// This class serves as a delegate of accessibility service
-// providing a sort of touch exploration capability
-// for a View hierarchy. It means that elements will be spoken
-// on touch. Thus, you can slide your finger across the screen
-// and hear available controls and items.
-// Lift finger up on a control to make click.
-//
-// This class can not be instantiated directly.
-// Use static method takeCareOf() to get it's functionality
-// for respective objects.
-//
-public class OsmAndAccessibilityDelegate extends AccessibleLayout {
-
-    private OsmAndAccessibilityDelegate(Context context) {
-        super(context);
-    }
-
-    // Attach itself to a target View hierarchy to intercept touch events
-    // and provide on-touch accessibility feedback.
-    // Target View must be an instance of FrameLayout
-    // or have a parent which is an instance of ViewGroup.
-    private void attach(View target) {
-        ViewGroup parent;
-        if (target instanceof FrameLayout) {
-            parent = (ViewGroup)target;
-            while (parent.getChildCount() > 0) {
-                View child = parent.getChildAt(0);
-                parent.removeViewAt(0);
-                addView(child);
-            }
-            parent.addView(this, new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
-        } else if (target.getParent() instanceof ViewGroup) {
-            parent = (ViewGroup)target.getParent();
-            int position = parent.indexOfChild(target);
-            ViewGroup.LayoutParams params = target.getLayoutParams();
-            parent.removeViewAt(position);
-            addView(target, new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-            parent.addView(this, position, params);
-        }
-    }
-
-
-    // Provide touch exploration capability for individual View
-    // or whole View hierarchy. The hierarchy root specified
-    // as an argument must either be an instance of FrameLayout
-    // or have a parent that is an instance of ViewGroup.
-    public static void takeCareOf(View hierarchy) {
-        final OsmAndAccessibilityDelegate delegate = new OsmAndAccessibilityDelegate(hierarchy.getContext());
-        delegate.attach(hierarchy);
-    }
-
-    // Provide touch exploration capability for given window.
-    public static void takeCareOf(Window window) {
-        takeCareOf(window.getDecorView());
-    }
-
-    // Provide touch exploration capability for an activity View content.
-    // Use after setContentView().
-    public static void takeCareOf(Activity activity) {
-        takeCareOf(activity.getWindow());
-    }
-
-    // Provide touch exploration capability for a dialog View content.
-    // Use after setContentView().
-    public static void takeCareOf(Dialog dialog) {
-        takeCareOf(dialog.getWindow());
-    }
-
-}

OsmAnd/src/net/osmand/access/SettingsAccessibilityActivity.java

@@ -1,7 +1,6 @@
 package net.osmand.access;
 
 
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -74,17 +73,6 @@ public class SettingsAccessibilityActivity extends SettingsBaseActivity {
 
 		cat.addPreference(createCheckBoxPreference(settings.ZOOM_BY_TRACKBALL, R.string.zoom_by_trackball,
 				R.string.zoom_by_trackball_descr));
-		
-		cat.addPreference(createCheckBoxPreference(settings.USE_SHORT_OBJECT_NAMES, R.string.use_short_object_names,
-				R.string.use_short_object_names_descr));
-		
-
-		if (Build.VERSION.SDK_INT < 14) { // Build.VERSION_CODES.ICE_CREAM_SANDWICH
-			cat.addPreference(createCheckBoxPreference(settings.SCROLL_MAP_BY_GESTURES, R.string.scroll_map_by_gestures,
-					R.string.scroll_map_by_gestures_descr));
-			cat.addPreference(createCheckBoxPreference(settings.ACCESSIBILITY_EXTENSIONS, R.string.accessibility_extensions,
-					R.string.accessibility_extensions));
-		}
 	}
 
 

OsmAnd/src/net/osmand/access/TextMessage.java

@@ -1,26 +0,0 @@
-package net.osmand.access;
-
-import net.osmand.plus.R;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-// This class contains only static methods intended to improve
-// accessibility for AlertDialog and Toast messages.
-//
-public class TextMessage {
-
-    protected static View makeView(Context ctx, CharSequence msg, int resid) {
-        View layout = ((LayoutInflater)(ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE))).inflate(resid, null);
-        ((TextView)layout.findViewById(R.id.message)).setText(msg);
-        return layout;
-    }
-
-    protected static View makeView(Context ctx, int msgid, int resid) {
-        View layout = ((LayoutInflater)(ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE))).inflate(resid, null);
-        ((TextView)layout.findViewById(R.id.message)).setText(msgid);
-        return layout;
-    }
-
-}

OsmAnd/src/net/osmand/plus/AppInitializer.java

@@ -13,7 +13,6 @@ import android.support.v7.app.AlertDialog;
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
-import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.map.OsmandRegions;
 import net.osmand.map.OsmandRegions.RegionTranslation;
 import net.osmand.map.WorldRegion;
@@ -253,7 +252,7 @@ public class AppInitializer implements IProgress {
 		boolean check = pref.getBoolean(VECTOR_INDEXES_CHECK, true);
 		// do not show each time
 		if (check && new Random().nextInt() % 5 == 1) {
-			AlertDialog.Builder builder = new AccessibleAlertBuilder(ctx);
+			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
 			if (maps.isEmpty()) {
 				builder.setMessage(R.string.vector_data_missing);
 			} else if (!maps.basemapExists()) {

OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java

@@ -2,11 +2,10 @@ package net.osmand.plus;
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IdRes;
 import android.support.annotation.LayoutRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.widget.AppCompatImageView;
 import android.view.ContextThemeWrapper;
 import android.view.View;
@@ -85,6 +84,7 @@ public class ContextMenuAdapter {
 		@LayoutRes
 		private int layoutId;
 		private final ConfigureMapMenu.OnClickListener changeAppModeListener;
+		private final IconsCache mIconsCache;
 
 		public ContextMenuArrayAdapter(Activity context,
 									   @LayoutRes int layoutRes,
@@ -98,6 +98,7 @@ public class ContextMenuAdapter {
 			this.holoLight = holoLight;
 			this.layoutId = layoutRes;
 			this.changeAppModeListener = changeAppModeListener;
+			mIconsCache = app.getIconsCache();
 		}
 
 		@Override
@@ -132,24 +133,19 @@ public class ContextMenuAdapter {
 			tv.setText(item.getTitle());
 
 			if (this.layoutId == R.layout.simple_list_menu_item) {
-				int color = ContextCompat.getColor(getContext(),
+				@ColorRes
-						holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark);
+				int color = holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark;
-				Drawable drawable = ContextCompat.getDrawable(getContext(), item.getIcon());
+				Drawable drawable = mIconsCache.getIcon(item.getIcon(), color);
-				Drawable imageId = DrawableCompat.wrap(drawable);
-				imageId.mutate();
-				DrawableCompat.setTint(imageId, color);
 				float density = getContext().getResources().getDisplayMetrics().density;
 				int paddingInPixels = (int) (24 * density);
 				int drawableSizeInPixels = (int) (24 * density); // 32
-				imageId.setBounds(0, 0, drawableSizeInPixels, drawableSizeInPixels);
+				drawable.setBounds(0, 0, drawableSizeInPixels, drawableSizeInPixels);
-				tv.setCompoundDrawables(imageId, null, null, null);
+				tv.setCompoundDrawables(drawable, null, null, null);
 				tv.setCompoundDrawablePadding(paddingInPixels);
 			} else {
 				if (item.getIcon() != ContextMenuItem.INVALID_ID) {
-					Drawable drawable = ContextCompat.getDrawable(getContext(), item.getIcon());
+					Drawable drawable = mIconsCache.getIcon(item.getIcon(),
-					drawable = DrawableCompat.wrap(drawable);
+							item.getThemedColorRes(getContext()));
-					drawable.mutate();
-					DrawableCompat.setTint(drawable, item.getThemedColor(getContext()));
 					((AppCompatImageView) convertView.findViewById(R.id.icon)).setImageDrawable(drawable);
 					convertView.findViewById(R.id.icon).setVisibility(View.VISIBLE);
 				} else if (convertView.findViewById(R.id.icon) != null) {
@@ -159,12 +155,9 @@ public class ContextMenuAdapter {
 			@DrawableRes
 			int secondaryDrawable = item.getSecondaryIcon();
 			if (secondaryDrawable != ContextMenuItem.INVALID_ID) {
-				int color = ContextCompat.getColor(getContext(),
+				@ColorRes
-						holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark);
+				int colorRes = holoLight ? R.color.icon_color : R.color.dashboard_subheader_text_dark;
-				Drawable drawable = ContextCompat.getDrawable(getContext(), item.getSecondaryIcon());
+				Drawable drawable = mIconsCache.getIcon(item.getSecondaryIcon(), colorRes);
-				drawable = DrawableCompat.wrap(drawable);
-				drawable.mutate();
-				DrawableCompat.setTint(drawable, color);
 				ImageView imageView = (ImageView) convertView.findViewById(R.id.secondary_icon);
 				imageView.setImageDrawable(drawable);
 				imageView.setVisibility(View.VISIBLE);
@@ -250,7 +243,8 @@ public class ContextMenuAdapter {
 
 			View dividerView = convertView.findViewById(R.id.divider);
 			if (dividerView != null) {
-				if (getCount() - 1 == position || getItem(position + 1).isCategory()) {
+				if (getCount() - 1 == position || getItem(position + 1).isCategory()
+						|| item.shouldHideDivider()) {
 					dividerView.setVisibility(View.GONE);
 				} else {
 					dividerView.setVisibility(View.VISIBLE);

OsmAnd/src/net/osmand/plus/ContextMenuItem.java

@@ -27,10 +27,12 @@ public class ContextMenuItem {
 	private final int layout;
 	private boolean loading;
 	private final boolean category;
+	private final boolean skipPaintingWithoutColor;
 	private final int pos;
 	private String description;
 	private final ContextMenuAdapter.ItemClickListener itemClickListener;
 	private final ContextMenuAdapter.OnIntegerValueChangedListener integerListener;
+	private final boolean hideDivider;
 
 	private ContextMenuItem(@StringRes int titleId,
 							String title,
@@ -42,10 +44,11 @@ public class ContextMenuItem {
 							@LayoutRes int layout,
 							boolean loading,
 							boolean category,
-							int pos,
+							boolean skipPaintingWithoutColor, int pos,
 							String description,
 							ContextMenuAdapter.ItemClickListener itemClickListener,
-							ContextMenuAdapter.OnIntegerValueChangedListener integerListener) {
+							ContextMenuAdapter.OnIntegerValueChangedListener integerListener,
+							boolean hideDivider) {
 		this.titleId = titleId;
 		this.title = title;
 		this.mIcon = icon;
@@ -56,10 +59,12 @@ public class ContextMenuItem {
 		this.layout = layout;
 		this.loading = loading;
 		this.category = category;
+		this.skipPaintingWithoutColor = skipPaintingWithoutColor;
 		this.pos = pos;
 		this.description = description;
 		this.itemClickListener = itemClickListener;
 		this.integerListener = integerListener;
+		this.hideDivider = hideDivider;
 	}
 
 	@StringRes
@@ -83,7 +88,7 @@ public class ContextMenuItem {
 
 	@ColorRes
 	public int getThemedColorRes(Context context) {
-		if (getColorRes() != INVALID_ID) {
+		if (skipPaintingWithoutColor || getColorRes() != INVALID_ID) {
 			return getColorRes();
 		} else {
 			return IconsCache.getDefaultColorRes(context);
@@ -137,6 +142,10 @@ public class ContextMenuItem {
 		return integerListener;
 	}
 
+	public boolean shouldHideDivider() {
+		return hideDivider;
+	}
+
 	public void setTitle(String title) {
 		this.title = title;
 	}
@@ -185,6 +194,8 @@ public class ContextMenuItem {
 		private String mDescription = null;
 		private ContextMenuAdapter.ItemClickListener mItemClickListener = null;
 		private ContextMenuAdapter.OnIntegerValueChangedListener mIntegerListener = null;
+		private boolean mSkipPaintingWithoutColor;
+		private boolean mHideDivider;
 
 		public ItemBuilder setTitleId(@StringRes int titleId, @Nullable Context context) {
 			this.mTitleId = titleId;
@@ -260,10 +271,20 @@ public class ContextMenuItem {
 			return this;
 		}
 
+		public ItemBuilder setSkipPaintingWithoutColor(boolean skipPaintingWithoutColor) {
+			mSkipPaintingWithoutColor = skipPaintingWithoutColor;
+			return this;
+		}
+
+		public ItemBuilder hideDivider(boolean hideDivider) {
+			mHideDivider = hideDivider;
+			return this;
+		}
+
 		public ContextMenuItem createItem() {
 			return new ContextMenuItem(mTitleId, mTitle, mIcon, mColorRes, mSecondaryIcon,
-					mSelected, mProgress, mLayout, mLoading, mIsCategory, mPosition, mDescription,
+					mSelected, mProgress, mLayout, mLoading, mIsCategory, mSkipPaintingWithoutColor,
-					mItemClickListener, mIntegerListener);
+					mPosition, mDescription, mItemClickListener, mIntegerListener, mHideDivider);
 		}
 	}
 }

OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java

@@ -1,6 +1,8 @@
 package net.osmand.plus;
 
 import android.graphics.Bitmap;
+import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 
 import net.osmand.IProgress;
 import net.osmand.plus.GPXUtilities.GPXFile;
@@ -28,10 +30,8 @@ public class GpxSelectionHelper {
 	private static final String FILE = "file";
 	private static final String COLOR = "color";
 	private OsmandApplication app;
-	// save into settings
+	@NonNull
-//	public final CommonPreference<Boolean> SHOW_CURRENT_GPX_TRACK = 
+	private List<SelectedGpxFile> selectedGPXFiles = new java.util.ArrayList<>();
-//			new BooleanPreference("show_current_gpx_track", false).makeGlobal().cache();
-	private List<SelectedGpxFile> selectedGPXFiles = new java.util.ArrayList<SelectedGpxFile>();
 	private SavingTrackHelper savingTrackHelper;
 
 	public GpxSelectionHelper(OsmandApplication osmandApplication, SavingTrackHelper trackHelper) {
@@ -48,10 +48,23 @@ public class GpxSelectionHelper {
 		return !selectedGPXFiles.isEmpty();
 	}
 
+	@NonNull
 	public List<SelectedGpxFile> getSelectedGPXFiles() {
 		return selectedGPXFiles;
 	}
 
+	public String getGpxDescription() {
+		if (selectedGPXFiles.size() == 1) {
+			File file = new File(selectedGPXFiles.get(0).getGpxFile().path);
+			return Algorithms.getFileNameWithoutExtension(file);
+		} else if (selectedGPXFiles.size() == 0) {
+			return null;
+		} else {
+			return app.getResources().getString(R.string.number_of_gpx_files_selected_pattern,
+					selectedGPXFiles.size());
+		}
+	}
+
 	public SelectedGpxFile getSelectedGPXFile(WptPt point) {
 		for (SelectedGpxFile g : selectedGPXFiles) {
 			if (g.getGpxFile().points.contains(point)) {
@@ -61,12 +74,12 @@ public class GpxSelectionHelper {
 		return null;
 	}
 
-	public final String getString(int resId, Object... formatArgs) {
+	private String getString(int resId, Object... formatArgs) {
 		return app.getString(resId, formatArgs);
 	}
 
 	public List<GpxDisplayGroup> collectDisplayGroups(GPXFile g) {
-		List<GpxDisplayGroup> dg = new ArrayList<GpxSelectionHelper.GpxDisplayGroup>();
+		List<GpxDisplayGroup> dg = new ArrayList<>();
 		String name = g.path;
 		if (g.showCurrentTrack) {
 			name = getString(R.string.shared_string_currently_recording_track);
@@ -165,11 +178,11 @@ public class GpxSelectionHelper {
 
 	private static void processGroupTrack(OsmandApplication app, GpxDisplayGroup group) {
 		List<GpxDisplayItem> list = group.getModifiableList();
-		String timeSpanClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_time_span_color));
+		String timeSpanClr = Algorithms.colorToString(ContextCompat.getColor(app, R.color.gpx_time_span_color));
-		String speedClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_speed));
+		String speedClr = Algorithms.colorToString(ContextCompat.getColor(app, R.color.gpx_speed));
-		String ascClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_altitude_asc));
+		String ascClr = Algorithms.colorToString(ContextCompat.getColor(app, R.color.gpx_altitude_asc));
-		String descClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_altitude_desc));
+		String descClr = Algorithms.colorToString(ContextCompat.getColor(app, R.color.gpx_altitude_desc));
-		String distanceClr = Algorithms.colorToString(app.getResources().getColor(R.color.gpx_distance_color));
+		String distanceClr = Algorithms.colorToString(ContextCompat.getColor(app, R.color.gpx_distance_color));
 		final float eleThreshold = 3;
 //		int t = 1;
 		for (TrkSegment r : group.track.segments) {
@@ -179,9 +192,11 @@ public class GpxSelectionHelper {
 			GPXTrackAnalysis[] as;
 			boolean split = true;
 			if (group.splitDistance > 0) {
-				as = r.splitByDistance(group.splitDistance).toArray(new GPXTrackAnalysis[0]);
+				List<GPXTrackAnalysis> trackSegments = r.splitByDistance(group.splitDistance);
+				as = trackSegments.toArray(new GPXTrackAnalysis[trackSegments.size()]);
 			} else if (group.splitTime > 0) {
-				as = r.splitByTime(group.splitTime).toArray(new GPXTrackAnalysis[0]);
+				List<GPXTrackAnalysis> trackSegments = r.splitByTime(group.splitTime);
+				as = trackSegments.toArray(new GPXTrackAnalysis[trackSegments.size()]);
 			} else {
 				split = false;
 				as = new GPXTrackAnalysis[]{GPXTrackAnalysis.segment(0, r)};
@@ -309,8 +324,7 @@ public class GpxSelectionHelper {
 	public void setGpxFileToDisplay(GPXFile... gpxs) {
 		// special case for gpx current route
 		for (GPXFile gpx : gpxs) {
-			boolean show = true;
+			selectGpxFileImpl(gpx, true, false);
-			selectGpxFileImpl(gpx, show, false);
 		}
 		saveCurrentSelections();
 	}
@@ -376,13 +390,14 @@ public class GpxSelectionHelper {
 	}
 
 	private SelectedGpxFile selectGpxFileImpl(GPXFile gpx, boolean show, boolean notShowNavigationDialog) {
-		boolean displayed = false;
+		boolean displayed;
 		SelectedGpxFile sf;
 		if (gpx != null && gpx.showCurrentTrack) {
 			sf = savingTrackHelper.getCurrentTrack();
 			sf.notShowNavigationDialog = notShowNavigationDialog;
 			displayed = selectedGPXFiles.contains(sf);
 		} else {
+			assert gpx != null;
 			sf = getSelectedFileByPath(gpx.path);
 			displayed = sf != null;
 			if (show && sf == null) {
@@ -416,7 +431,7 @@ public class GpxSelectionHelper {
 		private int color;
 		private GPXTrackAnalysis trackAnalysis;
 		private long modifiedTime = -1;
-		private List<TrkSegment> processedPointsToDisplay = new ArrayList<TrkSegment>();
+		private List<TrkSegment> processedPointsToDisplay = new ArrayList<>();
 		private boolean routePoints;
 
 		private List<GpxDisplayGroup> displayGroups;
@@ -512,7 +527,7 @@ public class GpxSelectionHelper {
 	public static class GpxDisplayGroup {
 
 		private GpxDisplayItemType type = GpxDisplayItemType.TRACK_SEGMENT;
-		private List<GpxDisplayItem> list = new ArrayList<GpxDisplayItem>();
+		private List<GpxDisplayItem> list = new ArrayList<>();
 		private GPXFile gpx;
 		private String gpxName;
 		private String name;
@@ -544,7 +559,7 @@ public class GpxSelectionHelper {
 			group.name = name;
 			group.description = description;
 			group.track = track;
-			group.list = new ArrayList<GpxSelectionHelper.GpxDisplayItem>(list);
+			group.list = new ArrayList<>(list);
 			return group;
 		}
 
@@ -640,9 +655,5 @@ public class GpxSelectionHelper {
 		public String url;
 		public Bitmap image;
 		public boolean expanded;
-		
-		
 	}
-
-
 }

OsmAnd/src/net/osmand/plus/IconsCache.java

@@ -1,9 +1,6 @@
 package net.osmand.plus;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.support.annotation.ColorInt;
@@ -24,19 +21,6 @@ public class IconsCache {
 		this.app = app;
 	}
 
-	public Drawable scaleImage(Drawable image, float scaleFactor) {
-		if ((image == null) || !(image instanceof BitmapDrawable)) {
-			return image;
-		}
-		Bitmap b = ((BitmapDrawable)image).getBitmap();
-
-		int sizeX = Math.round(image.getIntrinsicWidth() * scaleFactor);
-		int sizeY = Math.round(image.getIntrinsicHeight() * scaleFactor);
-
-		Bitmap bitmapResized = Bitmap.createScaledBitmap(b, sizeX, sizeY, false);
-		return new BitmapDrawable(app.getResources(), bitmapResized);
-	}
-
 	private Drawable getDrawable(@DrawableRes int resId, @ColorRes int clrId) {
 		long hash = ((long)resId << 31l) + clrId;
 		Drawable d = drawable.get(hash);
@@ -44,10 +28,8 @@ public class IconsCache {
 			d = ContextCompat.getDrawable(app, resId);
 			d = DrawableCompat.wrap(d);
 			d.mutate();
-			// d.clearColorFilter();
 			if (clrId != 0) {
 				DrawableCompat.setTint(d, ContextCompat.getColor(app, clrId));
-				// d.setColorFilter(ContextCompat.getColor(app, clrId), PorterDuff.Mode.SRC_IN);
 			}
 			drawable.put(hash, d);
 		}
@@ -63,15 +45,12 @@ public class IconsCache {
 			d.mutate();
 			DrawableCompat.setTint(d, color);
 
-//			d = app.getResources().getDrawable(resId).mutate();
-//			d.clearColorFilter();
-//			d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
 			drawable.put(hash, d);
 		}
 		return d;
 	}
 
-	public Drawable getPaintedContentIcon(@DrawableRes int id, @ColorInt int color){
+	public Drawable getPaintedIcon(@DrawableRes int id, @ColorInt int color){
 		return getPaintedDrawable(id, color);
 	}
 
@@ -79,7 +58,6 @@ public class IconsCache {
 		return getDrawable(id, colorId);
 	}
 
-
 	public Drawable getIcon(@DrawableRes int backgroundId, @DrawableRes int id, @ColorRes int colorId) {
 		Drawable b = getDrawable(backgroundId, 0);
 		Drawable f = getDrawable(id, colorId);
@@ -89,14 +67,10 @@ public class IconsCache {
 		return new LayerDrawable(layers);
 	}
 
-	public Drawable getContentIcon(@DrawableRes int id) {
+	public Drawable getThemedIcon(@DrawableRes int id) {
 		return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color : 0);
 	}
 
-	public Drawable getContentIcon(@DrawableRes int id, boolean isLightContent) {
-		return getDrawable(id, isLightContent ? R.color.icon_color : 0);
-	}
-
 	public Drawable getIcon(@DrawableRes int id) {
 		return getDrawable(id, 0);
 	}
@@ -105,15 +79,6 @@ public class IconsCache {
 		return getDrawable(id, light ? R.color.icon_color : 0);
 	}
 
-	public Drawable getContentIconCompat(@DrawableRes int id) {
-		Drawable drawable = ContextCompat.getDrawable(app, id);
-		@ColorInt int color = ContextCompat.getColor(app, getDefaultColorRes(app));
-		drawable = DrawableCompat.wrap(drawable);
-		drawable.mutate();
-		DrawableCompat.setTint(drawable, color);
-		return drawable;
-	}
-
 	public void paintMenuItem(MenuItem menuItem) {
 		Drawable drawable = menuItem.getIcon();
 		drawable = DrawableCompat.wrap(drawable);

OsmAnd/src/net/osmand/plus/NavigationService.java

@@ -1,7 +1,6 @@
 package net.osmand.plus;
 
 import net.osmand.PlatformUtil;
-import net.osmand.access.AccessibleToast;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmo.OsMoPlugin;
 import android.app.AlarmManager;
@@ -246,7 +245,7 @@ public class NavigationService extends Service implements LocationListener {
 
 	@Override
 	public void onProviderDisabled(String provider) {
-		AccessibleToast.makeText(this, getString(R.string.off_router_service_no_gps_available), Toast.LENGTH_LONG).show();
+		Toast.makeText(this, getString(R.string.off_router_service_no_gps_available), Toast.LENGTH_LONG).show();
 	}
 
 

OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java

@@ -15,7 +15,6 @@ import android.widget.Toast;
 
 import net.osmand.CallbackWithObject;
 import net.osmand.Location;
-import net.osmand.access.AccessibleToast;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
 
@@ -41,7 +40,7 @@ public class OsmAndLocationSimulation {
 //		if (!isRouteAnimating()) {
 //			List<Location> currentRoute = app.getRoutingHelper().getCurrentRoute();
 //			if (currentRoute.isEmpty()) {
-//				AccessibleToast.makeText(app, R.string.animate_routing_route_not_calculated, Toast.LENGTH_LONG).show();
+//				Toast.makeText(app, R.string.animate_routing_route_not_calculated, Toast.LENGTH_LONG).show();
 //			} else {
 //				startAnimationThread(app.getRoutingHelper(), ma, new ArrayList<Location>(currentRoute), false, 1);
 //			}
@@ -92,7 +91,7 @@ public class OsmAndLocationSimulation {
 					} else {
 						List<Location> currentRoute = app.getRoutingHelper().getCurrentCalculatedRoute();
 						if (currentRoute.isEmpty()) {
-							AccessibleToast.makeText(app, R.string.animate_routing_route_not_calculated,
+							Toast.makeText(app, R.string.animate_routing_route_not_calculated,
 									Toast.LENGTH_LONG).show();
 						} else {
 							startAnimationThread(app, new ArrayList<Location>(currentRoute), false, 1);

OsmAnd/src/net/osmand/plus/OsmandApplication.java

@@ -26,7 +26,6 @@ import android.widget.Toast;
 import net.osmand.CallbackWithObject;
 import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibilityPlugin;
-import net.osmand.access.AccessibleToast;
 import net.osmand.map.OsmandRegions;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.plus.AppInitializer.AppInitializeListener;
@@ -371,7 +370,7 @@ public class OsmandApplication extends MultiDexApplication {
 				View view = uiContext.getLayoutInflater().inflate(R.layout.select_voice_first, null);
 
 				((ImageView) view.findViewById(R.id.icon))
-						.setImageDrawable(getIconsCache().getContentIcon(R.drawable.ic_action_volume_up, getSettings().isLightContent()));
+						.setImageDrawable(getIconsCache().getIcon(R.drawable.ic_action_volume_up, getSettings().isLightContent()));
 
 				view.findViewById(R.id.spinner).setOnClickListener(new View.OnClickListener() {
 					@Override
@@ -392,7 +391,7 @@ public class OsmandApplication extends MultiDexApplication {
 				});
 
 				((ImageView) view.findViewById(R.id.dropDownIcon))
-						.setImageDrawable(getIconsCache().getContentIcon(R.drawable.ic_action_arrow_drop_down, getSettings().isLightContent()));
+						.setImageDrawable(getIconsCache().getIcon(R.drawable.ic_action_arrow_drop_down, getSettings().isLightContent()));
 
 				builder.setCancelable(true);
 				builder.setNegativeButton(R.string.shared_string_cancel, null);
@@ -564,7 +563,7 @@ public class OsmandApplication extends MultiDexApplication {
 		uiHandler.post(new Runnable() {
 			@Override
 			public void run() {
-				AccessibleToast.makeText(OsmandApplication.this, getString(msgId, args), Toast.LENGTH_SHORT).show();
+				Toast.makeText(OsmandApplication.this, getString(msgId, args), Toast.LENGTH_SHORT).show();
 			}
 		});
 	}
@@ -573,7 +572,7 @@ public class OsmandApplication extends MultiDexApplication {
 		uiHandler.post(new Runnable() {
 			@Override
 			public void run() {
-				AccessibleToast.makeText(OsmandApplication.this, msg, Toast.LENGTH_SHORT).show();
+				Toast.makeText(OsmandApplication.this, msg, Toast.LENGTH_SHORT).show();
 			}
 		});
 	}
@@ -582,7 +581,7 @@ public class OsmandApplication extends MultiDexApplication {
 		uiHandler.post(new Runnable() {
 			@Override
 			public void run() {
-				AccessibleToast.makeText(OsmandApplication.this, getString(msgId, args), Toast.LENGTH_LONG).show();
+				Toast.makeText(OsmandApplication.this, getString(msgId, args), Toast.LENGTH_LONG).show();
 			}
 		});
 	}
@@ -591,7 +590,7 @@ public class OsmandApplication extends MultiDexApplication {
 		uiHandler.post(new Runnable() {
 			@Override
 			public void run() {
-				AccessibleToast.makeText(OsmandApplication.this, msg, Toast.LENGTH_LONG).show();				
+				Toast.makeText(OsmandApplication.this, msg, Toast.LENGTH_LONG).show();				
 			}
 		});
 	}
@@ -696,10 +695,6 @@ public class OsmandApplication extends MultiDexApplication {
 		return regions;
 	}
 	
-	public boolean accessibilityExtensions() {
-		return (Build.VERSION.SDK_INT < 14) ? getSettings().ACCESSIBILITY_EXTENSIONS.get() : false;
-	}
-	
 	public boolean accessibilityEnabled() {
 		final AccessibilityMode mode = getSettings().ACCESSIBILITY_MODE.get();
 		if(OsmandPlugin.getEnabledPlugin(AccessibilityPlugin.class) == null) {

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -783,18 +783,6 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> ZOOM_BY_TRACKBALL =
 			new BooleanAccessibilityPreference("zoom_by_trackball", false).makeGlobal();
 
-	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> SCROLL_MAP_BY_GESTURES =
-			new BooleanAccessibilityPreference("scroll_map_by_gestures", true).makeGlobal();
-
-	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> USE_SHORT_OBJECT_NAMES =
-			new BooleanAccessibilityPreference("use_short_object_names", false).makeGlobal();
-
-	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> ACCESSIBILITY_EXTENSIONS =
-			new BooleanAccessibilityPreference("accessibility_extensions", false).makeGlobal();
-
 
 	// magnetic field doesn'torkmost of the time on some phones
 	public final OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS = new BooleanPreference("use_magnetic_field_sensor_compass", false).makeGlobal().cache();

OsmAnd/src/net/osmand/plus/SQLiteTileSource.java

@@ -10,7 +10,6 @@ import java.util.List;
 
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
-import net.osmand.access.AccessibleToast;
 import net.osmand.data.QuadRect;
 import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager;
@@ -124,7 +123,7 @@ public class SQLiteTileSource implements ITileSource {
 				return (String) bshInterpreter.eval("getTileUrl("+zoom+","+x+","+y+");");
 			} catch (bsh.EvalError e) {
 				LOG.debug("getUrlToLoad Error" + e.getMessage());
-				AccessibleToast.makeText(ctx, e.getMessage(), Toast.LENGTH_LONG).show();
+				Toast.makeText(ctx, e.getMessage(), Toast.LENGTH_LONG).show();
 				LOG.error(e.getMessage(), e);
 				return null;
 			}

OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java

@@ -16,7 +16,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import net.osmand.AndroidUtils;
-import net.osmand.access.AccessibleToast;
 import net.osmand.osm.io.NetworkUtils;
 import net.osmand.plus.R;
 
@@ -103,7 +102,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
 		}
 		if(operationId == DOWNLOAD_BUILDS_LIST){
 			if(e != null){
-				AccessibleToast.makeText(this, getString(R.string.loading_builds_failed) + " : " + e.getMessage(), Toast.LENGTH_LONG).show();
+				Toast.makeText(this, getString(R.string.loading_builds_failed) + " : " + e.getMessage(), Toast.LENGTH_LONG).show();
 				finish();
 			} else {
 				setListAdapter(new OsmandBuildsAdapter(downloadedBuilds));
@@ -128,7 +127,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
 
 	private void updateInstalledApp(boolean showMessage, Date d) {
 		if (showMessage) {
-			AccessibleToast.makeText(
+			Toast.makeText(
 					this,
 					MessageFormat.format(getString(R.string.build_installed), currentSelectedBuild.tag, 
 							AndroidUtils.formatDateTime(getMyApplication(), currentSelectedBuild.date.getTime())), Toast.LENGTH_LONG).show();

OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java

@@ -11,7 +11,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import net.osmand.PlatformUtil;
-import net.osmand.access.AccessibleToast;
 import net.osmand.data.QuadRect;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.map.ITileSource;
@@ -50,11 +49,11 @@ public class DownloadTilesDialog {
 	public void openDialog(){
 		BaseMapLayer mainLayer = mapView.getMainLayer();
 		if(!(mainLayer instanceof MapTileLayer) || !((MapTileLayer) mainLayer).isVisible()){
-			AccessibleToast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
+			Toast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
 		}
 		final ITileSource mapSource = ((MapTileLayer) mainLayer).getMap();
 		if(mapSource == null || !mapSource.couldBeDownloadedFromInternet()){
-			AccessibleToast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
+			Toast.makeText(ctx, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
 			return;
 		}
 		final RotatedTileBox rb = mapView.getCurrentRotatedTileBox();

OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java

@@ -212,7 +212,7 @@ public class FavoritesListFragment extends OsmAndListFragment implements SearchA
 				ImageButton options = (ImageButton) row.findViewById(R.id.options);
 				options.setFocusable(false);
 				options.setImageDrawable(((OsmandApplication) activity.getApplication())
-						.getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
+						.getIconsCache().getThemedIcon(R.drawable.ic_overflow_menu_white));
 				options.setVisibility(View.VISIBLE);
 				options.setOnClickListener(new View.OnClickListener() {
 					@Override
@@ -223,7 +223,7 @@ public class FavoritesListFragment extends OsmAndListFragment implements SearchA
 			}
 			if (!favorite.getCategory().isEmpty()) {
 				giImage.setVisibility(View.VISIBLE);
-				giImage.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_small_group));
+				giImage.setImageDrawable(app.getIconsCache().getThemedIcon(R.drawable.ic_small_group));
 			} else {
 				giImage.setVisibility(View.GONE);
 			}

OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java

@@ -31,7 +31,6 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import net.osmand.access.AccessibleToast;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
@@ -472,7 +471,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 
 	private void shareFavourites() {
 		if (favouritesAdapter.isEmpty()) {
-			AccessibleToast.makeText(getActivity(), R.string.no_fav_to_save, Toast.LENGTH_LONG).show();
+			Toast.makeText(getActivity(), R.string.no_fav_to_save, Toast.LENGTH_LONG).show();
 		} else {
 			final AsyncTask<Void, Void, GPXFile> exportTask = new AsyncTask<Void, Void, GPXFile>() {
 				@Override
@@ -518,9 +517,9 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	protected void export() {
 		final File tosave = getMyApplication().getAppPath(FavouritesDbHelper.FILE_TO_SAVE);
 		if (favouritesAdapter.isEmpty()) {
-			AccessibleToast.makeText(getActivity(), R.string.no_fav_to_save, Toast.LENGTH_LONG).show();
+			Toast.makeText(getActivity(), R.string.no_fav_to_save, Toast.LENGTH_LONG).show();
 		} else if (!tosave.getParentFile().exists()) {
-			AccessibleToast.makeText(getActivity(), R.string.sd_dir_not_accessible, Toast.LENGTH_LONG).show();
+			Toast.makeText(getActivity(), R.string.sd_dir_not_accessible, Toast.LENGTH_LONG).show();
 		} else {
 			final AsyncTask<Void, Void, String> exportTask = new AsyncTask<Void, Void, String>() {
 				@Override
@@ -537,12 +536,12 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 				protected void onPostExecute(String warning) {
 					hideProgressBar();
 					if (warning == null) {
-						AccessibleToast.makeText(
+						Toast.makeText(
 								getActivity(),
 								MessageFormat.format(getString(R.string.fav_saved_sucessfully),
 										tosave.getAbsolutePath()), Toast.LENGTH_LONG).show();
 					} else {
-						AccessibleToast.makeText(getActivity(), warning, Toast.LENGTH_LONG).show();
+						Toast.makeText(getActivity(), warning, Toast.LENGTH_LONG).show();
 					}
 				}
 			};
@@ -715,7 +714,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			}
 			final View ch = row.findViewById(R.id.options);
 			if (!selectionMode) {
-				((ImageView) ch).setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
+				((ImageView) ch).setImageDrawable(getMyApplication().getIconsCache().getThemedIcon(R.drawable.ic_overflow_menu_white));
 				ch.setVisibility(View.VISIBLE);
 				ch.setOnClickListener(new View.OnClickListener() {
 					@Override
@@ -750,7 +749,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			if (showOptionsButton) {
 				ImageView options = (ImageView) row.findViewById(R.id.options);
 				options.setFocusable(false);
-				options.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(
+				options.setImageDrawable(getMyApplication().getIconsCache().getThemedIcon(
 						R.drawable.ic_overflow_menu_white));
 				options.setVisibility(View.VISIBLE);
 				options.setOnClickListener(new View.OnClickListener() {

OsmAnd/src/net/osmand/plus/activities/HelpActivity.java

@@ -222,7 +222,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 				convertView = LayoutInflater.from(parent.getContext()).inflate(
 						R.layout.help_to_improve_item, parent, false);
 				TextView feedbackButton = (TextView) convertView.findViewById(R.id.feedbackButton);
-				Drawable pollIcon = ctx.getIconsCache().getContentIcon(R.drawable.ic_action_message);
+				Drawable pollIcon = ctx.getIconsCache().getThemedIcon(R.drawable.ic_action_message);
 				feedbackButton.setCompoundDrawablesWithIntrinsicBounds(null, pollIcon, null, null);
 				feedbackButton.setOnClickListener(new View.OnClickListener() {
 					@Override
@@ -233,7 +233,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 				});
 				TextView contactUsButton = (TextView) convertView.findViewById(R.id.contactUsButton);
 				Drawable contactUsIcon =
-						ctx.getIconsCache().getContentIcon(R.drawable.ic_action_message);
+						ctx.getIconsCache().getThemedIcon(R.drawable.ic_action_message);
 				contactUsButton.setCompoundDrawablesWithIntrinsicBounds(null, contactUsIcon, null,
 						null);
 				final String email = ctx.getString(R.string.support_email);
@@ -396,7 +396,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 			if (menuItem.getIcon() != -1) {
 				leftImageView.setVisibility(View.VISIBLE);
 				leftImageView.setImageDrawable(context.getIconsCache()
-						.getContentIcon(menuItem.getIcon()));
+						.getThemedIcon(menuItem.getIcon()));
 			} else {
 				leftImageView.setVisibility(View.GONE);
 			}

OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java

@@ -23,7 +23,6 @@ import android.widget.TextView;
 
 import net.osmand.Location;
 import net.osmand.TspAnt;
-import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
@@ -86,7 +85,7 @@ public class IntermediatePointsDialog {
 			}
 		});
 		
-		AlertDialog.Builder builder = new AccessibleAlertBuilder(activity);
+		AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 		builder.setView(contentView);
 		builder.setInverseBackgroundForced(true);
 		lv.setBackgroundColor(Color.WHITE);
@@ -253,7 +252,7 @@ public class IntermediatePointsDialog {
 				} else {
 					int icon = position == intermediates.size() - 1? R.drawable.ic_action_target:
 						R.drawable.ic_action_intermediate;
-					tv.setCompoundDrawablesWithIntrinsicBounds(app.getIconsCache().getContentIcon(icon), null, null, null);
+					tv.setCompoundDrawablesWithIntrinsicBounds(app.getIconsCache().getThemedIcon(icon), null, null, null);
 					tv.setCompoundDrawablePadding(padding);
 					final CheckBox ch = ((CheckBox) v.findViewById(R.id.toggle_item));
 					ch.setVisibility(View.VISIBLE);

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -44,8 +44,6 @@ import net.osmand.PlatformUtil;
 import net.osmand.StateChangedListener;
 import net.osmand.ValueHolder;
 import net.osmand.access.AccessibilityPlugin;
-import net.osmand.access.AccessibleActivity;
-import net.osmand.access.AccessibleToast;
 import net.osmand.access.MapAccessibilityActions;
 import net.osmand.core.android.AtlasMapRendererView;
 import net.osmand.data.LatLon;
@@ -115,7 +113,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class MapActivity extends AccessibleActivity implements DownloadEvents,
+public class MapActivity extends OsmandActionBarActivity implements DownloadEvents,
 		ActivityCompat.OnRequestPermissionsResultCallback, IRouteInformationListener,
 		MapMarkerChangedListener {
 	public static final String INTENT_KEY_PARENT_MAP_ACTIVITY = "intent_parent_map_activity_key";
@@ -701,12 +699,12 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
 						-1);
 				getMapActions().enterRoutePlanningModeGivenGpx(null, null, null, false, true);
 			} catch (NumberFormatException e) {
-				AccessibleToast.makeText(this,
+				Toast.makeText(this,
 						getString(R.string.navigation_intent_invalid, schemeSpecificPart),
 						Toast.LENGTH_LONG).show(); //$NON-NLS-1$
 			}
 		} else {
-			AccessibleToast.makeText(this,
+			Toast.makeText(this,
 					getString(R.string.navigation_intent_invalid, schemeSpecificPart),
 					Toast.LENGTH_LONG).show(); //$NON-NLS-1$
 		}
@@ -815,16 +813,16 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
 		final int newZoom = mapView.getZoom() + stp;
 		final double zoomFrac = mapView.getZoomFractionalPart();
 		if (newZoom > 22) {
-			AccessibleToast.makeText(this, R.string.edit_tilesource_maxzoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
+			Toast.makeText(this, R.string.edit_tilesource_maxzoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
 			return;
 		}
 		if (newZoom < 1) {
-			AccessibleToast.makeText(this, R.string.edit_tilesource_minzoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
+			Toast.makeText(this, R.string.edit_tilesource_minzoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
 			return;
 		}
 		mapView.getAnimatedDraggingThread().startZooming(newZoom, zoomFrac, changeLocation);
 		if (app.accessibilityEnabled())
-			AccessibleToast.makeText(this, getString(R.string.zoomIs) + " " + newZoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
+			Toast.makeText(this, getString(R.string.zoomIs) + " " + newZoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
 		showAndHideMapPosition();
 	}
 
@@ -1096,9 +1094,9 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
 		if (Environment.MEDIA_MOUNTED.equals(state)) {
 			// ok
 		} else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-			AccessibleToast.makeText(this, R.string.sd_mounted_ro, Toast.LENGTH_LONG).show();
+			Toast.makeText(this, R.string.sd_mounted_ro, Toast.LENGTH_LONG).show();
 		} else {
-			AccessibleToast.makeText(this, R.string.sd_unmounted, Toast.LENGTH_LONG).show();
+			Toast.makeText(this, R.string.sd_unmounted, Toast.LENGTH_LONG).show();
 		}
 	}
 

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -21,8 +21,6 @@ import android.widget.Toast;
 import net.osmand.IndexConstants;
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
-import net.osmand.access.AccessibleAlertBuilder;
-import net.osmand.access.AccessibleToast;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadRect;
@@ -137,7 +135,7 @@ public class MapActivityActions implements DialogProvider {
 				String name = editText.getText().toString();
 				SavingTrackHelper savingTrackHelper = mapActivity.getMyApplication().getSavingTrackHelper();
 				savingTrackHelper.insertPointData(latitude, longitude, System.currentTimeMillis(), null, name, null, 0);
-				AccessibleToast.makeText(mapActivity, MessageFormat.format(getString(R.string.add_waypoint_dialog_added), name), Toast.LENGTH_SHORT)
+				Toast.makeText(mapActivity, MessageFormat.format(getString(R.string.add_waypoint_dialog_added), name), Toast.LENGTH_SHORT)
 						.show();
 				dialog.dismiss();
 			}
@@ -167,7 +165,7 @@ public class MapActivityActions implements DialogProvider {
 		mapActivity.runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
-				AccessibleToast.makeText(mapActivity, msg, Toast.LENGTH_LONG).show();
+				Toast.makeText(mapActivity, msg, Toast.LENGTH_LONG).show();
 			}
 		});
 	}
@@ -263,7 +261,7 @@ public class MapActivityActions implements DialogProvider {
 		@Override
 		protected void onPostExecute(String result) {
 			if (result != null) {
-				AccessibleToast.makeText(app, result, Toast.LENGTH_LONG).show();
+				Toast.makeText(app, result, Toast.LENGTH_LONG).show();
 			}
 		}
 
@@ -483,7 +481,7 @@ public class MapActivityActions implements DialogProvider {
 	}
 
 	private Dialog createReloadTitleDialog(final Bundle args) {
-		AlertDialog.Builder builder = new AccessibleAlertBuilder(mapActivity);
+		AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
 		builder.setMessage(R.string.context_menu_item_update_map_confirm);
 		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		final OsmandMapTileView mapView = mapActivity.getMapView();
@@ -493,12 +491,12 @@ public class MapActivityActions implements DialogProvider {
 				int zoom = args.getInt(KEY_ZOOM);
 				BaseMapLayer mainLayer = mapView.getMainLayer();
 				if (!(mainLayer instanceof MapTileLayer) || !((MapTileLayer) mainLayer).isVisible()) {
-					AccessibleToast.makeText(mapActivity, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
+					Toast.makeText(mapActivity, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
 					return;
 				}
 				final ITileSource mapSource = ((MapTileLayer) mainLayer).getMap();
 				if (mapSource == null || !mapSource.couldBeDownloadedFromInternet()) {
-					AccessibleToast.makeText(mapActivity, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
+					Toast.makeText(mapActivity, R.string.maps_could_not_be_downloaded, Toast.LENGTH_SHORT).show();
 					return;
 				}
 				final RotatedTileBox tb = mapView.getCurrentRotatedTileBox();

OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java

@@ -10,7 +10,6 @@ import android.widget.Toast;
 import net.osmand.CallbackWithObject;
 import net.osmand.ResultMatcher;
 import net.osmand.StateChangedListener;
-import net.osmand.access.AccessibleToast;
 import net.osmand.map.ITileSource;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.plus.ContextMenuAdapter;
@@ -228,7 +227,7 @@ public class MapActivityLayers {
 					if (g.showCurrentTrack) {
 						if (!settings.SAVE_TRACK_TO_GPX.get() && !
 								settings.SAVE_GLOBAL_TRACK_TO_GPX.get()) {
-							AccessibleToast.makeText(activity,
+							Toast.makeText(activity,
 									R.string.gpx_monitoring_disabled_warn, Toast.LENGTH_LONG).show();
 						} else {
 							g.path = getString(R.string.show_current_gpx_title);
@@ -316,7 +315,7 @@ public class MapActivityLayers {
 
 	public void selectMapLayer(final OsmandMapTileView mapView) {
 		if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) == null) {
-			AccessibleToast.makeText(activity, R.string.map_online_plugin_is_not_installed, Toast.LENGTH_LONG).show();
+			Toast.makeText(activity, R.string.map_online_plugin_is_not_installed, Toast.LENGTH_LONG).show();
 			return;
 		}
 		final OsmandSettings settings = getApplication().getSettings();

OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java

@@ -122,7 +122,7 @@ public class OpeningHoursView {
 			}
 			TextView label = (TextView)row.findViewById(R.id.label);
 			ImageView icon = (ImageView)row.findViewById(R.id.remove);
-			icon.setBackgroundDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
+			icon.setBackgroundDrawable(app.getIconsCache().getThemedIcon(R.drawable.ic_action_remove_dark));
 			if(selectedRule == position){
 				label.setTypeface(null, Typeface.BOLD);
 				label.setTextSize(22);

OsmAnd/src/net/osmand/plus/activities/PluginActivity.java

@@ -14,7 +14,6 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
@@ -128,7 +127,7 @@ public class PluginActivity extends OsmandActionBarActivity {
 		Button getButton = (Button)findViewById(R.id.plugin_get);
 		Button settingsButton = (Button)findViewById(R.id.plugin_settings);
 		settingsButton.setCompoundDrawablesWithIntrinsicBounds(
-				getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_settings),
+				getMyApplication().getIconsCache().getThemedIcon(R.drawable.ic_action_settings),
 				null, null, null);
 		View installHeader = findViewById(R.id.plugin_install_header);
 
@@ -138,7 +137,7 @@ public class PluginActivity extends OsmandActionBarActivity {
 			settingsButton.setVisibility(View.GONE);
 			installHeader.setVisibility(View.VISIBLE);
 			View worldGlobeIcon = installHeader.findViewById(R.id.ic_world_globe);
-			Drawable worldGlobeDrawable = getMyApplication().getIconsCache().getContentIcon(
+			Drawable worldGlobeDrawable = getMyApplication().getIconsCache().getThemedIcon(
 					R.drawable.ic_world_globe_dark);
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 				worldGlobeIcon.setBackground(worldGlobeDrawable);

OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java

@@ -1,8 +1,5 @@
 package net.osmand.plus.activities;
 
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.R;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -17,6 +14,10 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+
 public class PluginsActivity extends OsmandListActivity {
 	public static final int ACTIVE_PLUGINS_LIST_MODIFIED = 1;
 
@@ -121,7 +122,7 @@ public class PluginsActivity extends OsmandListActivity {
 
 
 			ImageView pluginOptions = (ImageView) view.findViewById(R.id.plugin_options);
-			pluginOptions.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
+			pluginOptions.setImageDrawable(getMyApplication().getIconsCache().getThemedIcon(R.drawable.ic_overflow_menu_white));
 			pluginOptions.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {

OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java

@@ -21,7 +21,6 @@ import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import net.osmand.access.AccessibleToast;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
@@ -533,7 +532,7 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
 			runOnUiThread(new Runnable() {
 				@Override
 				public void run() {
-					AccessibleToast.makeText(SettingsBaseActivity.this, b.toString(), Toast.LENGTH_LONG).show();
+					Toast.makeText(SettingsBaseActivity.this, b.toString(), Toast.LENGTH_LONG).show();
 
 				}
 			});

OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java

@@ -25,7 +25,6 @@ import android.widget.LinearLayout;
 import android.widget.Toast;
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
-import net.osmand.access.AccessibleToast;
 import net.osmand.osm.io.NetworkUtils;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
@@ -466,7 +465,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		final File path = new File(newDir);
 		path.mkdirs();
 		if (!path.canRead() || !path.exists()) {
-			AccessibleToast.makeText(this, R.string.specified_dir_doesnt_exist, Toast.LENGTH_LONG).show();
+			Toast.makeText(this, R.string.specified_dir_doesnt_exist, Toast.LENGTH_LONG).show();
 			return;
 		}
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -548,7 +547,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				protected void onPostExecute(Void result) {
 					setProgressVisibility(false);
 					if (!NativeOsmandLibrary.isNativeSupported(storage, getMyApplication())) {
-						AccessibleToast.makeText(SettingsGeneralActivity.this, R.string.native_library_not_supported, Toast.LENGTH_LONG).show();
+						Toast.makeText(SettingsGeneralActivity.this, R.string.native_library_not_supported, Toast.LENGTH_LONG).show();
 					}
 				}
 			}.execute();
@@ -571,7 +570,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 			runOnUiThread(new Runnable() {
 				@Override
 				public void run() {
-					AccessibleToast.makeText(SettingsGeneralActivity.this, b.toString(), Toast.LENGTH_LONG).show();
+					Toast.makeText(SettingsGeneralActivity.this, b.toString(), Toast.LENGTH_LONG).show();
 
 				}
 			});

OsmAnd/src/net/osmand/plus/activities/actions/AppModeDialog.java

@@ -80,10 +80,10 @@ public class AppModeDialog {
 			} else {
 				if (useMapTheme) {
 					boolean nightMode = ctx.getDaynightHelper().isNightModeForMapControls();
-					iv.setImageDrawable(ctx.getIconsCache().getContentIcon(mode.getSmallIconDark(), !nightMode));
+					iv.setImageDrawable(ctx.getIconsCache().getIcon(mode.getSmallIconDark(), !nightMode));
 					AndroidUtils.setBackground(ctx, iv, nightMode, R.drawable.dashboard_button_light, R.drawable.dashboard_button_dark);
 				} else {
-					iv.setImageDrawable(ctx.getIconsCache().getContentIcon(mode.getSmallIconDark()));
+					iv.setImageDrawable(ctx.getIconsCache().getThemedIcon(mode.getSmallIconDark()));
 				}
 				tb.findViewById(R.id.selection).setVisibility(View.INVISIBLE);
 			}

OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java

@@ -14,7 +14,6 @@ import android.text.ClipboardManager;
 import android.text.Html;
 import android.widget.Toast;
 
-import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
@@ -194,7 +193,7 @@ public class ShareDialog {
 			activity.startActivity(intent);
 		} else {
 			if (Version.isMarketEnabled((OsmandApplication) activity.getApplication())) {
-				AlertDialog.Builder builder = new AccessibleAlertBuilder(activity);
+				AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 				builder.setMessage(activity.getString(R.string.zxing_barcode_scanner_not_found));
 				builder.setPositiveButton(activity.getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override

OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java

@@ -22,7 +22,6 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
@@ -103,7 +102,7 @@ public class StartGPSStatus extends OsmAndAction {
 			res[i++] = g.stringRes;
 		}
 		OsmandMapTileView view = mapActivity.getMapView();
-		AlertDialog.Builder builder = new AccessibleAlertBuilder(mapActivity);
+		AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
 		LinearLayout ll = new LinearLayout(activity);
 		final ListView lv = new ListView(activity);
 		lv.setPadding(7, 3, 7, 0);
@@ -168,7 +167,7 @@ public class StartGPSStatus extends OsmAndAction {
 			mapActivity.startActivity(intent);
 		} else {
 			if (Version.isMarketEnabled(getMyApplication())) {
-				AlertDialog.Builder builder = new AccessibleAlertBuilder(mapActivity);
+				AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
 				builder.setMessage(mapActivity. getString(R.string.gps_status_app_not_found));
 				builder.setPositiveButton(mapActivity.getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override

OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java

@@ -17,7 +17,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import net.osmand.ResultMatcher;
-import net.osmand.access.AccessibleToast;
 import net.osmand.data.Amenity;
 import net.osmand.data.City;
 import net.osmand.data.LatLon;
@@ -127,7 +126,7 @@ public class GeoIntentActivity extends OsmandListActivity {
 			progress.dismiss();
 			if (result != null) {
 				if (result.isEmpty()) {
-					AccessibleToast.makeText(GeoIntentActivity.this, getString(R.string.search_nothing_found),
+					Toast.makeText(GeoIntentActivity.this, getString(R.string.search_nothing_found),
 							Toast.LENGTH_LONG).show();
 				} else {
 					if (result.hasZoom()) {
@@ -143,7 +142,7 @@ public class GeoIntentActivity extends OsmandListActivity {
 				}
 				finish();
 			} else {
-				AccessibleToast.makeText(GeoIntentActivity.this,
+				Toast.makeText(GeoIntentActivity.this,
 						getString(R.string.search_offline_geo_error, intent.getData()), Toast.LENGTH_LONG).show();
 			}
 		}

OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java

@@ -1,15 +1,5 @@
 package net.osmand.plus.activities.search;
 
-import net.osmand.access.AccessibleToast;
-import net.osmand.data.LatLon;
-import net.osmand.data.PointDescription;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.helpers.FileNameTranslationHelper;
-import net.osmand.plus.resources.RegionAddressRepository;
-import net.osmand.util.Algorithms;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -28,6 +18,16 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.helpers.FileNameTranslationHelper;
+import net.osmand.plus.resources.RegionAddressRepository;
+import net.osmand.util.Algorithms;
+
 public class SearchAddressFragment extends Fragment {
 
 	public static final String SELECT_ADDRESS_POINT_INTENT_KEY = "SELECT_ADDRESS_POINT_INTENT_KEY";
@@ -177,7 +177,7 @@ public class SearchAddressFragment extends Fragment {
 			}
 		});
 		OsmandApplication app = getApplication();
-		Drawable icon = getApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark);
+		Drawable icon = getApplication().getIconsCache().getThemedIcon(R.drawable.ic_action_remove_dark);
 		((ImageView)findViewById(R.id.ResetBuilding)).setBackgroundDrawable(icon);
 		findViewById(R.id.ResetBuilding).setOnClickListener(new View.OnClickListener(){
 			@Override
@@ -318,7 +318,7 @@ public class SearchAddressFragment extends Fragment {
 	
 	public void select(int mode) {
 		if (searchPoint == null) {
-			AccessibleToast.makeText(getActivity(), R.string.please_select_address, Toast.LENGTH_SHORT).show();
+			Toast.makeText(getActivity(), R.string.please_select_address, Toast.LENGTH_SHORT).show();
 			return;
 		}
 		AddressInformation ai = new AddressInformation();