diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 9aaade9e4b..7b8f7210cb 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -125,7 +125,7 @@
 			</intent-filter>
 		</receiver>
 
-		<activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/settings_activity" android:configChanges="keyboardHidden|orientation" />
+		<activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.monitoring.SettingsMonitoringActivity" android:configChanges="keyboardHidden|orientation" />
diff --git a/OsmAnd/res/drawable-hdpi/ic_parking_postion_arrow.png b/OsmAnd/res/drawable-hdpi/ic_parking_postion_arrow.png
new file mode 100644
index 0000000000..7016faf46a
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_parking_postion_arrow.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_parking_postion_arrow.png b/OsmAnd/res/drawable-mdpi/ic_parking_postion_arrow.png
new file mode 100644
index 0000000000..eed20c5a5c
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_parking_postion_arrow.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_parking_postion_arrow.png b/OsmAnd/res/drawable-xhdpi/ic_parking_postion_arrow.png
new file mode 100644
index 0000000000..bd15cb9769
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_parking_postion_arrow.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_parking_postion_arrow.png b/OsmAnd/res/drawable-xxhdpi/ic_parking_postion_arrow.png
new file mode 100644
index 0000000000..6b7af9ca91
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_parking_postion_arrow.png differ
diff --git a/OsmAnd/res/layout-land/menu.xml b/OsmAnd/res/layout-land/menu.xml
index 752d96613e..cc801d9f7b 100644
--- a/OsmAnd/res/layout-land/menu.xml
+++ b/OsmAnd/res/layout-land/menu.xml
@@ -16,7 +16,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				android:layout_marginLeft="12dp" android:layout_marginTop="3dp" android:layout_marginBottom="3dp" android:text="@string/app_version" android:gravity="right"
 				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="13sp"/> 
 				<ImageView android:src="@drawable/help_icon" android:id="@+id/HelpButton" android:layout_marginTop="7dp"
-				android:contentDescription="@string/help"
+				android:contentDescription="@string/shared_string_help"
 				android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="4dp"
 				android:focusable="true" android:clickable="true"/>
 				<ImageView android:src="@drawable/headliner_close" android:layout_marginRight="2dp" android:id="@+id/CloseButton"
@@ -85,7 +85,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 					android:layout_gravity="center_vertical|right"
 					android:layout_weight="1"
 					android:layout_marginRight="15dp"
-					android:text="@string/settings_Button" android:textColor="#000000" android:typeface="serif"
+					android:text="@string/shared_string_settings" android:textColor="#000000" android:typeface="serif"
 					android:textSize="16sp"/>
 				</LinearLayout> 		
 			</TableRow>
diff --git a/OsmAnd/res/layout-large-land/menu.xml b/OsmAnd/res/layout-large-land/menu.xml
index 79229e3369..ca19f1c080 100644
--- a/OsmAnd/res/layout-large-land/menu.xml
+++ b/OsmAnd/res/layout-large-land/menu.xml
@@ -16,7 +16,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/app_version" android:gravity="right"
 				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="18sp"/> 
 				<ImageView android:src="@drawable/help_icon" android:id="@+id/HelpButton" android:layout_marginTop="9dp"
-				android:contentDescription="@string/help"
+				android:contentDescription="@string/shared_string_help"
 				android:focusable="true" android:clickable="true"
 				android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="6dp"/>
 				<ImageView android:src="@drawable/headliner_close" android:layout_marginRight="4dp" android:id="@+id/CloseButton"
@@ -88,7 +88,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 					android:layout_gravity="center_vertical|right"
 					android:layout_weight="1"
 					android:layout_marginRight="15dp"
-					android:text="@string/settings_Button" android:textColor="#000000" android:typeface="serif"
+					android:text="@string/shared_string_settings" android:textColor="#000000" android:typeface="serif"
 					android:textSize="24sp"/>
 				 </LinearLayout> 		
 			</TableRow>	
diff --git a/OsmAnd/res/layout-large/menu.xml b/OsmAnd/res/layout-large/menu.xml
index b57b2536ec..e4d0a7bd13 100644
--- a/OsmAnd/res/layout-large/menu.xml
+++ b/OsmAnd/res/layout-large/menu.xml
@@ -16,7 +16,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/app_version" android:gravity="right"
 				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="20sp"/>
 				<ImageView android:id="@+id/HelpButton" android:layout_marginRight="0dp" android:layout_marginTop="9dp"
-				android:contentDescription="@string/help"
+				android:contentDescription="@string/shared_string_help"
 				android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="7dp" 
 				android:focusable="true" android:clickable="true" android:src="@drawable/help_icon"/>
 				<ImageView android:src="@drawable/headliner_close" android:layout_marginRight="4dp" android:id="@+id/CloseButton"
@@ -75,7 +75,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						    android:id="@+id/SettingsButtonText"  
 						android:layout_gravity="center_horizontal|top" android:textSize="27sp"					
-						android:text="@string/settings_Button" android:typeface="serif" android:textColor="#000000"/>
+						android:text="@string/shared_string_settings" android:typeface="serif" android:textColor="#000000"/>
 					</LinearLayout>	
 				</LinearLayout>
 			</TableRow>
diff --git a/OsmAnd/res/layout/dash_error_fragment.xml b/OsmAnd/res/layout/dash_error_fragment.xml
index bf5b9f190d..7d4b50ee55 100644
--- a/OsmAnd/res/layout/dash_error_fragment.xml
+++ b/OsmAnd/res/layout/dash_error_fragment.xml
@@ -61,7 +61,7 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:text="@string/dismiss"/>
+			android:text="@string/shared_string_dismiss"/>
 	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_plugin_item.xml b/OsmAnd/res/layout/dash_plugin_item.xml
index 6821dd9575..606511b2b2 100644
--- a/OsmAnd/res/layout/dash_plugin_item.xml
+++ b/OsmAnd/res/layout/dash_plugin_item.xml
@@ -67,8 +67,8 @@
 				android:paddingRight="9.5dp"
 				android:paddingTop="8dp"
 				android:textColor="?attr/switch_ex_text_color"
-				android:textOff="@string/enable_plugin"
-				android:textOn="@string/disable_plugin"
+				android:textOff="@string/shared_string_disabled"
+				android:textOn="@string/shared_string_enabled"
 				android:textSize="12sp"
 				android:lines="1"
 				android:maxLines="1"
diff --git a/OsmAnd/res/layout/editing_poi.xml b/OsmAnd/res/layout/editing_poi.xml
index 4c07a8de3d..ef2936388a 100644
--- a/OsmAnd/res/layout/editing_poi.xml
+++ b/OsmAnd/res/layout/editing_poi.xml
@@ -233,7 +233,7 @@
                 android:id="@+id/Cancel"
                 android:layout_width="125dp"
                 android:layout_height="wrap_content"
-                android:text="@string/default_buttons_cancel" >
+                android:text="@string/shared_string_cancel" >
             </Button>
 
             <Button
diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml
index 62fe03b004..9780acbb7e 100644
--- a/OsmAnd/res/layout/menu.xml
+++ b/OsmAnd/res/layout/menu.xml
@@ -64,7 +64,7 @@
                     android:layout_marginLeft="4dp"
                     android:layout_marginTop="7dp"
                     android:clickable="true"
-                    android:contentDescription="@string/help"
+                    android:contentDescription="@string/shared_string_help"
                     android:focusable="true"
                     android:src="@drawable/help_icon" />
 
@@ -232,7 +232,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal|top"
-                            android:text="@string/settings_Button"
+                            android:text="@string/shared_string_settings"
                             android:textColor="#000000"
                             android:textSize="18sp"
                             android:typeface="serif" />
diff --git a/OsmAnd/res/layout/package_delivered.xml b/OsmAnd/res/layout/package_delivered.xml
index e979d08ed1..a268e22d1c 100644
--- a/OsmAnd/res/layout/package_delivered.xml
+++ b/OsmAnd/res/layout/package_delivered.xml
@@ -40,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:text="@string/default_buttons_yes" />
+            android:text="@string/shared_string_yes" />
 
         <Button
             android:id="@+id/delivered_no"
@@ -48,7 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:text="@string/default_buttons_no" />
+            android:text="@string/shared_string_no" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plan_route_info.xml b/OsmAnd/res/layout/plan_route_info.xml
index 570c681f63..d7aebcce36 100644
--- a/OsmAnd/res/layout/plan_route_info.xml
+++ b/OsmAnd/res/layout/plan_route_info.xml
@@ -113,7 +113,7 @@
             android:layout_height="wrap_content"
             android:scaleType="centerInside"
             android:background="@drawable/map_btn_plain"
-            android:contentDescription="@string/previous_button"
+            android:contentDescription="@string/shared_string_previous"
             android:src="@drawable/ax_1_navigation_previous_item_light" />
 
         <ImageButton
@@ -133,7 +133,7 @@
             android:layout_marginLeft="10dp"
             android:scaleType="centerInside"
             android:background="@drawable/map_btn_plain"
-            android:contentDescription="@string/next_button"
+            android:contentDescription="@string/shared_string_next"
             android:src="@drawable/ax_1_navigation_next_item_light" />
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 52f3fe8798..b048498434 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -44,7 +44,7 @@
 				android:drawableStart="?attr/ic_action_settings"
 				android:paddingLeft="0dp"
 				android:paddingRight="16dp"
-				android:text="@string/plugin_settings_button_caption"
+				android:text="@string/shared_string_settings"
 				android:textColor="?android:textColorPrimary"
 				android:textSize="12sp"
 				android:lines="1"
@@ -70,8 +70,8 @@
 					android:paddingRight="9.5dp"
 					android:paddingTop="8dp"
 					android:textColor="?attr/switch_ex_text_color"
-					android:textOff="@string/enable_plugin"
-					android:textOn="@string/disable_plugin"
+					android:textOff="@string/shared_string_disabled"
+					android:textOn="@string/shared_string_enabled"
 					android:textSize="12sp"
 					android:lines="1"
 					android:maxLines="1"
diff --git a/OsmAnd/res/layout/save_directions_dialog.xml b/OsmAnd/res/layout/save_directions_dialog.xml
index adc600c5ce..302606d1a9 100644
--- a/OsmAnd/res/layout/save_directions_dialog.xml
+++ b/OsmAnd/res/layout/save_directions_dialog.xml
@@ -42,7 +42,7 @@
         <Button
             android:layout_width="125dp"
             android:layout_height="wrap_content"
-            android:text="@string/default_buttons_cancel"
+            android:text="@string/shared_string_cancel"
             android:id="@+id/Cancel"></Button>
 
         <Button
diff --git a/OsmAnd/res/layout/tips_and_tricks.xml b/OsmAnd/res/layout/tips_and_tricks.xml
index 79406ae754..933b742c67 100644
--- a/OsmAnd/res/layout/tips_and_tricks.xml
+++ b/OsmAnd/res/layout/tips_and_tricks.xml
@@ -31,14 +31,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="70dp"
-            android:text="@string/previous_button" />
+            android:text="@string/shared_string_previous" />
 
         <Button
             android:id="@+id/NextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="70dp"
-            android:text="@string/next_button" />
+            android:text="@string/shared_string_next" />
 
         <Button
             android:id="@+id/CloseButton"
diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index ffa32ad9ea..01a02d9413 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -121,14 +121,14 @@
   <string name="show_ruler_level">Wys liniaal</string>
   <string name="info_button">Inligting</string>
   <string name="back_to_location">Terug na ligging</string>
-  <string name="help">Help</string>
+  <string name="shared_string_help">Help</string>
   <string name="show_details">Vertoon besonderhede</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="accessibility_on">Aan</string>
-  <string name="accessibility_off">Af</string>
+  <string name="shared_string_on">Aan</string>
+  <string name="shared_string_off">Af</string>
   <string name="accessibility_default">Volgens die oorhoofse stelsel instellings</string>
   <string name="backToMenu">Terug na keuselys</string>
   <string name="zoomOut">Verklein</string>
@@ -391,7 +391,7 @@
   <string name="map_underlay">Onderliggende kaart</string>
   <string name="map_underlay_descr">Kies onderliggende kaart</string>
   <string name="layer_overlay">Oorliggende kaart…</string>
-  <string name="default_none">Geen</string>
+  <string name="shared_string_none">Geen</string>
   <string name="map_overlay">Oorleg kaart</string>
   <string name="map_overlay_descr">Kies oorleg kaart</string>
   <string name="tile_source_already_installed">Kaart is reeds geïnstalleer, instellings sal opdateer word</string>
@@ -431,8 +431,8 @@
   <string name="tip_initial">Wenke en wyses</string>
   <string name="tip_initial_t">\tOsmAnd is \'n navigasietoepassing met baie funksies.\n\tAs \'n basiese inleiding, is sommige gebruikswenke en wyses beskikbaar in skakels vanaf die hoof kieslys skerm.
 	</string>
-  <string name="next_button">Volgende</string>
-  <string name="previous_button">Vorige</string>
+  <string name="shared_string_next">Volgende</string>
+  <string name="shared_string_previous">Vorige</string>
   <string name="unit_of_length_descr">Verander eenhede van lengte en spoed</string>
   <string name="unit_of_length">Meeteenheid</string>
   <string name="si_mi_foots">Myle / voete</string>
@@ -475,7 +475,7 @@
   <string name="indexing_map">Besig om `n kaartindeks te skep…</string>
   <string name="indexing_poi">Besig om `n interessante plek indeks te skep…</string>
   <string name="indexing_transport">Skep vervoer indeks…</string>
-  <string name="input_output_error">Lees/skryf fout het voorgekom</string>
+  <string name="shared_string_io_error">Lees/skryf fout het voorgekom</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -653,7 +653,7 @@
   <string name="transport_stops_to_pass">haltes om verby te gaan</string>
   <string name="transport_route_distance">Roete afstand</string>
   <string name="transport">Vervoer</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Wys openbare vervoer haltes op die kaart</string>
   <string name="show_transport_over_map">Wys vervoer haltes</string>
   <string name="hello">navigasie toepassing OsmAnd</string>
@@ -670,7 +670,7 @@
   <string name="search_history_building">Gebou: {0}, {1}, {2}</string>
   <string name="favorite">Gunsteling</string>
   <string name="clear_all">Vee alles uit</string>
-  <string name="history">Geskiedenis</string>
+  <string name="shared_string_history">Geskiedenis</string>
   <string name="uploading_data">Besig om inligting op te laai…</string>
   <string name="uploading">Besig met oplaai…</string>
   <string name="search_nothing_found">Niks gevind nie</string>
@@ -747,7 +747,7 @@
   <string name="auto_zoom_map_descr">Outo vergroot kaart volgens jou spoed</string>
   <string name="auto_zoom_map">Vergroot kaart outomaties</string>
   <string name="additional_settings">Bykomende stellings</string>
-  <string name="settings">Stellings</string>
+  <string name="shared_string_settings">Stellings</string>
   <string name="save_current_track_descr">Berg huidige spoor nou op SD</string>
   <string name="save_current_track">Berg huidige spoor</string>
   <string name="save_track_interval">Log tussenpose</string>
@@ -827,11 +827,11 @@
   <string name="context_menu_item_update_map">opgradeer kaart</string>
   <string name="context_menu_item_open_bug">Open OSM fout</string>
   <string name="context_menu_item_create_poi">skep interessante plek</string>
-  <string name="default_buttons_yes">Ja</string>
-  <string name="default_buttons_cancel">Kanseleer</string>
+  <string name="shared_string_yes">Ja</string>
+  <string name="shared_string_cancel">Kanseleer</string>
   <string name="default_buttons_apply">toepas</string>
   <string name="default_buttons_add">Voeg by</string>
-  <string name="default_buttons_no">Nee</string>
+  <string name="shared_string_no">Nee</string>
   <string name="add_favorite_dialog_top_text">Tik gunsteling naam in</string>
   <string name="add_favorite_dialog_default_favourite_name">Gunsteling</string>
   <string name="add_favorite_dialog_favourite_added_template">Gunsteling punt \'{0}\' is bygevoeg.</string>
@@ -1321,8 +1321,8 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
     <string name="keep_and_add_destination_point">Voeg by as bestemmingspunt</string>
     <string name="select_gpx">Kies GPX …</string>
     <string name="route_descr_select_destination">Kies bestemming</string>
-    <string name="route_descr_select_on_map">Kies op kaart …</string>
-    <string name="route_descr_favorite">Gunsteling …</string>
+    <string name="shared_string_select_on_map">Kies op kaart …</string>
+    <string name="shared_string_favorite">Gunsteling …</string>
     <string name="route_preferences">Roete voorkeure</string>
     <string name="route_info">Roete inligting</string>
     <string name="routing_attr_prefer_motorway_name">Verkies snelweg</string>
@@ -1359,8 +1359,8 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
     <string name="tip_faq">Gereëlde Vrae</string>
     <string name="remember_choice">Onthou my keuse</string>
     <string name="gps_status_eclipsim">GPS status</string>
-    <string name="default_and">en</string>
-    <string name="default_or">of</string>
+    <string name="shared_string_and">en</string>
+    <string name="shared_string_or">of</string>
 	<string name="osmodroid_refresh">Verfris kanale</string>
     <string name="osmodroid_seek">Soek objek</string>
     <string name="osmo_settings_uuid">Unieke toestel ID</string>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 716b036b98..e0f3906798 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -165,14 +165,14 @@
 	<string name="show_ruler_level">عرض المسطرة</string>	
 	<string name="info_button">معلومات</string>
 	<string name="back_to_location">عودة إلى الموقع</string>
-	<string name="help">مساعدة</string>
+	<string name="shared_string_help">مساعدة</string>
 	<string name="show_details">مشاهدة التفاصيل</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_on">تفعيل</string>
-	<string name="accessibility_off">إيقاف</string>
+	<string name="shared_string_on">تفعيل</string>
+	<string name="shared_string_off">إيقاف</string>
 	<string name="accessibility_default">وفقا لإعداد النظام العالمي</string>
 	<string name="backToMenu">الرجوع إلى القائمة</string>
 	<string name="zoomOut">تصغير</string>
@@ -271,9 +271,9 @@
 	<string name="add_favorite_dialog_default_favourite_name">مفضل</string>
 	<string name="default_buttons_apply">تطبق</string>
 	<string name="default_buttons_add">إضافة</string>
-	<string name="default_buttons_no">ليس</string>
-	<string name="default_buttons_yes">نعم</string>
-	<string name="default_buttons_cancel">إلغاء</string>
+	<string name="shared_string_no">ليس</string>
+	<string name="shared_string_yes">نعم</string>
+	<string name="shared_string_cancel">إلغاء</string>
 	<string name="context_menu_item_update_map">تحديث الخريطة</string>
 	<string name="navigate_point_cancel">إلغاء</string>
 	<string name="search_address_top_text">حدد عنوان</string>
@@ -315,7 +315,7 @@
 	<string name="use_english_names">استخدام الاسماء الانجليزية في الخرائط</string>
 	<string name="app_settings">إعدادات التطبيق</string>
 	<string name="save_current_track">حفظ المسار الحالي GPX</string>
-	<string name="settings">إعدادات</string>
+	<string name="shared_string_settings">إعدادات</string>
 	
     
     
@@ -559,8 +559,8 @@
 	<string name="vector_maps_may_display_faster_on_some_devices">عادة تعرض الخرائط الاتجاهية أسرع. ربما لا تعمل جيدا على بعض الأجهزة.</string>
 	<string name="play_commands_of_currently_selected_voice">شغل الأوامر من الصوت المحدد الحالي</string>
 	<string name="switch_to_raster_map_to_see">لا توجد خرائط متجهة محلية لهذا المكان. يمكنك تنزيل أحدها من الإعدادات (إدارة البيانات)، أو الانتقال خرائط الانترنت.</string>
-	<string name="default_and">و</string>
-    <string name="default_or">أو</string>
+	<string name="shared_string_and">و</string>
+    <string name="shared_string_or">أو</string>
 	<string name="av_camera_focus_continuous">التركيز المستمر</string>
 	<string name="free_version_title">الإصدار المجاني</string>
 	<string name="index_name_north_america">أمريكا الشمالية</string>
@@ -1235,7 +1235,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="map_underlay">خريطة الاساس الذي تقوم عليها</string>
 	<string name="map_underlay_descr">اختيار خريطة الاساس الذي تقوم عليه</string>
 	<string name="layer_overlay">خريطة تراكب</string>
-	<string name="default_none">لا شيء</string>
+	<string name="shared_string_none">لا شيء</string>
 	<string name="map_overlay">خريطة تراكب</string>
 	<string name="map_overlay_descr">اختيار خريطة التراكب</string>
 	<string name="poi_dialog_other_tags_message">يتم الاحتفاظ بكافة العلامات الاخري</string>
@@ -1301,8 +1301,8 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 → → \ ن \ غر مقدمة أساسية، ترتبط بعض النصائح والحيل عبر استخدام \'القائمة \' → \'نصائح \' من شاشة الخريطة. ↵
 →
 	</string>
-	<string name="next_button">التالي</string>
-	<string name="previous_button">السابق</string>
+	<string name="shared_string_next">التالي</string>
+	<string name="shared_string_previous">السابق</string>
 	<string name="unit_of_length_descr">تغيير وحدات الطول والسرعة</string>
 	<string name="unit_of_length">وحدة القياس</string>
 	<string name="si_mi_foots">ميل/قدم</string>
@@ -1343,7 +1343,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="indexing_map">يفهرس الخريطة…</string>
 	<string name="indexing_poi">يفهرس POI…</string>
 	<string name="indexing_transport">النقل الفهرسة…</string>
-	<string name="input_output_error">حدث خطا</string>
+	<string name="shared_string_io_error">حدث خطا</string>
 	<string name="km">كيلومتر</string>
 	<string name="km_h">كيلومتر/ساعة</string>
 	<string name="m">متر</string>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 74c5d2b473..ed86818d6d 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -25,7 +25,7 @@
     <string name="download_tab_updates">Abnaŭlieńnі</string>
     <string name="download_tab_local">Liakaĺny</string>
 	<string name="no_internet_connection">Niemahčyma spampavać. Kalі laska, praviercie vaša Іnternet-zlučeńnie.</string>
-    <string name="dismiss">Skasavać</string>
+    <string name="shared_string_dismiss">Skasavać</string>
     <string name="everything_up_to_date">Usie fajly ŭ aktuaĺnym stanie</string>
     <string name="use_opengl_render">Vykarystoŭvać OpenGL</string>
     <string name="use_opengl_render_descr">Vykarystoŭvać aparatnaje paskareńnie OpenGL (moža nie pracavać na niekatorych prystasavańniach)</string>
@@ -45,7 +45,7 @@
     <string name="lock_screen_request_explanation">%1$s patrabuje dazvol na vykliučeńnie ekranu dlia enierhazbieražeńnia.</string>
     <string name="wake_on_voice">Ukliučyć ekran</string>
     <string name="wake_on_voice_descr">Ukliučać ekran prystasavańnia pry nablіžeńnі da pavarotu</string>
-    <string name="wake_on_voice_never">Nіkolі</string>
+    <string name="shared_string_never">Nіkolі</string>
     <string name="select_impassable_road">Vybrać na mapie…</string>
     <string name="impassable_road">Paźbiahać darohі…</string>
     <string name="tip_recent_changes_1_9_t">"Źmieny ŭ 1.9: * Abnoŭlienyja stylі mapy z pakazam pakryćcia daroh, transpartnym slojem і piešachodnymі sіmvalamі * Pošuk POI ŭzdoŭž maršrutu * Paznačeńnie darohі jak nieprachodnaj * Liahčej spampoŭvać і abnaŭliać mapy * Atrymańnie vіzuaĺnaha і hukavaha apaviaščeńnia pry nablіžeńnі da punktu maršrutu * Pakaz maršrutu і іnfarmacyі pra pavaroty * Padtrymka palos dlia pavarotu * Padtrymka Android Wear * Šmat źmienaŭ іnterfiejsu * Asobny zum dlia tekstu na mapie * Spiecyjaĺnyja aŭdyjoapaviaščeńnі ŭ vypadku, kalі vy znachodzіciesia pa-za maršrutam * Funkcyja aŭtaryzacyі OsMo * Vypraŭliena niesumiaščaĺnaść viersіj OsMo "</string>
@@ -213,7 +213,7 @@
     <string name="gpx_wpt">Punkt šliachu</string>
     <string name="selected_gpx_info_show">\n\nNacіśnіcie і ŭtrymlіvajcie, kab ubačyć na mapie</string>
     <string name="delay_navigation_start">Aŭtamatyčna pačać navіhacyju</string>
-    <string name="selected">vybrana</string>
+    <string name="shared_string_selected_lowercase">vybrana</string>
     <string name="local_index_gpx_info_show">\n\nNacіsnuć і trymać dlia naladaŭ</string>
 	<string name="gpx_info_subtracks">"Častak śliedu: %1$s "</string>
 	<string name="gpx_info_waypoints">"Adznačanych punktaŭ: %1$s "</string>
@@ -392,8 +392,8 @@
     <string name="keep_and_add_destination_point">Dadać punktam pryznačeńnia</string>
     <string name="select_gpx">Vybrać GPX…</string>
     <string name="route_descr_select_destination">Vybrać miesca pryznačeńnia</string>
-    <string name="route_descr_select_on_map">Vybrać na mapie…</string>
-    <string name="route_descr_favorite">Upadabanyja.…</string>
+    <string name="shared_string_select_on_map">Vybrać na mapie…</string>
+    <string name="shared_string_favorite">Upadabanyja.…</string>
     <string name="route_preferences">Nastrojkі maršruta</string>
     <string name="route_info">Іnfarmacyja pra maršrut</string>
     <string name="routing_attr_prefer_motorway_name">Addavać pieravahu aŭtamahіstraliam</string>
@@ -451,8 +451,8 @@
     <string name="animate_routing_gpx">Іmіtacyja z vykarystańniem GPX-śliedu</string>
     <string name="remember_choice">Zapomnіć moj vybar</string>
     <string name="gps_status_eclipsim">Status GPS</string>
-    <string name="default_and">і</string>
-    <string name="default_or">cі</string>
+    <string name="shared_string_and">і</string>
+    <string name="shared_string_or">cі</string>
 	<string name="route_is_too_long">Pazasiecіŭnaja maršrutyzacyja OsmAnd moža zaniać vieĺmі šmat času (a časam і nie spracavać) dlia kropak na adliehlaścі boĺš čym u 200 km adzіn ad adnaho. Vy možacie dadać pramiežkavyja šliachavyja kropkі dlia pavyšeńnia pradukcyjnascі.</string>
 	<string name="auto_zoom_none">Biez aŭtamatyčnaha maštabavańnia</string>
 	<string name="auto_zoom_close">Bujniej</string>
@@ -1004,14 +1004,14 @@
 	<string name="show_ruler_level">Pakazvać maštab</string>	
 	<string name="info_button">Іnfarmacyja</string>
 	<string name="back_to_location">Viarnucca da pazіcyі</string>
-	<string name="help">Dapamoha</string>
+	<string name="shared_string_help">Dapamoha</string>
 	<string name="show_details">Pakazać detalі</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="accessibility_on">Ukl</string>
-	<string name="accessibility_off">Vykl</string>
+	<string name="shared_string_on">Ukl</string>
+	<string name="shared_string_off">Vykl</string>
 	<string name="accessibility_default">Pavodlie hliabaĺnych naladaŭ systemy</string>
 	<string name="backToMenu">Nazad da meniu</string>
 	<string name="zoomOut">Addalіć</string>
@@ -1322,7 +1322,7 @@
 	<string name="map_underlay">Mapa padkladkі</string>
 	<string name="map_underlay_descr">Abrać mapu dlia padkladkі</string>
 	<string name="layer_overlay">Mapa pakryćcia…</string>
-	<string name="default_none">Niama</string>
+	<string name="shared_string_none">Niama</string>
 	<string name="map_overlay">Mapa dlia nakladańnia</string>
 	<string name="map_overlay_descr">Abrać mapu dlia nakladańnia</string>
 	<string name="tile_source_already_installed">Mapa ŭžo ŭstaliavana, nalady buduć abnoŭlieny</string>
@@ -1360,8 +1360,8 @@
 	<string name="tip_map_context_menu_t">"antekstnaje mieniu karty zmiaščaje ŭsie mahčymyja dziejannі, jakіja adnosiacca da abranaj kropkі (miesca). ?
 \n\nJano dastupna, kalі nacіsnuć і ŭtrymlіvać kropku na karcie (zatym nacіsnuć na jaje markier), abo nacіsnuŭšy na knopku džojscіka, abo vybraŭšy praz ieniu &gt; antekstnaje mieniudva apošnіja sposaby spasylajucca na kropku ŭ siaredzіnie ekrana) ?
 \n\nVakienca markiera chavajecca doŭhіm nacіskanniem na jaho. ? "</string>
-	<string name="next_button">Daliej</string>
-	<string name="previous_button">Nazad</string>
+	<string name="shared_string_next">Daliej</string>
+	<string name="shared_string_previous">Nazad</string>
 	<string name="unit_of_length_descr">Źmianіć adzіnkі adliehlaścі j chutkaścі</string>
 	<string name="unit_of_length">Adzіnkі vymiareńnia</string>
 	<string name="si_mi_foots">Mіlі/futy</string>
@@ -1404,7 +1404,7 @@
 	<string name="indexing_map">Іndeksavańnie mapaŭ…</string>
 	<string name="indexing_poi">Іndeksavańnie cіkavostkaŭ…</string>
 	<string name="indexing_transport">Іndeksujecca transpart…</string>
-	<string name="input_output_error">Nadarylasia I/O pamylka</string>
+	<string name="shared_string_io_error">Nadarylasia I/O pamylka</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -1575,7 +1575,7 @@
 	<string name="transport_stops_to_pass">prypynkaŭ na šliachu</string>
 	<string name="transport_route_distance">Daŭžynia maršrutu</string>
 	<string name="transport">Transpart</string>
-	<string name="default_buttons_ok">Dobra</string>
+	<string name="shared_string_ok">Dobra</string>
 	<string name="show_transport_over_map_description">Pakazać prypynkі hramadskaha transpartu na mapie</string>
 	<string name="show_transport_over_map">Pakazvać prypynkі transpartu</string>
 	<string name="hello">Navіhacyjnaja prahrama OsmAnd</string>
@@ -1592,7 +1592,7 @@
 	<string name="search_history_building">Budynak: {0}, {1}, {2}</string>
 	<string name="favorite">Upadabanaje</string>
 	<string name="clear_all">Vydalіć usio</string>
-	<string name="history">Hіstoryja</string>
+	<string name="shared_string_history">Hіstoryja</string>
 	<string name="uploading_data">Adsylka dadzienych…</string>
 	<string name="uploading">Adsylka…</string>
 	<string name="search_nothing_found">Nіčoha nie znojdziena</string>
@@ -1665,7 +1665,7 @@
 	<string name="map_preferences_descr">Nastrojka krynіcy і paramietraŭ mapy, kaardynat markiera, aryjentacyі ekrana</string>
 	<string name="osm_settings">Redahavańnie OSM</string>
 	<string name="additional_settings">Dadatkovyja nalady</string>
-	<string name="settings">Nalady</string>
+	<string name="shared_string_settings">Nalady</string>
 	<string name="update_tile">Abnavіć mapu</string>
 	<string name="reload_tile">Abnavіć častku mapy</string>
 	<string name="mark_point">Ceĺ</string>
@@ -1734,11 +1734,11 @@
 	<string name="context_menu_item_update_map">Abnavіć mapu</string>
 	<string name="context_menu_item_open_bug">Paviedamіć pra pamylku na mapie</string>
 	<string name="context_menu_item_create_poi">Stvaryć cіkavostku</string>
-	<string name="default_buttons_yes">Tak</string>
-	<string name="default_buttons_cancel">Skasavać</string>
+	<string name="shared_string_yes">Tak</string>
+	<string name="shared_string_cancel">Skasavać</string>
 	<string name="default_buttons_apply">Zastasavać</string>
 	<string name="default_buttons_add">Dadać</string>
-	<string name="default_buttons_no">Nie</string>
+	<string name="shared_string_no">Nie</string>
 	<string name="add_favorite_dialog_top_text">Kalі laska, uviadzіcie іmia punktu</string>
 	<string name="add_favorite_dialog_default_favourite_name">Upadabanaje</string>
 	<string name="add_favorite_dialog_favourite_added_template">Upadabanaje miesca \\{0}\\ bylo dadadzienaje.</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index a4a63439df..fa61515e11 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -663,14 +663,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="show_ruler_level">Паказваць маштаб</string>	
 	<string name="info_button">Інфармацыя</string>
 	<string name="back_to_location">Вярнуцца да пазіцыі</string>
-	<string name="help">Дапамога</string>
 	<string name="show_details">Паказаць дэталі</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_on">Укл</string>
-	<string name="accessibility_off">Выкл</string>
 	<string name="accessibility_default">Паводле глябальных наладаў сыстэмы</string>
 	<string name="backToMenu">Назад да мэню</string>
 	<string name="zoomOut">Аддаліць</string>
@@ -973,7 +970,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="map_underlay">Мапа падкладкі</string>
 	<string name="map_underlay_descr">Абраць мапу для падкладкі</string>
 	<string name="layer_overlay">Мапа пакрыцьця…</string>
-	<string name="default_none">Няма</string>
 	<string name="map_overlay">Мапа для накладаньня</string>
 	<string name="map_overlay_descr">Абраць мапу для накладаньня</string>
 	<string name="tile_source_already_installed">Мапа ўжо ўсталявана, налады будуць абноўлены</string>
@@ -1007,8 +1003,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	</string>
 	<string name="tip_initial">Дапамога і хітрасьці</string>
 	<string name="tip_initial_t">"OsmAnd — навігацыйная праграма з вялікімі магчымасьцямі.\n\nПачатковыя зьвесткі, парады па выкарыстаньні і разгорнуты дапаможнік знаходзяцца ў «Меню» → «Дапамога». "</string>
-	<string name="next_button">Далей</string>
-	<string name="previous_button">Назад</string>
 	<string name="unit_of_length_descr">Зьмяніць адзінкі адлегласьці й хуткасьці</string>
 	<string name="unit_of_length">Адзінкі вымярэньня</string>
 	<string name="si_mi_foots">Мілі/футы</string>
@@ -1051,7 +1045,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="indexing_map">Індэксаваньне мапаў…</string>
 	<string name="indexing_poi">Індэксаваньне POI…</string>
 	<string name="indexing_transport">Індэксуецца транспарт…</string>
-	<string name="input_output_error">Надарылася I/O памылка</string>
 	<string name="km">км</string>
 	<string name="km_h">км/г</string>
 	<string name="m">м</string>
@@ -1220,7 +1213,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="transport_stops_to_pass">прыпынкаў на шляху</string>
 	<string name="transport_route_distance">Даўжыня маршруту</string>
 	<string name="transport">Транспарт</string>
-	<string name="default_buttons_ok">Добра</string>
 	<string name="show_transport_over_map_description">Паказаць прыпынкі грамадзкага транспарту на мапе</string>
 	<string name="show_transport_over_map">Паказваць прыпынкі транспарту</string>
 	<string name="hello">Навігацыйная праграма OsmAnd</string>
@@ -1237,7 +1229,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_history_building">Будынак: {0}, {1}, {2}</string>
 	<string name="favorite">Упадабанае</string>
 	<string name="clear_all">Выдаліць усё</string>
-	<string name="history">Гісторыя</string>
 	<string name="uploading_data">Адсылка дадзеных…</string>
 	<string name="uploading">Адсылка…</string>
 	<string name="search_nothing_found">Нічога не знойдзена</string>
@@ -1311,7 +1302,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="map_preferences_descr">Настройка крыніцы і параметраў мапы, каардынат маркера, арыентацыі экрана</string>
 	<string name="osm_settings">Рэдагаваньне OSM</string>
 	<string name="additional_settings">Дадатковыя налады</string>
-	<string name="settings">Налады</string>
 	<string name="save_current_track_descr">Захаваць бягучы сьлед на SD зараз</string>
 	<string name="save_current_track">Захаваць бягучы GPX сьлед</string>
 	<string name="save_track_interval">Інтэрвал захоўваньня падчас навігацыі</string>
@@ -1386,11 +1376,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="context_menu_item_update_map">Абнавіць мапу</string>
 	<string name="context_menu_item_open_bug">Паведаміць пра памылку на мапе</string>
 	<string name="context_menu_item_create_poi">Стварыць POI</string>
-	<string name="default_buttons_yes">Так</string>
-	<string name="default_buttons_cancel">Скасаваць</string>
 	<string name="default_buttons_apply">Застасаваць</string>
 	<string name="default_buttons_add">Дадаць</string>
-	<string name="default_buttons_no">Не</string>
 	<string name="add_favorite_dialog_top_text">Калі ласка, увядзіце імя пункту</string>
 	<string name="add_favorite_dialog_default_favourite_name">Упадабанае</string>
 	<string name="add_favorite_dialog_favourite_added_template">Упадабанае месца \'\'{0}\'\' было дададзенае.</string>
@@ -1505,7 +1492,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="calculate_osmand_route_without_internet">Вылічыць адрэзак маршруту OsmAnd без Інтэрнэту</string>
     <string name="gpx_option_calculate_first_last_segment">Вылічыць маршрут OsmAnd для першага і апошняга ўчастка маршруту</string>
     <string name="use_displayed_track_for_navigation">Ці хочаце вы выкарыстоўваць адлюстраваны сьлед для навігацыі?</string>
-    <string name="route_descr_select_on_map">Выбраць на мапе…</string>
     <string name="route_info">Інфармацыя пра маршрут</string>
     <string name="routing_attr_prefer_motorway_name">Аддаваць перавагу аўтамагістралям</string>
 	<string name="routing_attr_short_way_name">Самы кароткі шлях</string>
@@ -1536,8 +1522,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="index_item_nation_addresses">адрасы па ўсёй краіне</string>
 	<string name="osmodroid_seek">Адсочваць аб\'ект</string>
     <string name="osmodroid_refresh">Абнавіць каналы</string>
-    <string name="default_or">ці</string>
-	<string name="default_and">і</string>
     <string name="gps_status_eclipsim">Стан GPS</string>
     <string name="remember_choice">Запомніць мой выбар</string>
     <string name="index_item_world_basemap">Сусьветная аглядная мапа</string>
@@ -1552,7 +1536,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="index_item_world_bitcoin_payments">Bitcoin плацяжы ўсяго сьвету</string>
 	<string name="keep_and_add_destination_point">Дадаць пунктам прызначэньня</string>
     <string name="route_descr_select_destination">Выбраць месца прызначэньня</string>
-    <string name="route_descr_favorite">Упадабаныя…</string>
     <string name="route_preferences">Настройкі маршрута</string>
     <string name="calculate_osmand_route_gpx">Разьлічыць пазасеціўны маршрут OsmAnd</string>
     <string name="guidance_preferences_descr">Навігацыйныя настройкі</string>
@@ -1778,7 +1761,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="gpx_selection_track">%1$s \nСьлед %2$s</string>
     <string name="gpx_info_subtracks">Частак сьледу: %1$s </string>
 	<string name="gpx_split_interval">Інтэрвал нарэзкі</string>
-    <string name="selected">выбрана</string>
     <string name="gpx_info_asc_altitude">Пад’ём/спад: %1$s</string>
     <string name="loading_smth">Чытаньне %1$s…</string>
     <string name="map_widget_plain_time">Бягучы час</string>
@@ -1943,7 +1925,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="rendering_category_hide">Схаваць</string>
     <string name="wake_on_voice">Уключыць экран</string>
     <string name="wake_on_voice_descr">Уключаць экран прыстасаваньня пры набліжэньні да павароту</string>
-    <string name="wake_on_voice_never">Ніколі</string>
     <string name="lock_screen_request_explanation">%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.</string>
     <string name="advanced_settings">Дадатковыя</string>
 	<string name="osmo_use_https_descr">Выкарыстоўваць бясьпечнае злучэньне з серверам</string>
@@ -1958,7 +1939,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="use_opengl_render">Выкарыстоўваць OpenGL</string>
     <string name="use_opengl_render_descr">Выкарыстоўваць апаратнае паскарэньне OpenGL (можа не працаваць на некаторых прыстасаваньнях)</string>
     <string name="everything_up_to_date">Усе файлы ў актуальным стане</string>
-    <string name="dismiss">Скасаваць</string>
     <string name="no_internet_connection">Немагчыма cьцягнуць. Калі ласка, праверце ваша Інтэрнэт-злучэньне.</string>
     <string name="download_tab_downloads">Усе cьцягваньні</string>
     <string name="download_tab_updates">Абнаўленьні</string>
@@ -2009,15 +1989,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="gps_status">Стан GPS</string>
     <string name="parking_place">Парковачнае месца</string>
     <string name="remove_the_tag">Выдаліць тэг</string>
-    <string name="enable_plugin">Адключана</string>
-	<string name="disable_plugin">Уключана</string>
 <string name="plugin_description_title">Апісаньне</string>
 	<string name="plugin_settings_button_caption">Налады</string>
 <string name="edit_group">Правіць групу</string>
     <string name="osmo">OsMo</string>
 	<string name="plugin_install_needs_network">Неабходна падключэньне да Інтэрнэту, каб усталяваць гэты модуль.</string>
-<string name="enable_plugin2">Уключыць</string>
-	<string name="disable_plugin2">Адключыць</string>
 	<string name="get_plugin">Атрымаць</string>
 <string name="plugin_ski_name">Лыжныя мапы</string>
     <string name="plugin_nautical_name">Марскія мапы</string>
@@ -2043,4 +2019,79 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	</string>
 
 	<string name="back_to_map">Вярнуцца да мапы</string>
+	<string name="track_segments">Адрэзкі сьледу</string>
+	<string name="track_points">Пункты сьледу</string>
+	<string name="location_on_map">Каардынаты:\n Шырата %1$s\n Даўгата %2$s</string>
+	<string name="currently_recording_track">Сьлед, што запісваецца</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">OK</string>
+	<string name="shared_string_cancel">Скасаваць</string>
+	<string name="shared_string_dismiss">Скасаваць</string>
+	<string name="shared_string_yes">Так</string>
+	<string name="shared_string_no">Не</string>
+	<string name="shared_string_on">Уключыць</string>
+	<string name="shared_string_off">Выключыць</string>
+	<string name="shared_string_previous">Назад</string>
+	<string name="shared_string_next">Далей</string>
+	<string name="shared_string_enable">Уключыць</string>
+	<string name="shared_string_disable">Адключыць</string>
+	<string name="shared_string_enabled">Уключана</string>
+	<string name="shared_string_disabled">Адключана</string>
+	<string name="shared_string_selected">Абрана</string>
+	<string name="shared_string_selected_lowercase">абрана</string>
+	<string name="shared_string_never">Ніколі</string>
+	<string name="shared_string_none">Ніякі</string>
+	<string name="shared_string_and">і</string>
+	<string name="shared_string_or">ці</string>
+	<string name="shared_string_help">Дапамога</string>
+	<string name="shared_string_settings">Налады</string>
+	<string name="shared_string_history">Гісторыя</string>
+	<string name="shared_string_select_on_map">Выбраць на мапе</string>
+	<string name="shared_string_select_all">Выбраць усё</string>
+	<string name="shared_string_deselect">Прыбраць вылучэньне</string>
+	<string name="shared_string_deselect_all">Прыбраць вылучэньне ўсіх</string>
+	<string name="shared_string_clear">Ачысьціць</string>
+	<string name="shared_string_clear_all">Ачысьціць усё</string>
+	<string name="shared_string_save">Захаваць</string>
+	<string name="shared_string_save_as_gpx">Захаваць як GPX сьлед</string>
+	<string name="shared_string_rename">Пераназваць</string>
+	<string name="shared_string_delete">Выдаліць</string>
+	<string name="shared_string_delete_all">Выдаліць усё</string>
+	<string name="shared_string_share">Падзяліцца</string>
+	<string name="shared_string_add">Дадаць</string>
+	<string name="shared_string_apply">Ужыць</string>
+	<string name="shared_string_control_start">Пачаць</string>
+	<string name="shared_string_control_stop">Спыніць</string>
+	<string name="shared_string_import">Імпартаваць</string>
+	<string name="shared_string_export">Экспартаваць</string>
+	<string name="shared_string_more">Больш</string>
+	<string name="shared_string_do_not_show_again">Больш не паказваць</string>
+	<string name="shared_string_remember_my_choice">Запомніць мой выбар</string>
+	<string name="shared_string_refresh">Абнавіць</string>
+	<string name="shared_string_download">Сцягнуць</string>
+	<string name="shared_string_downloading">Сьцягваньне</string>
+	<string name="shared_string_download_successful">Пасьпяхова сьцягнута</string>
+	<string name="shared_string_io_error">Адбылася памылка ўводу/вываду</string>
+	<string name="shared_string_unexpected_error">Нечаканая памылка</string>
+	<string name="shared_string_action_template">"Дзеяньне {0}"</string>
+	<string name="shared_string_close">Зачыніць</string>
+	<string name="shared_string_exit">Выхад</string>
+	<string name="shared_string_show">Паказаць</string>
+	<string name="shared_string_show_all">Паказаць усе</string>
+	<string name="shared_string_show_on_map">Паказаць на мапе</string>
+	<string name="shared_string_map">Мапа</string>
+	<string name="shared_string_favorite">Упадабанае</string>
+	<string name="shared_string_favorites">Упадабаныя</string>
+	<string name="shared_string_add_to_favorites">Дадаць да ўпадабаных</string>
+	<string name="shared_string_my_location">Маё месцазнаходжаньне</string>
+	<string name="shared_string_my_places">Мае мясьціны</string>
+	<string name="shared_string_my_tracks">Мае сьляды</string>
+	<string name="shared_string_currently_recording_track">Сьлед, што запісваецца</string>
+	<string name="shared_string_audio">Аўдыё</string>
+	<string name="shared_string_video">Відэа</string>
+	<string name="shared_string_photo">Фота</string>
+
+	<string name="route_points">Пункты маршруту</string>
+	<string name="shared_string_more_actions">Больш дзеяньняў</string>
+	<string name="shared_string_my_favorites">Мае ўпадабаныя</string>
 	</resources>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 692e326873..6a5043b84c 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -707,14 +707,14 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="show_ruler_level">Покажи линийка</string>	
 	<string name="info_button">Инфо</string>
 	<string name="back_to_location">Назад към позицията</string>
-	<string name="help">Помощ</string>
+	<string name="shared_string_help">Помощ</string>
 	<string name="show_details">Показване на детайли</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_on">Вкл.</string>
-	<string name="accessibility_off">Изключено</string>
+	<string name="shared_string_on">Вкл.</string>
+	<string name="shared_string_off">Изключено</string>
 	<string name="accessibility_default">Съгласно глобалните настройки на устройството</string>
 	<string name="backToMenu">Назад към менюто</string>
 	<string name="zoomOut">Отдалечи картата</string>
@@ -1032,7 +1032,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="map_underlay">Карта подложка</string>
 	<string name="map_underlay_descr">Изберете карта за подложка</string>
 	<string name="layer_overlay">Допълнителна карта отгоре…</string>
-	<string name="default_none">Нищо</string>
+	<string name="shared_string_none">Нищо</string>
 	<string name="map_overlay">Карта отгоре</string>
 	<string name="map_overlay_descr">Избор на карта за горния слой</string>
 	<string name="tile_source_already_installed">Картата вече е инсталирана, настройките ще бъдат обновени</string>
@@ -1088,8 +1088,8 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="tip_initial">Помощ</string>
 	<string name="tip_initial_t">"OsmAnd е приложение за навигация с много възможности.
 \n\nЗа начално запознаване вижте полезните съвети, които са в Меню-&gt;Помощ на основния екран. "</string>
-	<string name="next_button">Следващ</string>
-	<string name="previous_button">Предишен</string>
+	<string name="shared_string_next">Следващ</string>
+	<string name="shared_string_previous">Предишен</string>
 	<string name="unit_of_length_descr">Промяна на мерните единици за разстояние и скорост</string>
 	<string name="unit_of_length">Мерни единици</string>
 	<string name="si_mi_foots">Мили/фута</string>
@@ -1132,7 +1132,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="indexing_map">Индексиране на картата…</string>
 	<string name="indexing_poi">Индексиране на POI…</string>
 	<string name="indexing_transport">Индексиране на транспорт…</string>
-	<string name="input_output_error">Възникна входно/изходна грешка</string>
+	<string name="shared_string_io_error">Възникна входно/изходна грешка</string>
 	<string name="km">км</string>
 	<string name="km_h">км/ч</string>
 	<string name="m">м</string>
@@ -1302,7 +1302,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="transport_stops_to_pass">спирки да се пропуснат</string>
 	<string name="transport_route_distance">Дистанция на маршрут</string>
 	<string name="transport">Обществен транспорт</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">Показване на спирките на обществения транспорт на картата</string>
 	<string name="show_transport_over_map">Спирки на общ. транспорт</string>
 	<string name="hello">Приложение за навигация OsmAnd</string>
@@ -1319,7 +1319,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="search_history_building">Сграда: {0}, {1}, {2}</string>
 	<string name="favorite">Любими</string>
 	<string name="clear_all">Изтрий всичко</string>
-	<string name="history">История</string>
+	<string name="shared_string_history">История</string>
 	<string name="uploading_data">Качване на данни…</string>
 	<string name="uploading">Качване…</string>
 	<string name="search_nothing_found">Нищо не е намерено</string>
@@ -1393,7 +1393,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="map_preferences_descr">Настройки на картата: източник, завъртане, позиция на маркера, ориентация на екрана</string>
 	<string name="osm_settings">Редактиране на OSM</string>
 	<string name="additional_settings">Допълнителни настройки</string>
-	<string name="settings">Настройки</string>
+	<string name="shared_string_settings">Настройки</string>
 	<string name="save_current_track_descr">Запиши текущата следа в SD картата</string>
 	<string name="save_current_track">Запиши текущата GPX следа</string>
 	<string name="save_track_interval">Интервал за запис по време на навигация</string>
@@ -1468,11 +1468,11 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="context_menu_item_update_map">Обнови картата</string>
 	<string name="context_menu_item_open_bug">Докладвай за неточност в OSM</string>
 	<string name="context_menu_item_create_poi">Създай POI</string>
-	<string name="default_buttons_yes">Да</string>
-	<string name="default_buttons_cancel">Откажи</string>
+	<string name="shared_string_yes">Да</string>
+	<string name="shared_string_cancel">Откажи</string>
 	<string name="default_buttons_apply">Приложи</string>
 	<string name="default_buttons_add">Добави</string>
-	<string name="default_buttons_no">Не</string>
+	<string name="shared_string_no">Не</string>
 	<string name="add_favorite_dialog_top_text">Добави любимо име</string>
 	<string name="add_favorite_dialog_default_favourite_name">Любим</string>
 	<string name="add_favorite_dialog_favourite_added_template">Точката \'\'{0}\'\' беше успешно добавена в любими.</string>
@@ -1559,8 +1559,8 @@ OsmAnd е с отворен код и активно да се развива. 
     <string name="app_mode_aircraft">Самолет</string>
     <string name="tip_faq_t">Посетете https://code.google.com/p/osmand/wiki/FAQ за ЧЗВ.</string>
     <string name="tip_faq">Често Задавани Въпроси</string>
-    <string name="default_and">и</string>
-    <string name="default_or">или</string>
+    <string name="shared_string_and">и</string>
+    <string name="shared_string_or">или</string>
 	<string name="route_is_too_long">Маршрутът е доста дълъг за изчисляване.
 	За сега е възможно добро изчисляване на маршрут между точки, отдалечени на не повече от 200 км. Добавете междинни точки при по-дълги дистанции.</string>
 	<string name="base_world_map">Базова карта на света</string>
@@ -1631,8 +1631,8 @@ OsmAnd е с отворен код и активно да се развива. 
     <string name="keep_and_add_destination_point">Добавяне като крайна цел</string>
     <string name="select_gpx">Изберете GPX…</string>
     <string name="route_descr_select_destination">Изберете крайна цел</string>
-    <string name="route_descr_select_on_map">Изберете на картата…</string>
-    <string name="route_descr_favorite">Любими…</string>
+    <string name="shared_string_select_on_map">Изберете на картата…</string>
+    <string name="shared_string_favorite">Любими…</string>
     <string name="route_preferences">Предпочитания за маршрут</string>
     <string name="route_info">Информация за маршрут</string>
     <string name="routing_attr_prefer_motorway_name">Предпочитане на магистрали</string>
@@ -1762,7 +1762,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="lock_screen_request_explanation">%1$s изисква това разрешение за да изключи екрана с цел пестене на енергия.</string>
     <string name="wake_on_voice">Включи екрана</string>
     <string name="wake_on_voice_descr">Включване на екрана на телефона, когато наближава завой</string>
-    <string name="wake_on_voice_never">Никога</string>
+    <string name="shared_string_never">Никога</string>
     <string name="select_impassable_road">Избери на картата</string>
     <string name="impassable_road">Избягване на пътища…</string>
     <string name="rendering_attr_tramRoutes_name">Трамвайни линии</string>
diff --git a/OsmAnd/res/values-bs/strings.xml b/OsmAnd/res/values-bs/strings.xml
index e517a79854..7208466734 100644
--- a/OsmAnd/res/values-bs/strings.xml
+++ b/OsmAnd/res/values-bs/strings.xml
@@ -125,6 +125,6 @@
     <string name="index_name_openmaps">OpenMaps EU</string>
     
 	<string name="map_widget_gps_info">GPS status</string>
-    <string name="default_buttons_no">Ne</string>
-	<string name="default_buttons_yes">Da</string>
+    <string name="shared_string_no">Ne</string>
+	<string name="shared_string_yes">Da</string>
 	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index dc75f2045c..b9367e3ccf 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -114,13 +114,13 @@
 <string name="show_ruler_level">Mostra el regle</string>
 <string name="info_button">Informació</string>
 <string name="back_to_location">Torna a la ubicació</string>
-<string name="help">Ajuda</string>
+<string name="shared_string_help">Ajuda</string>
 <string name="show_details">Mostra els detalls</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="accessibility_on">Activa</string>
-<string name="accessibility_off">Inactiva</string>
+<string name="shared_string_on">Activa</string>
+<string name="shared_string_off">Inactiva</string>
 <string name="backToMenu">Torna al menú</string>
 <string name="zoomOut">Allunya</string>
 <string name="zoomIn">Apropa</string>
@@ -338,8 +338,8 @@
 <string name="system_locale">Sistema</string>
 <string name="tip_navigation">Navegació</string>
 <string name="tip_initial">Ajuda</string>
-<string name="next_button">Endavant</string>
-<string name="previous_button">Enrere</string>
+<string name="shared_string_next">Endavant</string>
+<string name="shared_string_previous">Enrere</string>
 <string name="unit_of_length_descr">Canvieu les unitats de longitud i velocitat</string>
 <string name="unit_of_length">Unitat de mesura</string>
 <string name="si_mi_foots">Milles/peus</string>
@@ -393,7 +393,7 @@
 <string name="tts_missing_language_data_title">Falten dades</string>
 <string name="voice_stream_notification">Àudio d\'avís</string>
 <string name="voice_stream_music">Àudio de multimèdia/música</string>
-<string name="default_none">Cap</string>
+<string name="shared_string_none">Cap</string>
 <string name="tile_source_already_installed">El mapa ja està instal·lat, s\'actualitzarà la configuració</string>
 <string name="select_tile_source_to_install">Seleccioneu els mapes (de tessel·les) per instal·lar o actualitzar</string>
 <string name="internet_not_available">Per realitzar l\'operació cal una connexió a Internet que ara no està disponible</string>
@@ -446,8 +446,8 @@
 <string name="osb_close_menu_item">Tanca l\'error</string>
 <string name="osb_comment_dialog_author">Nom de l\'autor</string>
 <string name="osb_add_dialog_success">L\'error s\'ha creat amb èxit</string>
-<string name="default_buttons_yes">Sí</string>
-<string name="default_buttons_no">No</string>
+<string name="shared_string_yes">Sí</string>
+<string name="shared_string_no">No</string>
 <string name="default_buttons_add">Afegeix</string>
 <string name="default_buttons_apply">Aplica</string>
 <string name="context_menu_item_update_map">Actualitza el mapa</string>
@@ -463,7 +463,7 @@
 <string name="exit_Button">Surt</string>
 <string name="settings_activity">Configuració</string>
 <string name="search_address">Cerca adreça</string>
-<string name="settings">Configuració</string>
+<string name="shared_string_settings">Configuració</string>
 <string name="data_settings">Dades</string>
 <string name="close">Tanca</string>
 <string name="update_existing">Reemplaça</string>
@@ -518,7 +518,7 @@
 <string name="fast_route_mode_descr">Activeu per calcular la ruta més ràpida o desactiveu per calcular la més curta </string>
 <string name="context_menu_item_download_map">Baixa el mapa</string>
 <string name="tiles_to_download_estimated_size">Per al nivell de zoom {0} es baixaran {1} tessel·les ({2} MB)</string>
-<string name="default_buttons_ok">D\'acord</string>
+<string name="shared_string_ok">D\'acord</string>
 <string name="vector_map_not_needed">No, gràcies</string>
 <string name="yard">iardes</string>
 <string name="mile_per_hour">mph</string>
@@ -571,7 +571,7 @@
 <string name="navigate_point_latitude">Latitud</string>
 <string name="navigate_point_longitude">Longitud</string>
 <string name="search_address_region">Regió</string>
-<string name="default_buttons_cancel">Cancel·la</string>
+<string name="shared_string_cancel">Cancel·la</string>
 <string name="context_menu_item_create_poi">Crea un PDI</string>
 <string name="poi_query_by_name_matches_categories">S\'han trobat unes quantes categories coincidents amb la consulta:</string>
 <string name="choose_audio_stream">Sortida de guiat per veu</string>
@@ -894,7 +894,7 @@
 	<string name="show_transport_over_map_description">Mostra les parades del transport públic al mapa</string>
 	<string name="search_history_int_streets">Intersecció: {0} x {1} a {2}</string>
 	<string name="favorite">Preferit</string>
-	<string name="history">Historial</string>
+	<string name="shared_string_history">Historial</string>
 	<string name="uploading">Enviant…</string>
 	<string name="search_osm_nominatim">Cerca una adreça utilitzant OSM Nominatim</string>
 	<string name="hint_search_online">Cerca en línia: Núm. de la casa, carrer, ciutat</string>
@@ -1079,7 +1079,7 @@
 	<string name="poi_dialog_other_tags_message">S\'han preservat totes les altres etiquetes</string>
 	<string name="osmodroid_plugin_description">El connector OsMoDroid és un connector per a l\'aplicació OsmAnd per a creació de traces i funcions relacionades en temps real. La informació sobre el servei es troba disponible a http://esya.ru.</string>
     <string name="auto_announce_off">Atura els anuncis automàtics</string>
-	<string name="input_output_error">S\'ha produït un error d\'E/S</string>
+	<string name="shared_string_io_error">S\'ha produït un error d\'E/S</string>
 	<string name="poi_namefinder_query_empty">Introduïu una consulta de cerca per trobar el PDI</string>
 	<string name="show_transport_over_map">Mostra les parades del transport</string>
 	<string name="error_io_error">S\'ha produït un error E/S</string>
@@ -1294,8 +1294,8 @@
     <string name="animate_routing_gpx">Simulació amb la traça GPX</string>
     <string name="remember_choice">Recorda l\'elecció</string>
     <string name="gps_status_eclipsim">Estat del GPS</string>
-    <string name="default_and">i</string>
-    <string name="default_or">o</string>
+    <string name="shared_string_and">i</string>
+    <string name="shared_string_or">o</string>
 	<string name="auto_zoom_none">Sense escalat automàtic</string>
 	<string name="auto_zoom_close">Apropa\'t</string>
 	<string name="auto_zoom_far">Mig</string>
@@ -1404,8 +1404,8 @@
     </string>
     <string name="select_gpx">Selecciona una traça GPX…</string>
     <string name="route_descr_select_destination">Selecciona un destí</string>
-    <string name="route_descr_select_on_map">Selecciona al mapa…</string>
-    <string name="route_descr_favorite">Preferida…</string>
+    <string name="shared_string_select_on_map">Selecciona al mapa…</string>
+    <string name="shared_string_favorite">Preferida…</string>
     <string name="route_preferences">Preferències de ruta</string>
     <string name="route_info">Informació de ruta</string>
     <string name="tip_recent_changes_1_3_t">Canvis a la 1.3:
@@ -1649,7 +1649,7 @@
     <string name="gpx_wpt">Fita</string>
     <string name="selected_gpx_info_show">\n\nPremeu i manteniu per veure al mapa</string>
     <string name="delay_navigation_start">Inicia automàticament el guiatge turn-by-turn</string>
-    <string name="selected">seleccionat</string>
+    <string name="shared_string_selected_lowercase">seleccionat</string>
     <string name="gpx_split_interval">Divideix l\'interval</string>
     <string name="gpx_info_diff_altitude">Interval d\'altitud: %1$s</string>
 	<string name="gpx_info_asc_altitude">Baixat/pujat: %1$s</string>
@@ -1819,7 +1819,7 @@
     <string name="wake_on_voice">Activa la pantalla</string>
     <string name="wake_on_voice_descr">Activa la pantalla del dispositiu (si no ho està) en aproximar-se a un gir</string>
     <string name="lock_screen_request_explanation">"%1$s necessita  aquest permís per la funcionalitat de posar la pantalla en mode d\'estalvi d\'energia."</string>
-    <string name="wake_on_voice_never">Mai</string>
+    <string name="shared_string_never">Mai</string>
     <string name="advanced_settings">Avançat</string>
 	<string name="osmo_use_https_descr">Utilitzeu una connexió segura al servidor</string>
     <string name="osmo_use_https">Utilitzeu HTTPS</string>
@@ -1833,7 +1833,7 @@
     <string name="use_opengl_render">Utilitza la renderització OpenGL</string>
     <string name="use_opengl_render_descr">Ús de renderització OpenGL per accelerador gràfic (no funciona a tots els dispositius)</string>
     <string name="everything_up_to_date">Tots els fitxers estan al dia</string>
-    <string name="dismiss">Descarta</string>
+    <string name="shared_string_dismiss">Descarta</string>
     <string name="no_internet_connection">No s\'ha pogut baixar, verifiqueu la vostra connexió a Internet.</string>
     <string name="download_tab_downloads">Totes les baixades</string>
     <string name="download_tab_updates">Actualitzacions</string>
@@ -1884,8 +1884,8 @@
     <string name="gps_status">Estat del GPS</string>
     <string name="parking_place">Lloc d\'aparcament</string>
     <string name="remove_the_tag">Treure l\'etiqueta</string>
-    <string name="enable_plugin">Desactivat</string>
-	<string name="disable_plugin">Activat</string>
+    <string name="shared_string_disabled">Desactivat</string>
+	<string name="shared_string_enabled">Activat</string>
 <string name="plugin_description_title">Descripció</string>
 	<string name="plugin_settings_button_caption">Configuració</string>
 <string name="edit_group">Edició del grup</string>
@@ -1894,8 +1894,8 @@
     <string name="plugin_nautical_name">Vista cartes marines</string>
     <string name="world_ski_missing">Per veure les pistes d\'esquí cal que baixeu un mapa específic</string>
     <string name="nautical_maps_missing">Per accedir a cartes marines cal que baixeu un mapa específic</string>
-	<string name="enable_plugin2">Activa</string>
-	<string name="disable_plugin2">Desactiva</string>
+	<string name="shared_string_enable">Activa</string>
+	<string name="shared_string_disable">Desactiva</string>
 	<string name="rendering_attr_pisteGrooming_name">Pista condicionada</string>
     <string name="get_plugin">Obtén</string>
 <string name="free">"%1$s disponible "</string>
@@ -1914,9 +1914,9 @@
 	<string name="track_segments">Segments de traça</string>
 	<string name="track_points">Punts de traça</string>
 	<string name="plugin_touringview_name">Vista turística del mapa</string>
-	<string name="plugin_touringview_descr">Activant aquests canvis en l\'estil de la vista del mapa  de OsmAnd a &lt;&lt;Vista turística del mapa&gt;&gt;,  aquesta és una vista especial  de gran detall per viatgers i conductors professionals. 
+	<string name="plugin_touringview_descr">Activant aquests canvis en l\'estil de la vista del mapa  de OsmAnd a &lt;&lt;Vista turística del mapa&gt;&gt;,  aquesta és una vista especial  de gran detall per viatgers i conductors professionals.
 
-Aquesta vista proporciona,sigui el que sigui el nivell de zoom al mapa, la quantitat màxima  de detalls de viatge disponible a les dades del mapa (particularment carreteres, pistes, camins i senyals d\'orientació). També es discrimina amb nitidesa tots els tipus de carreteres pel codi de colors, la qual cosa és molt útil, per exemple, conduint vehicles pesats. 
+Aquesta vista proporciona,sigui el que sigui el nivell de zoom al mapa, la quantitat màxima  de detalls de viatge disponible a les dades del mapa (particularment carreteres, pistes, camins i senyals d\'orientació). També es discrimina amb nitidesa tots els tipus de carreteres pel codi de colors, la qual cosa és molt útil, per exemple, conduint vehicles pesats.
 
 No cal baixar un mapa específic, aquesta vista es crea amb els nostres mapes estàndards. 
 
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 643bc53e1b..2e7a5a0b7b 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -16,14 +16,14 @@
   <string name="show_ruler_level">Měřítko</string>
   <string name="info_button">Informace</string>
   <string name="back_to_location">Zpět na zobrazení pozice</string>
-  <string name="help">Nápověda</string>
+  <string name="shared_string_help">Nápověda</string>
   <string name="show_details">Zobrazit detaily</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="accessibility_on">Zapnuto</string>
-  <string name="accessibility_off">Vypnuto</string>
+  <string name="shared_string_on">Zapnuto</string>
+  <string name="shared_string_off">Vypnuto</string>
   <string name="accessibility_default">Podle systémového nastavení</string>
   <string name="backToMenu">Zpět do menu</string>
   <string name="zoomOut">Zmenšit</string>
@@ -311,7 +311,7 @@
   <string name="indexing_map">Indexuji mapu…</string>
   <string name="indexing_poi">Indexuji POI…</string>
   <string name="indexing_transport">Indexuji dopravu…</string>
-  <string name="input_output_error">Došlo k chybě vstupu/výstupu</string>
+  <string name="shared_string_io_error">Došlo k chybě vstupu/výstupu</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -386,7 +386,7 @@
   <string name="map_underlay">Podkresová mapa</string>
   <string name="map_underlay_descr">Vyberte podkladovou mapu</string>
   <string name="layer_overlay">Překryvná mapa…</string>
-  <string name="default_none">Žádná</string>
+  <string name="shared_string_none">Žádná</string>
   <string name="map_overlay">Překryvná mapa</string>
   <string name="map_overlay_descr">Vyberte překryvnou mapu</string>
   <string name="tile_source_already_installed">Mapa je již nainstalovaná, aktualizuji nastavení</string>
@@ -414,8 +414,8 @@
 \n\t Po stisknutí se objeví obdélník se souřadnicemi. Klepnutím na něj se otevře kontextové menu, po dlouhém stisknutí obdélník naopak zmizí. Kontextové menu je dostupné také tlačítkem \'Menu\'. "</string>
   <string name="tip_initial">Pomoc</string>
   <string name="tip_initial_t">"OsmAnd je navigační aplikace s řadou funkcí.\n\nZákladní pokyny, užitečné tipy a rozšířenou pomoc můžete vyvolat klepnutím na \'Menu\' → \'Pomoc\' z mapové obrazovky. "</string>
-  <string name="next_button">Další</string>
-  <string name="previous_button">Předchozí</string>
+  <string name="shared_string_next">Další</string>
+  <string name="shared_string_previous">Předchozí</string>
   <string name="unit_of_length_descr">Zvolte jednotku vzdálenosti a rychlosti</string>
   <string name="unit_of_length">Jednotky vzdálenosti</string>
   <string name="si_mi_foots">Míle/stopy</string>
@@ -593,7 +593,7 @@
   <string name="transport_stops_to_pass">počet zastávek</string>
   <string name="transport_route_distance">Vzdálenost trasy</string>
   <string name="transport">Doprava</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Zobrazit v mapě zastávky veřejné dopravy</string>
   <string name="show_transport_over_map">Zobrazit zastávky</string>
   <string name="hello">Navigační aplikace OsmAnd</string>
@@ -610,7 +610,7 @@
   <string name="search_history_building">Budova: {0}, {1}, {2}</string>
   <string name="favorite">Oblíbené</string>
   <string name="clear_all">Vymazat vše</string>
-  <string name="history">Minulé</string>
+  <string name="shared_string_history">Minulé</string>
   <string name="uploading_data">Odesílám data…</string>
   <string name="uploading">Odesílám…</string>
   <string name="search_nothing_found">Nic nebylo nalezeno</string>
@@ -688,7 +688,7 @@
   <string name="auto_zoom_map_descr">Automaticky měnit zvětšení podle rychlosti pohybu</string>
   <string name="auto_zoom_map">Automatické zvětšení mapy</string>
   <string name="additional_settings">Další volby</string>
-  <string name="settings">Nastavení</string>
+  <string name="shared_string_settings">Nastavení</string>
   <string name="save_current_track_descr">Uloží aktuální trasu na SD kartu</string>
   <string name="save_current_track">Uložit aktuální trasu GPX</string>
   <string name="save_track_interval_descr">Vyberte interval pro ukládání trasy během navigace</string>
@@ -765,11 +765,11 @@
   <string name="context_menu_item_update_map">Aktualizovat mapu</string>
   <string name="context_menu_item_open_bug">Otevřít chybu OSM</string>
   <string name="context_menu_item_create_poi">Vytvořit POI</string>
-  <string name="default_buttons_yes">Ano</string>
-  <string name="default_buttons_cancel">Zrušit</string>
+  <string name="shared_string_yes">Ano</string>
+  <string name="shared_string_cancel">Zrušit</string>
   <string name="default_buttons_apply">Použít</string>
   <string name="default_buttons_add">Přidat</string>
-  <string name="default_buttons_no">Ne</string>
+  <string name="shared_string_no">Ne</string>
   <string name="add_favorite_dialog_top_text">Zadejte jméno pro oblíbené</string>
   <string name="add_favorite_dialog_default_favourite_name">Oblíbené</string>
   <string name="add_favorite_dialog_favourite_added_template">Oblíbené místo \'\'{0}\'\' bylo přidáno.</string>
@@ -836,7 +836,7 @@
   <string name="map_settings_descr">Nastavení mapového zobrazení</string>
   <string name="osmand_rastermaps_plugin_description">Pokročilá nastavení pro použití mnoha rastrových map jako základní mapu, překryv nebo podkres. Rastrové mapy lze získat online nebo připravit offline a nakopírovat do datového adresáře OsmAnd.</string>
   <string name="osmand_background_plugin_description">Pokročilá nastavení pro záznam trasy nebo navigaci v úsporném režimu (při vypnuté obrazovce). Aplikace pravidelně zapíná GPS přijímač, aby zaznamenala bod trasy nebo přehrála hlasový pokyn.</string>
-  <string name="osmand_accessibility_description">Pokročilá nastavení zpřístupnění pro osoby s omezením zraku.</string>
+  <string name="osmand_accessibility_description">Zobrazí nastavení pro speciální funkce ulehčení přístupu.</string>
   <string name="extra_settings">Pokročilá nastavení</string>
   <string name="osmand_monitoring_description">Pokročilá nastavení pro záznam vaší trasy do souboru GPX nebo pro odesílání v reálném čase na webový server.</string>
   <string name="osmand_extra_settings_description">Rozšířená nastavení mapy a další nastavení specifická pro konkrétní zařízení.</string>
@@ -1340,8 +1340,8 @@
     <string name="edit_tilesource_successfully">Zdroj dlaždic %1$s byl úspešně uložen</string>
     <string name="remember_choice">Zapamatovat mou volbu</string>
     <string name="gps_status_eclipsim">Stav GPS</string>
-    <string name="default_and">a</string>
-    <string name="default_or">nebo</string>
+    <string name="shared_string_and">a</string>
+    <string name="shared_string_or">nebo</string>
 	<string name="animate_routing_route_not_calculated">Nejprve prosím vypočítejte trasu</string>
     <string name="animate_routing_route">Simulovat pomocí vypočítané trasy </string>
     <string name="animate_routing_gpx">Simulovat pomocí GPX trasy</string>
@@ -1363,8 +1363,8 @@ s často kladenými otázkami.</string>
     <string name="select_gpx">Vybrat GPX…</string>
     <string name="use_displayed_track_for_navigation">Chcete použít zobrazenou trasu pro navigaci?</string>
     <string name="route_descr_select_destination">Vybrat cíl</string>
-    <string name="route_descr_select_on_map">Vybrat na mapě…</string>
-    <string name="route_descr_favorite">Oblíbené…</string>
+    <string name="shared_string_select_on_map">Vybrat na mapě…</string>
+    <string name="shared_string_favorite">Oblíbené…</string>
     <string name="route_preferences">Předvolby trasy</string>
     <string name="route_info">Informace o trase</string>
     <string name="routing_attr_prefer_motorway_name">Upřednostňovat dálnice</string>
@@ -1586,7 +1586,7 @@ s často kladenými otázkami.</string>
     <string name="loading_smth">Načítá se %1$s…</string>
     <string name="map_widget_plain_time">Aktuální čas</string>
     <string name="delay_navigation_start">Spustit navigaci automaticky</string>
-    <string name="selected">vybrané</string>
+    <string name="shared_string_selected_lowercase">vybrané</string>
     <string name="gpx_split_interval">Rozdělit interval</string>
     <string name="gpx_info_subtracks">Podtrasy: %1$s </string>
 	<string name="gpx_info_waypoints">Bodů na trase: %1$s </string>
@@ -1769,7 +1769,7 @@ s často kladenými otázkami.</string>
     <string name="osmand_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k Internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí (nedostupné ve verzi zdarma) - Neomezené stahování, přímo z aplikace (ve verzi zdarma je limit 10 mapových souborů) - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara "</string>
 	<string name="osmand_plus_extended_description_4000_chars">" OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k Internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). OsmAnd+ je placená verze aplikace. Její zakoupením podpoříte projekt, nové funkce a získáte nejnovější aktualizace map. Aplikaci si můžete před zakoupením vyzkoušet nainstalováním verze zdarma nazvané OsmAnd. Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí - Neomezené stahování, přímo z aplikace - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara "</string>
 	<string name="lock_screen_request_explanation">%1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie.</string>
-    <string name="wake_on_voice_never">Nikdy</string>
+    <string name="shared_string_never">Nikdy</string>
     <string name="advanced_settings">Pokročilé</string>
 	<string name="home_button">Domovská obrazovka</string>
     <string name="show_map">ZOBRAZIT MAPU</string>
@@ -1779,7 +1779,7 @@ s často kladenými otázkami.</string>
 	<string name="search_for">Hledat</string>
 	<string name="show_all">ZOBRAZIT VŠE</string>
 	<string name="coordinates">Souřadnice</string>
-	<string name="dismiss">Zavřít</string>
+	<string name="shared_string_dismiss">Zavřít</string>
     <string name="everything_up_to_date">Všechny soubory jsou aktuální</string>
     <string name="use_opengl_render">Použít OpenGL</string>
     <string name="use_opengl_render_descr">Použít hardwarově akcelerované renderování pomocí OpenGL (nemusí fungovat na všech zařízeních)</string>
@@ -1834,8 +1834,8 @@ s často kladenými otázkami.</string>
 	<string name="proxy_port_descr">Nastavit číslo portu proxy (např. 8118)</string>
 	<string name="parking_place">Parkovací místo</string>
     <string name="remove_the_tag">ODSTRANIT TAG</string>
-    <string name="enable_plugin">Zapnout</string>
-	<string name="disable_plugin">Vypnout</string>
+    <string name="shared_string_disabled">Zapnout</string>
+	<string name="shared_string_enabled">Vypnout</string>
 	<string name="plugin_description_title">Popisek</string>
 	<string name="plugin_settings_button_caption">Nastavení</string>
 <string name="edit_group">Upravit skupinu</string>
@@ -1855,7 +1855,7 @@ s často kladenými otázkami.</string>
 	<string name="video">Video</string>
 	<string name="photo">Fotografie</string>
 	<string name="watch">Zobrazit</string>
-	<string name="selected_tracks">Vybrané</string>
+	<string name="shared_string_selected">Vybrané</string>
 	<string name="showed_on_map">Zobrazené na mapě</string>
 	<string name="rename_failed">Přejmenování selhalo.</string>
 	<string name="currently_recording_track">Právě zaznamenávaná trasa</string>
@@ -1867,8 +1867,9 @@ s často kladenými otázkami.</string>
 	<string name="turn_off_all">Vypnout všechny</string>
 	<string name="location_on_map">Poloha:\n Šířka %1$s\n Délka %2$s</string>
 	<string name="export">Exportovat</string>
-	<string name="enable_plugin2">Zapnout</string>
-	<string name="disable_plugin2">Vypnout</string>
+	<string name="shared_string_enable">Zapnout</string>
+	<string name="shared_string_disable">Vypnout</string>
 	<string name="plugin_install_needs_network">Pro instalaci tohoto modulu je potřeba internetové připojení.</string>
 	<string name="get_plugin">Získat</string>
-</resources>
+<string name="route_points">Body cesty</string>
+	</resources>
diff --git a/OsmAnd/res/values-cy/strings.xml b/OsmAnd/res/values-cy/strings.xml
index 18e08cd0ba..508e57bce8 100644
--- a/OsmAnd/res/values-cy/strings.xml
+++ b/OsmAnd/res/values-cy/strings.xml
@@ -203,13 +203,13 @@ Gallwch alluogi (ar-lein neu cached) Ffynonellau teils map, lleoliadau olrhain,
 <string name="show_ruler_level">Dangos pren mesur</string>
 <string name="info_button">Gwybodaeth</string>
 <string name="back_to_location">Gefn i leoliad</string>
-<string name="help">Cymorth</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="accessibility_on">Ar</string>
-<string name="accessibility_off">Oddi</string>
+<string name="shared_string_on">Ar</string>
+<string name="shared_string_off">Oddi</string>
 <string name="accessibility_default">Yn ôl y lleoliad system fyd-eang</string>
 <string name="backToMenu">Yn ôl At Ddewislen</string>
 <string name="zoomOut">Chwyddo allan</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index dc35b3311f..d56e231b85 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -116,7 +116,7 @@
         <string name="poi_traffic_calming_cushion">Trafikdæmpning, pude</string>
         <string name="poi_traffic_calming_chicane">Trafikdæmpning, chikane</string>
         <string name="poi_traffic_calming_rumble_strip">Rumlestriber</string>
-        <string name="poi_traffic_calming_table">Trafikdæmpning, bord</string>
+        <string name="poi_traffic_calming_table">Trafikdæmpning, plateau</string>
         <string name="poi_traffic_calming_choker">Indsnævring</string>
         <string name="poi_traffic_signals">Trafiklys</string>
 
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index d32f48ef53..91c4416fea 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
     <string name="av_def_action_video">Optag video</string>
     <string name="av_def_action_audio">Optag audio</string>
@@ -388,7 +388,6 @@
 	<string name="support_new_features_descr">Doner for at få nye funktioner i programmet</string>
 	<string name="show_ruler_level">Vis målestok</string>	
 	<string name="back_to_location">Tilbage til placering</string>
-	<string name="help">Hjælp</string>
 	<string name="show_details">Vis detaljer</string>
 	<string name="accessibility_extensions_descr">Tilgængelighedsudvidelser for gamle Android versioner</string>
 	<string name="accessibility_extensions">Tilgængelighedsudvidelser</string>
@@ -399,8 +398,6 @@
 	<string name="map_widget_gps_info">GPS-information</string>
     <string name="gpx_tags_txt">Mærker</string>
 	<string name="accessibility_mode_descr">Slå tilgængeligheds funktionerne til</string>
-	<string name="accessibility_on">Til</string>
-	<string name="accessibility_off">Fra</string>
 	<string name="accessibility_default">Ifølge de globale systemindstillinger</string>
 	<string name="backToMenu">Tilbage til menuen</string>
 	<string name="zoomOut">Zoom ud</string>
@@ -681,7 +678,7 @@
 	<string name="vector_data_missing">Offline-data mangler på SD-kort. Overvej at hente for at kunne bruge kort offline.</string>
 	
 	
-	<string name="local_index_installed">Udgave</string>
+	<string name="local_index_installed">Lokal version</string>
 	<string name="local_index_items_backuped">%1$d af %2$d emner deaktiveret.</string>
 	<string name="local_index_items_deleted">%1$d af %2$d emner slettet.</string>
 	<string name="local_index_items_restored">%1$d af %2$d emner aktiveret.</string>
@@ -743,7 +740,6 @@
 	<string name="map_underlay">Underlejringskort</string>
 	<string name="map_underlay_descr">Vælg kort til underlejring</string>
 	<string name="layer_overlay">Overlejringskort…</string>
-	<string name="default_none">Ingen</string>
 	<string name="map_overlay">Overlejringskort</string>
 	<string name="map_overlay_descr">Vælg kort til overlejring</string>
 	<string name="tile_source_already_installed">Kort er allerede installeret, indstillinger bliver opdateret</string>
@@ -773,8 +769,6 @@
 	<string name="tip_search">Søgning</string>
 	<string name="tip_map_context_menu">\'Brug placering\' menu</string>
 	<string name="tip_initial">Hjælp</string>
-	<string name="next_button">Næste</string>
-	<string name="previous_button">Forrige</string>
 	<string name="unit_of_length_descr">Ændre enheder for afstand og hastighed</string>
 	<string name="unit_of_length">Måleenhed</string>
 	<string name="si_mi_foots">Mil/fod</string>
@@ -814,7 +808,6 @@
 	<string name="indexing_map">Indekserer kort…</string>
 	<string name="indexing_poi">Indekserer interessepunkt…</string>
 	<string name="indexing_transport">Indekserer transport…</string>
-	<string name="input_output_error">I/O fejl</string>
 	<string name="km">km</string>
 	<string name="km_h">km/t</string>
 	<string name="m">m</string>
@@ -836,7 +829,7 @@
 	<string name="loading_builds">Indlæser OsmAnd versioner…</string>
 	<string name="select_build_to_install">Vælg en OsmAnd version til installation</string>
 	<string name="contribution_activity">Installer version</string>
-	<string name="gps_status_app_not_found">GPS-Status applikation er ikke installeret. Søg på Play butik?</string>
+	<string name="gps_status_app_not_found">GPS-status applikation er ikke installeret. Søg på Play butik?</string>
 	<string name="voice_is_not_available_title">Ingen stemmevejledning er valgt</string>
 	<string name="daynight_mode_day">Dag</string>
 	<string name="daynight_mode_night">Nat</string>
@@ -1024,8 +1017,6 @@
 	<string name="transport_to_go_before">efterfølgende afstand</string>
 	<string name="transport_route_distance">Rutelængde</string>
 	<string name="transport">Transport</string>
-	<string name="default_buttons_no">Nej</string>
-	<string name="default_buttons_yes">Ja</string>
 	<string name="poi_remove_confirm_template">Slet {0} (indtast kommentar)?</string>
 	<string name="osb_close_dialog_close_button">Luk fejlrapport</string>
 	<string name="osb_comment_dialog_error">Undtagelse opstod: kommentar blev ikke tilføjet</string>
@@ -1034,7 +1025,6 @@
 	<string name="add_favorite_dialog_top_text">Indtast favoritnavn</string>
 	<string name="default_buttons_add">Tilføj</string>
 	<string name="default_buttons_apply">Udfør</string>
-	<string name="default_buttons_cancel">Annuller</string>
 	<string name="context_menu_item_create_poi">Opret interessepunkt</string>
 	<string name="context_menu_item_update_map">Opdater kort</string>
 	<string name="context_menu_item_add_favorite">Tilføj som favorit</string>
@@ -1076,7 +1066,6 @@
 	<string name="search_history_building">Bygning: {0}, {1}, {2}</string>
 	<string name="favorite">Favorit</string>
 	<string name="clear_all">Ryd alt</string>
-	<string name="history">Historik</string>
 	<string name="uploading_data">Overfører data…</string>
 	<string name="uploading">Overfører…</string>
 	<string name="search_nothing_found">Fandt ikke noget</string>
@@ -1106,7 +1095,6 @@
 	</string>
 	<string name="osmand_routing_experimental">OsmAnd offline-navigation er en eksperimentel funktion og den virker ikke for afstande på mere end ca. 20 km.
 \nNavigationstjenesten skiftes midlertidig til online CloudMade.</string>
-	<string name="default_buttons_ok">OK</string>
 	<string name="search_offline_address">Offline søgning</string>
 	<string name="route_general_information">Total afstand %1$s, rejsetid %2$d t %3$d m.</string>
 	<string name="router_service_descr">Vælg en online eller offline navigationstjeneste</string>
@@ -1169,7 +1157,6 @@
 	<string name="map_preferences_descr">Indstil kortindstillinger: kortkilde, rotation, markørposition og skærmorientering</string>
 	<string name="osm_settings">OSM redigering</string>
 	<string name="additional_settings">Yderligere indstillinger</string>
-	<string name="settings">Indstillinger</string>
 	<string name="save_current_track_descr">Gem aktuelle spor til SD-kort nu</string>
 	<string name="save_current_track">Gem aktuelle GPX-spor</string>
 	<string name="save_track_interval">Logningsinterval under navigation</string>
@@ -1301,7 +1288,7 @@
     <string name="distance_measurement_finish_subtrack">Begynd et nyt underspor</string>
     <string name="distance_measurement_clear_route">Slet punkter</string>
     <string name="plugin_distance_point_ele">højde</string>
-    <string name="osmand_distance_planning_plugin_description">"Udvidelsen giver et kort modul gør det muligt at oprette stier, ved at trykke på kortet, eller bruge eller ændre en  eksisterende GPX-file, til at planlægge en tur og måle afstanden mellem punkter. Resultaterne kan gemmes som en GPX-fil, som senere kan bruges til rutevejledning."</string>
+    <string name="osmand_distance_planning_plugin_description">"Udvidelsen giver et modul som gør det muligt at oprette stier, ved at trykke på kortet, eller bruge eller ændre en  eksisterende GPX-file, til at planlægge en tur og måle afstanden mellem punkter. Resultaterne kan gemmes som en GPX-fil, som senere kan bruges til rutevejledning."</string>
     <string name="osmand_distance_planning_plugin_name">Afstandsberegner &amp; planlægningsværktøj</string>
     <string name="use_distance_measurement_help">* Tryk for at markere et punkt.\n * Langt tryk på kortet for at slette tidligere punkt.\n * Langt tryk på punkt for at se og vedhæfte beskrivelse.\n * Klik på målemodul for at se flere handlinger.</string>
     <string name="delete_point">Slet punkt</string>
@@ -1420,8 +1407,6 @@
     <string name="auto_zoom_none">Ingen autozoom</string>
     <string name="auto_zoom_far">Middelafstand</string>
     <string name="auto_zoom_farthest">Lange afstande</string>
-    <string name="default_and">og</string>
-    <string name="default_or">eller</string>
 	<string name="auto_zoom_close">Tæt på</string>
 	<string name="remember_choice">Husk valg</string>
     <string name="gps_status_eclipsim">GPS status</string>
@@ -1478,8 +1463,6 @@
     <string name="select_gpx">Vælg GPX…</string>
     <string name="route_preferences">Ruteindstillinger</string>
     <string name="route_descr_select_destination">Vælg destination</string>
-    <string name="route_descr_select_on_map">Vælg på kort…</string>
-    <string name="route_descr_favorite">Favorit…</string>
     <string name="keep_and_add_destination_point">Tilføj som destinationspunkt</string>
     <string name="tip_recent_changes_1_7_1_t">…Ændringer i 1.7:
 	\n\t* VIGTIGT kort skal være nyere end februar 2014.
@@ -1680,7 +1663,6 @@
     <string name="gpx_wpt">Rutepunkt</string>
     <string name="selected_gpx_info_show">\n\nLangt tryk for at se på kort</string>
     <string name="delay_navigation_start">Start sving-for-sving vejledning automatisk</string>
-    <string name="selected">valgt</string>
     <string name="gpx_split_interval">Opdelingsinterval</string>
     <string name="loading_smth">Indlæser %1$s…</string>
     <string name="save_as_favorites_points">Gem som en gruppe af favoritter</string>
@@ -1838,7 +1820,6 @@
     <string name="wake_on_voice">Tænd for skærmen</string>
     <string name="wake_on_voice_descr">Tænd for skærmen (hvis slukket) ved navigationsinstruktioner</string>
     <string name="lock_screen_request_explanation">%1$s behøver denne tilladelse til at slukke for skærmen for strømbesparende funktion.</string>
-    <string name="wake_on_voice_never">Aldrig</string>
     <string name="advanced_settings">Avanceret</string>
 	<string name="osmo_use_https_descr">Brug sikker forbindelse til server</string>
     <string name="osmo_use_https">Brug HTTPS</string>
@@ -1852,7 +1833,6 @@
     <string name="use_opengl_render">Brug OpenGL optegning</string>
     <string name="use_opengl_render_descr">Brug hardware accelereret OpenGL optegning (virker muligvis ikke på alle enheder)</string>
     <string name="everything_up_to_date">Alt er opdateret</string>
-    <string name="dismiss">Afvis</string>
     <string name="no_internet_connection">Ikke muligt at hente, kontroller internetforbindelsen.</string>
     <string name="download_tab_downloads">Hent</string>
     <string name="download_tab_updates">Opdater</string>
@@ -1903,14 +1883,10 @@
     <string name="gps_status">GPS status</string>
     <string name="parking_place">Parkeringsplads</string>
     <string name="remove_the_tag">FJERN MÆRKET</string>
-    <string name="enable_plugin">Deaktiveret</string>
-	<string name="disable_plugin">Aktiveret</string>
 <string name="plugin_description_title">Beskrivelse</string>
 	<string name="plugin_settings_button_caption">Indstillinger</string>
 <string name="edit_group">Rediger gruppe</string>
     <string name="plugin_install_needs_network">Internetforbindelse behøves for at installere udvidelsen.</string>
-<string name="enable_plugin2">Aktiver</string>
-	<string name="disable_plugin2">Deaktiver</string>
 	<string name="get_plugin">Hent</string>
 <string name="plugin_ski_name">Skikort</string>
     <string name="plugin_nautical_name">Søkort</string>
@@ -1946,13 +1922,84 @@
 		\n\nVisningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket.
 	</string>
 	<string name="location_on_map">Placering:\n Lat %1$s\n Long %2$s</string>
-	<string name="days_behind">dage bagefter</string>
+	<string name="days_behind">dage gammel</string>
 	<string name="rename_failed">Fejl ved omdøbning.</string>
 	<string name="back_to_map">Tilbage til kortet</string>
 	<string name="currently_recording_track">Aktuelt optagelsesspor</string>
 	<string name="showed_on_map">Vist på kortet</string>
 	<string name="turn_off_all">Deaktiver alle</string>
-	<string name="selected_tracks">Valgt</string>
 	<string name="track_segments">Sporsegmenter</string>
 	<string name="track_points">Sporpunkter</string>
+	<string name="route_points">Rutepunkter</string>
+	<string name="shared_string_release">Udgivet</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">OK</string>
+	<string name="shared_string_cancel">Annuller</string>
+	<string name="shared_string_dismiss">Afvis</string>
+	<string name="shared_string_yes">Ja</string>
+	<string name="shared_string_no">Nej</string>
+	<string name="shared_string_on">På</string>
+	<string name="shared_string_off">Fra</string>
+	<string name="shared_string_previous">Forrige</string>
+	<string name="shared_string_next">Næste</string>
+	<string name="shared_string_enable">Aktiver</string>
+	<string name="shared_string_disable">Deaktiver</string>
+	<string name="shared_string_enabled">Aktiveret</string>
+	<string name="shared_string_disabled">Deaktiveret</string>
+	<string name="shared_string_selected">Valgt</string>
+	<string name="shared_string_selected_lowercase">valgt</string>
+	<string name="shared_string_never">Aldrig</string>
+	<string name="shared_string_none">Ingen</string>
+	<string name="shared_string_and">og</string>
+	<string name="shared_string_or">eller</string>
+	<string name="shared_string_help">Hjælp</string>
+	<string name="shared_string_settings">Indstillinger</string>
+	<string name="shared_string_history">Historik</string>
+	<string name="shared_string_select_on_map">Vælg på kort</string>
+	<string name="shared_string_select_all">Vælg alt</string>
+	<string name="shared_string_deselect">Fravælg</string>
+	<string name="shared_string_deselect_all">Fravælg alt</string>
+	<string name="shared_string_clear">Ryd</string>
+	<string name="shared_string_clear_all">Ryd alt</string>
+	<string name="shared_string_save">Gem</string>
+	<string name="shared_string_save_as_gpx">Gem som GPX-spor</string>
+	<string name="shared_string_rename">Omdøb</string>
+	<string name="shared_string_delete">Slet</string>
+	<string name="shared_string_delete_all">Slet alt</string>
+	<string name="shared_string_share">Del</string>
+	<string name="shared_string_add">Tilføj</string>
+	<string name="shared_string_apply">Anvend</string>
+	<string name="shared_string_control_start">Start</string>
+	<string name="shared_string_control_stop">Stop</string>
+	<string name="shared_string_import">Importer</string>
+	<string name="shared_string_export">Eksporter</string>
+	<string name="shared_string_more">Mere</string>
+	<string name="shared_string_more_actions">Flere handlinger</string>
+	<string name="shared_string_do_not_show_again">Vis ikke igen</string>
+	<string name="shared_string_remember_my_choice">Husk valg</string>
+	<string name="shared_string_refresh">Opdater</string>
+	<string name="shared_string_download">Hent</string>
+	<string name="shared_string_downloading">Henter</string>
+	<string name="shared_string_download_successful">Hentet</string>
+	<string name="shared_string_io_error">I/O fejl</string>
+	<string name="shared_string_unexpected_error">Der opstod uventet fejl</string>
+	<string name="shared_string_action_template">"Handling {0}"</string>
+	<string name="shared_string_close">Luk</string>
+	<string name="shared_string_exit">Afslut</string>
+	<string name="shared_string_show">Vis</string>
+	<string name="shared_string_show_all">Vis alt</string>
+	<string name="shared_string_show_on_map">Vis på kort</string>
+	<string name="shared_string_map">Kort</string>
+	<string name="shared_string_favorite">Favorit</string>
+	<string name="shared_string_favorites">Favoritter</string>
+	<string name="shared_string_add_to_favorites">Føj til Favoritter</string>
+	<string name="shared_string_my_location">Min placering</string>
+	<string name="shared_string_my_places">Mine steder</string>
+	<string name="shared_string_my_favorites">Mine favoritter</string>
+	<string name="shared_string_my_tracks">Mine spor</string>
+	<string name="shared_string_currently_recording_track">Aktuelt optagelsesspor</string>
+	<string name="shared_string_audio">Audio</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Foto</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 27c57db8a4..f5b342604f 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -204,14 +204,14 @@
 	<string name="show_ruler_level">Zeige Maßstab an</string>
 	<string name="info_button">Info</string>
 	<string name="back_to_location">Zurück zum Standort</string>
-	<string name="help">Hilfe</string>
+	<string name="shared_string_help">Hilfe</string>
 	<string name="show_details">Zeige Details</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="accessibility_on">An</string>
-	<string name="accessibility_off">Aus</string>
+	<string name="shared_string_on">An</string>
+	<string name="shared_string_off">Aus</string>
 	<string name="accessibility_default">Wie globale Systemeinstellung</string>
 	<string name="backToMenu">Zurück zum Menü</string>
 	<string name="zoomOut">Herauszoomen</string>
@@ -673,7 +673,7 @@
 	<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="default_none">Keine</string>
+	<string name="shared_string_none">Keine</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>
@@ -722,8 +722,8 @@
 		\n\nEs wird über ein langes Drücken auf einen Punkt in der Karte (dann Antippen des Positionsmarkers), durch das Drücken des Trackball-Knopfes in der Kartenansicht, oder via \'Menü\' → \'Verwende Position\' aufgerufen (die letzten beiden Methoden beziehen sich auf den Kartenmittelpunkt).
 		\n\nLanges Drücken auf einen Positionsmarker entfernt diesen wieder.
 	</string>
-	<string name="next_button">Weiter</string>
-	<string name="previous_button">Zurück</string>
+	<string name="shared_string_next">Weiter</string>
+	<string name="shared_string_previous">Zurück</string>
 	<string name="unit_of_length_descr">Längen- und Geschwindigkeitseinheiten auswählen</string>
 	<string name="unit_of_length">Längeneinheiten</string>
 	<string name="si_mi_foots">Meilen/Fuß</string>
@@ -766,7 +766,7 @@
 	<string name="indexing_map">Indiziere Karte…</string>
 	<string name="indexing_poi">Indiziere POI…</string>
 	<string name="indexing_transport">Indiziere ÖPNV…</string>
-	<string name="input_output_error">I/O Fehler aufgetreten</string>
+	<string name="shared_string_io_error">I/O Fehler aufgetreten</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -944,7 +944,7 @@
 	<string name="transport_stops_to_pass">zu passierende Haltestellen</string>
 	<string name="transport_route_distance">Streckenlänge</string>
 	<string name="transport">ÖPNV</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">ÖPNV-Haltestellen auf der Karte anzeigen</string>
 	<string name="show_transport_over_map">Haltestellen anzeigen</string>
 	<string name="hello">Navigationsanwendung OsmAnd</string>
@@ -961,7 +961,7 @@
 	<string name="search_history_building">Hausnr.: {0}, {1}, {2}</string>
 	<string name="favorite">Favorit</string>
 	<string name="clear_all">Alles löschen</string>
-	<string name="history">Verlauf</string>
+	<string name="shared_string_history">Verlauf</string>
 	<string name="uploading_data">Daten hochladen…</string>
 	<string name="uploading">Hochladen…</string>
 	<string name="search_nothing_found">Kein Treffer</string>
@@ -1037,7 +1037,7 @@
 	<string name="map_preferences_descr">Karteneinstellungen festlegen: Kartenquelle, Ausrichtung, Markerposition, Bildschirmausrichtung</string>
 	<string name="osm_settings">OSM-Bearbeitung</string>
 	<string name="additional_settings">Weitere Einstellungen</string>
-	<string name="settings">Einstellungen</string>
+	<string name="shared_string_settings">Einstellungen</string>
 	<string name="update_tile">Karte (Kacheln) aktualisieren</string>
 	<string name="reload_tile">Kartenteile (Kacheln) aktualisieren</string>
 	<string name="mark_point">Ziel</string>
@@ -1108,11 +1108,11 @@
 	<string name="context_menu_item_update_map">Karte aktualisieren</string>
 	<string name="context_menu_item_open_bug">OSM Fehlerbericht einsenden</string>
 	<string name="context_menu_item_create_poi">POI einsenden</string>
-	<string name="default_buttons_yes">Ja</string>
-	<string name="default_buttons_cancel">Abbrechen</string>
+	<string name="shared_string_yes">Ja</string>
+	<string name="shared_string_cancel">Abbrechen</string>
 	<string name="default_buttons_apply">Übernehmen</string>
 	<string name="default_buttons_add">Hinzufügen</string>
-	<string name="default_buttons_no">Nein</string>
+	<string name="shared_string_no">Nein</string>
 	<string name="add_favorite_dialog_top_text">Geben Sie diesem Punkt einen Namen</string>
 	<string name="add_favorite_dialog_default_favourite_name">Favorit</string>
 	<string name="add_favorite_dialog_favourite_added_template">Favorit Punkt \'\'{0}\'\' wurde erfolgreich hinzugefügt.</string>
@@ -1479,8 +1479,8 @@
 	<string name="edit_tilesource_choose_existing">Wähle vorhandene…</string>
 	<string name="edit_tilesource_name">Name</string>
 	<string name="maps_define_edit">Definieren/Bearbeiten…</string>
-	<string name="default_and">und</string>
-	<string name="default_or">oder</string>
+	<string name="shared_string_and">und</string>
+	<string name="shared_string_or">oder</string>
 	<string name="gps_status_eclipsim">GPS Status</string>
 	<string name="remember_choice">Auswahl merken</string>
 	<string name="animate_routing_route_not_calculated">Zuerst die Route berechnen</string>
@@ -1527,8 +1527,8 @@
 	<string name="complex_route_calculation_failed">Schnelle Routenberechnung fehlgeschlagen (%s), Rückfall auf langsame Berechnung.</string>
 	<string name="disable_complex_routing_descr">Zwei-Phasen-Routing für Auto-Navigation deaktivieren</string>
 	<string name="disable_complex_routing">Komplexes Routing deaktivieren</string>
-	<string name="route_descr_select_on_map">Auf Karte auswählen…</string>
-	<string name="route_descr_favorite">Favorit…</string>
+	<string name="shared_string_select_on_map">Auf Karte auswählen…</string>
+	<string name="shared_string_favorite">Favorit…</string>
 	<string name="route_preferences">Routing-Einstellungen</string>
 	<string name="route_info">Routen-Informationen</string>
 	<string name="calculate_osmand_route_without_internet">OsmAnd-Route ohne Internetverbindung berechnen</string>
@@ -1566,7 +1566,7 @@
 	<string name="map_widget_plain_time">Aktuelle Zeit</string>
 	<string name="selected_gpx_info_show">\n\nZur Darstellung auf der Karte Antippen und Halten</string>
 	<string name="delay_navigation_start">Navigation automatisch starten</string>
-	<string name="selected">ausgewählte</string>
+	<string name="shared_string_selected_lowercase">ausgewählte</string>
 	<string name="save_as_favorites_points">als Favoriten-Gruppe speichern</string>
 	<string name="select_destination_and_intermediate_points">Wegpunkte auswählen</string>
 	<string name="sort_by_distance">Sortieren nach Entfernung</string>
@@ -1975,7 +1975,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="rendering_attr_tramRoutes_name">Straßenbahnenlinien</string>
     <string name="wake_on_voice">Bildschirm aktivieren</string>
     <string name="wake_on_voice_descr">Bildschirm bei Navigationsanweisung aktivieren (falls aus)</string>
-    <string name="wake_on_voice_never">Niemals</string>
+    <string name="shared_string_never">Niemals</string>
     <string name="select_impassable_road">Auf Karte auswählen…</string>
     <string name="impassable_road">Straße blockieren…</string>
     <string name="rendering_attr_tramTrainRoutes_name">Straßen- und Eisenbahnlinien</string>
@@ -1995,7 +1995,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="show_all">ALLES ZEIGEN</string>
     <string name="coordinates">Koordinaten</string>
     <string name="error_avoid_specific_road">Es konnte keine alternative Streckenführung gefunden werden</string>
-    <string name="dismiss">Ablehnen</string>
+    <string name="shared_string_dismiss">Ablehnen</string>
     <string name="everything_up_to_date">Alle Daten aktuell</string>
     <string name="use_opengl_render">OpenGL-Renderung verwenden</string>
     <string name="use_opengl_render_descr">Hardware beschleunigtes OpenGL-Rendering verwenden (Funktioniert nicht auf allen Geräten)</string>
@@ -2047,10 +2047,10 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="proxy_host_descr">Einen Proxy\'s Hostname einrichten (Bsp. 127.0.0.1)</string>
     <string name="proxy_port_title">Proxy-Port</string>
     <string name="proxy_port_descr">Einen Proxy\'s Port einrichten (Bsp. 8118)</string>
-    <string name="enable_plugin">Deaktiviert</string>
-    <string name="disable_plugin">Aktiviert</string>
-    <string name="enable_plugin2">Aktivieren</string>
-    <string name="disable_plugin2">Deaktivieren</string>
+    <string name="shared_string_disabled">Deaktiviert</string>
+    <string name="shared_string_enabled">Aktiviert</string>
+    <string name="shared_string_enable">Aktivieren</string>
+    <string name="shared_string_disable">Deaktivieren</string>
     <string name="plugin_description_title">Beschreibung</string>
     <string name="plugin_settings_button_caption">Einstellungen</string>
     <string name="plugin_install_needs_network">Die Installation dieses Plugins benötigt eine Internet-Verbindung.</string>
@@ -2090,8 +2090,9 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="rendering_attr_pisteRoutes_name">Pisten</string>
 	<string name="export">Export</string>
 	<string name="watch">Ansehen</string>
-	<string name="selected_tracks">Ausgewählt</string>
+	<string name="shared_string_selected">Ausgewählt</string>
 	<string name="turn_off_all">alles_abschalten</string>
 	<string name="showed_on_map">Auf Karte angezeigt</string>
 	<string name="share_note">Notiz mitteilen</string>
+	<string name="days_behind">Tage alt</string>
 	</resources>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 744c6157f3..1b9362ccb9 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -238,14 +238,14 @@
 	<string name="show_ruler_level">Εμφάνιση χάρακα</string>	
 	<string name="info_button">Πληροφορίες</string>
 	<string name="back_to_location">Επιστροφή στη θέση</string>
-	<string name="help">Βοήθεια</string>
+	<string name="shared_string_help">Βοήθεια</string>
 	<string name="show_details">Εμφάνιση λεπτομερειών</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_on">Ενεργό</string>
-	<string name="accessibility_off">Ανενεργό</string>
+	<string name="shared_string_on">Ενεργό</string>
+	<string name="shared_string_off">Ανενεργό</string>
 	<string name="accessibility_default">Σύμφωνα με την καθολική ρύθμιση του συστήματος</string>
 	<string name="backToMenu">Πίσω Στο Μενού</string>
 	<string name="zoomOut">Σμίκρυνση</string>
@@ -556,7 +556,7 @@
 	<string name="map_underlay">Χάρτης υποστρώματος</string>
 	<string name="map_underlay_descr">Επιλογή χάρτη υποστρώματος</string>
 	<string name="layer_overlay">Χάρτης επικάλυψης…</string>
-	<string name="default_none">Κανένα</string>
+	<string name="shared_string_none">Κανένα</string>
 	<string name="map_overlay">Χάρτης επικάλυψης</string>
 	<string name="map_overlay_descr">Επιλογή χάρτη επικάλυψης</string>
 	<string name="tile_source_already_installed">Ο χάρτης είναι ήδη εγκατεστημένος, οι ρυθμίσεις θα ενημερωθούν</string>
@@ -608,8 +608,8 @@
 	</string>
 	<string name="tip_initial">Βοήθεια</string>
 	<string name="tip_initial_t">"Ο OsmAnd είναι μια εφαρμογή πλοήγησης με αρκετά χαρακτηριστικά.\n\nΩς μια βασική εισαγωγή, μερικές συμβουλές χρήσης και κόλπα είναι συνδεδεμένα μέσω του \'Μενού\'→\'Βοήθεια\' στην οθόνη χάρτη. "</string>
-	<string name="next_button">Επόμενο</string>
-	<string name="previous_button">Προηγούμενο</string>
+	<string name="shared_string_next">Επόμενο</string>
+	<string name="shared_string_previous">Προηγούμενο</string>
 	<string name="unit_of_length_descr">Αλλαγή μονάδων μήκους και ταχύτητας</string>
 	<string name="unit_of_length">Μονάδα μέτρησης</string>
 	<string name="si_mi_foots">Μίλια/πόδια</string>
@@ -652,7 +652,7 @@
 	<string name="indexing_map">Ευρετηρίαση χάρτη…</string>
 	<string name="indexing_poi">Ευρετηρίαση Σημ. Ενδ…</string>
 	<string name="indexing_transport">Ευρετηρίαση μεταφορών…</string>
-	<string name="input_output_error">Σφάλμα Εισ/Εξ</string>
+	<string name="shared_string_io_error">Σφάλμα Εισ/Εξ</string>
 	<string name="km">χλμ</string>
 	<string name="km_h">χλμ/ω</string>
 	<string name="m">μ</string>
@@ -826,7 +826,7 @@
 	<string name="transport_stops_to_pass">στάσεις προς προσπέραση</string>
 	<string name="transport_route_distance">Απόσταση δρομολογίου</string>
 	<string name="transport">Μεταφορές</string>
-	<string name="default_buttons_ok">Εντάξει</string>
+	<string name="shared_string_ok">Εντάξει</string>
 	<string name="show_transport_over_map_description">Εμφάνιση στάσεων ΜΜΜ στο χάρτη</string>
 	<string name="show_transport_over_map">Εμφάνιση στάσεων ΜΜΜ</string>
 	<string name="hello">Εφαρμογή πλοήγησης OsmAnd</string>
@@ -843,7 +843,7 @@
 	<string name="search_history_building">Κτήριο: {0}, {1}, {2}</string>
 	<string name="favorite">Αγαπημένο</string>
 	<string name="clear_all">Καθαρισμός όλων</string>
-	<string name="history">Ιστορικό</string>
+	<string name="shared_string_history">Ιστορικό</string>
 	<string name="uploading_data">Αποστολή δεδομένων…</string>
 	<string name="uploading">Αποστολή…</string>
 	<string name="search_nothing_found">Δε βρέθηκε τίποτα</string>
@@ -917,7 +917,7 @@
 	<string name="map_preferences_descr">Καθορισμός ρυθμίσεων χάρτη: πηγή χάρτη, περιστροφή, θέση δείκτη, προσανατολισμός οθόνης</string>
 	<string name="osm_settings">Επεξεργασία OSM</string>
 	<string name="additional_settings">Πρόσθετες ρυθμίσεις</string>
-	<string name="settings">Ρυθμίσεις</string>
+	<string name="shared_string_settings">Ρυθμίσεις</string>
 	<string name="save_current_track_descr">Αποθήκευση τρέχοντος ίχνους στην SD τώρα</string>
 	<string name="save_current_track">Αποθήκευση τρέχοντος ίχνους GPX</string>
 	<string name="save_track_interval">Διάστημα καταγραφής κατά την πλοήγηση</string>
@@ -994,11 +994,11 @@
 	<string name="context_menu_item_update_map">Ενημέρωση χάρτη</string>
 	<string name="context_menu_item_open_bug">Άνοιγμα σφάλματος OSM</string>
 	<string name="context_menu_item_create_poi">Δημιουργία ΣΕ</string>
-	<string name="default_buttons_yes">Ναι</string>
-	<string name="default_buttons_cancel">Ακύρωση</string>
+	<string name="shared_string_yes">Ναι</string>
+	<string name="shared_string_cancel">Ακύρωση</string>
 	<string name="default_buttons_apply">Εφαρμογή</string>
 	<string name="default_buttons_add">Προσθήκη</string>
-	<string name="default_buttons_no">Όχι</string>
+	<string name="shared_string_no">Όχι</string>
 	<string name="add_favorite_dialog_top_text">Εισαγωγή ονόματος αγαπημένου</string>
 	<string name="add_favorite_dialog_default_favourite_name">Αγαπημένο</string>
 	<string name="add_favorite_dialog_favourite_added_template">Το αγαπημένο σημείο \'\'{0}\'\' προστέθηκε με επιτυχία.</string>
@@ -1345,8 +1345,8 @@
     <string name="animate_routing_gpx">Προσομοίωση χρησιμοποιώντας δεδομένα διαδρομής GPX</string>
     <string name="remember_choice">Να θυμάσαι την επιλογή μου</string>
     <string name="gps_status_eclipsim">Κατάσταση GPS</string>
-    <string name="default_and">και</string>
-    <string name="default_or">ή</string>
+    <string name="shared_string_and">και</string>
+    <string name="shared_string_or">ή</string>
 	<string name="auto_zoom_none">Χωρίς αυτόματη εστίαση</string>
 	<string name="auto_zoom_far">Μεσαία εμφάνιση</string>
 	<string name="map_magnifier">Μεγεθυντής χάρτη</string>
@@ -1363,7 +1363,7 @@
     <string name="app_modes_choose_descr">Επιλογή εμφανών προφιλ χρήσεων στην εφαρμογή</string>
     <string name="loading_smth">Φόρτωση %1$s …</string>
     <string name="delay_navigation_start">Έναρξη πλοήγησης στροφή-στροφή αυτόματα</string>
-    <string name="selected">επιλεγμένο</string>
+    <string name="shared_string_selected_lowercase">επιλεγμένο</string>
     <string name="gpx_info_distance">Απόσταση: %1$s (%2$s σημεία) </string>
 	<string name="gpx_info_average_speed">Μέση ταχύτητα: %1$s </string>
 	<string name="gpx_info_maximum_speed">Μέγιστη ταχύτητα: %1$s </string>
@@ -1510,8 +1510,8 @@
     <string name="keep_and_add_destination_point">Προσθήκη ως σημείο προορισμού</string>
     <string name="select_gpx">Επιλέξτε GPX…</string>
     <string name="route_descr_select_destination">Επιλέξτε Προορισμό</string>
-    <string name="route_descr_select_on_map">Επιλέξτε στο χάρτη…</string>
-    <string name="route_descr_favorite">Αγαπημένο…</string>
+    <string name="shared_string_select_on_map">Επιλέξτε στο χάρτη…</string>
+    <string name="shared_string_favorite">Αγαπημένο…</string>
     <string name="route_preferences">Προτιμήσεις δρομολογίου</string>
     <string name="route_info">Πληροφορίες δρομολογίου</string>
     <string name="routing_attr_prefer_motorway_name">Προτίμηση αυτοκινητοδρόμων</string>
@@ -1630,7 +1630,7 @@
     <string name="osmo_device_not_found">Η συσκευή δεν βρέθηκε</string>
     <string name="anonymous_user">Ανώνυμος χρήστης</string>
     <string name="logged_as">Συνδεδεμένος ως %1$s</string>
-	<string name="wake_on_voice_never">Ποτέ</string>
+	<string name="shared_string_never">Ποτέ</string>
     <string name="select_impassable_road">Επιλογή στον χάρτη…</string>
     <string name="impassable_road">Αποφυγή δρόμων…</string>
     <string name="rendering_category_hide">Απόκρυψη</string>
@@ -1668,7 +1668,7 @@
 	<string name="show_railway_warnings">Εμφάνιση διασταυρώσεων σιδηροτροχιάς</string>
 	<string name="show_pedestrian_warnings">Εμφάνιση διαβάσεων πεζών</string>
     <string name="rendering_attr_transportStops_name">Στάσεις ΜΜΜ</string>
-    <string name="dismiss">Απόρριψη</string>
+    <string name="shared_string_dismiss">Απόρριψη</string>
     <string name="show_map">ΕΜΦ ΧΑΡΤΗ</string>
 	<string name="show_all">ΕΜΦ ΌΛΩΝ</string>
 	<string name="speak_pedestrian">Ανακοίνωση διαβάσεων πεζών</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 2c927f7fde..ce3de4d6dc 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -241,7 +241,7 @@
   <string name="map_underlay">Mapa subyacente</string>
   <string name="map_underlay_descr">Elige el mapa subyacente</string>
   <string name="layer_overlay">Mapa superpuesto…</string>
-  <string name="default_none">Ninguno</string>
+  <string name="shared_string_none">Ninguno</string>
   <string name="map_overlay">Mapa superpuesto</string>
   <string name="map_overlay_descr">Elige el mapa superpuesto</string>
   <string name="tile_source_already_installed">El mapa ya está instalado, se actualizarán las opciones</string>
@@ -300,8 +300,8 @@
 	</string>
   <string name="tip_initial">Ayuda</string>
   <string name="tip_initial_t">"OsmAnd es una aplicación de navegación con muchas características.\n\nComo una introducción básica, algunos consejos de uso y trucos están enlazados en el \'Menú\' → \'Ayuda\' desde la pantalla del mapa. "</string>
-  <string name="next_button">Siguiente</string>
-  <string name="previous_button">Anterior</string>
+  <string name="shared_string_next">Siguiente</string>
+  <string name="shared_string_previous">Anterior</string>
   <string name="unit_of_length_descr">Cambia las unidades de longitud y velocidad</string>
   <string name="unit_of_length">Unidad de longitud</string>
   <string name="si_mi_foots">Millas/pies</string>
@@ -344,7 +344,7 @@
   <string name="indexing_map">Indexando mapa…</string>
   <string name="indexing_poi">Indexando PDI…</string>
   <string name="indexing_transport">Indexando transporte…</string>
-  <string name="input_output_error">Ocurrió un error de entrada/salida</string>
+  <string name="shared_string_io_error">Ocurrió un error de entrada/salida</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -525,7 +525,7 @@
   <string name="transport_stops_to_pass">paradas a pasar</string>
   <string name="transport_route_distance">Distancia del itinerario</string>
   <string name="transport">Transporte</string>
-  <string name="default_buttons_ok">Aceptar</string>
+  <string name="shared_string_ok">Aceptar</string>
   <string name="show_transport_over_map_description">Muestra paradas de transporte público en el mapa</string>
   <string name="show_transport_over_map">Mostrar paradas de transporte</string>
   <string name="hello">Aplicación de navegación OsmAnd</string>
@@ -542,7 +542,7 @@
   <string name="search_history_building">Edificio: {0}, {1}, {2}</string>
   <string name="favorite">Favorito</string>
   <string name="clear_all">Limpiar todo</string>
-  <string name="history">Historial</string>
+  <string name="shared_string_history">Historial</string>
   <string name="uploading_data">Subiendo datos…</string>
   <string name="uploading">Subiendo…</string>
   <string name="search_nothing_found">No se encontró nada</string>
@@ -620,7 +620,7 @@
   <string name="auto_zoom_map_descr">Acercamiento automático del mapa según su velocidad (mientras el mapa se sincroniza con la posición actual)</string>
   <string name="auto_zoom_map">Acercamiento automático del mapa</string>
   <string name="additional_settings">Opciones adicionales</string>
-  <string name="settings">Opciones</string>
+  <string name="shared_string_settings">Opciones</string>
   <string name="save_current_track_descr">Guarda la traza actual en la SD ahora</string>
   <string name="save_current_track">Guardar traza actual</string>
   <string name="save_track_interval">Intervalo de guardado durante navegación</string>
@@ -700,11 +700,11 @@
   <string name="context_menu_item_update_map">Actualizar mapa</string>
   <string name="context_menu_item_open_bug">Abrir fallo OSM</string>
   <string name="context_menu_item_create_poi">Crear PDI</string>
-  <string name="default_buttons_yes">Sí</string>
-  <string name="default_buttons_cancel">Cancelar</string>
+  <string name="shared_string_yes">Sí</string>
+  <string name="shared_string_cancel">Cancelar</string>
   <string name="default_buttons_apply">Aplicar</string>
   <string name="default_buttons_add">Añadir</string>
-  <string name="default_buttons_no">No</string>
+  <string name="shared_string_no">No</string>
   <string name="add_favorite_dialog_top_text">Introduzca nombre de favorito</string>
   <string name="add_favorite_dialog_default_favourite_name">Favorito</string>
   <string name="add_favorite_dialog_favourite_added_template">El punto favorito \'\'{0}\'\' se añadió correctamente.</string>
@@ -806,14 +806,14 @@
   <string name="show_ruler_level">Mostrar escala</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Volver a localización</string>
-  <string name="help">Ayuda</string>
+  <string name="shared_string_help">Ayuda</string>
   <string name="show_details">Mostrar detalles</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="accessibility_on">activado</string>
-  <string name="accessibility_off">desactivado</string>
+  <string name="shared_string_on">activado</string>
+  <string name="shared_string_off">desactivado</string>
   <string name="accessibility_default">Usar configuración global del sistema</string>
   <string name="backToMenu">Volver al Menú</string>
   <string name="zoomOut">Alejar</string>
@@ -1428,8 +1428,8 @@
 	<string name="auto_zoom_none">Sin acercamiento automático</string>
 	<string name="remember_choice">Recordar mi elección</string>
     <string name="gps_status_eclipsim">Estado del GPS</string>
-    <string name="default_and">y</string>
-    <string name="default_or">o</string>
+    <string name="shared_string_and">y</string>
+    <string name="shared_string_or">o</string>
 	<string name="auto_zoom_close">Cercano</string>
 	<string name="auto_zoom_far">Medio</string>
 	<string name="auto_zoom_farthest">Alejado</string>
@@ -1485,8 +1485,8 @@
     <string name="keep_and_add_destination_point">Añadir como punto de destino</string>
     <string name="select_gpx">Seleccionar GPX…</string>
     <string name="route_descr_select_destination">Seleccionar destino</string>
-    <string name="route_descr_select_on_map">Seleccionar en el mapa…</string>
-    <string name="route_descr_favorite">Favorito…</string>
+    <string name="shared_string_select_on_map">Seleccionar en el mapa…</string>
+    <string name="shared_string_favorite">Favorito…</string>
     <string name="route_preferences">Preferencias de la ruta</string>
     <string name="route_info">Información de la ruta</string>
     <string name="tip_recent_changes_1_7_1_t">"Cambios en 1.7:
@@ -1677,7 +1677,7 @@
     <string name="loading_smth">Cargando %1$s…</string>
     <string name="selected_gpx_info_show">\n\nMantenga pulsado para ver el mapa</string>
     <string name="delay_navigation_start">Iniciar automáticamente la navegación giro a giro</string>
-    <string name="selected">seleccionado</string>
+    <string name="shared_string_selected_lowercase">seleccionado</string>
     <string name="gpx_split_interval">Intérvalo de división</string>
     <string name="gpx_info_subtracks">Subpista: %1$s </string>
 	<string name="gpx_info_waypoints">Puntos de ruta: %1$s </string>
@@ -1846,7 +1846,7 @@
     <string name="wake_on_voice">Encender pantalla</string>
     <string name="wake_on_voice_descr">Enciende la pantalla del dispositivo al aproximarse a un giro</string>
     <string name="lock_screen_request_explanation">%1$s necesita este permiso para apagar la pantalla para la característica de ahorro energético.</string>
-    <string name="wake_on_voice_never">Nunca</string>
+    <string name="shared_string_never">Nunca</string>
     <string name="advanced_settings">Avanzado</string>
 	<string name="osmo_use_https_descr">Usar conexión segura con el servidor</string>
     <string name="osmo_use_https">Usar HTTPS</string>
@@ -1860,7 +1860,7 @@
     <string name="use_opengl_render_descr">Usar renderizado OpenGL acelerado por hardware (podría no funcionar en algunos dispositivos)</string>
     <string name="error_avoid_specific_road">No se ha encontrado circunvalación</string>
     <string name="everything_up_to_date">Todos los archivos actualizados</string>
-    <string name="dismiss">Descartar</string>
+    <string name="shared_string_dismiss">Descartar</string>
     <string name="no_internet_connection">Imposible descargar; por favor, comprueba tu conexión a Internet.</string>
     <string name="download_tab_downloads">Todas las descargas</string>
     <string name="download_tab_updates">Actualizaciones</string>
@@ -1911,8 +1911,8 @@
     <string name="osm_editing_manage">Administrar</string>
     <string name="parking_place">Área de aparcamiento</string>
     <string name="remove_the_tag">QUITA LA ETIQUETA</string>
-    <string name="enable_plugin">Desactivado</string>
-	<string name="disable_plugin">Activado</string>
+    <string name="shared_string_disabled">Desactivado</string>
+	<string name="shared_string_enabled">Activado</string>
 <string name="plugin_description_title">Descripción</string>
 	<string name="plugin_settings_button_caption">Opciones</string>
 <string name="edit_group">Editar grupo</string>
@@ -1921,8 +1921,8 @@
     <string name="plugin_nautical_name">Vista mapa náutico</string>
     <string name="world_ski_missing">Para mostrar mapas de esquí, debes descargar el mapa especial</string>
     <string name="nautical_maps_missing">Para mostrar mapas náuticos, debes descargar el mapa especial</string>
-	<string name="enable_plugin2">Activar</string>
-	<string name="disable_plugin2">Desactivar</string>
+	<string name="shared_string_enable">Activar</string>
+	<string name="shared_string_disable">Desactivar</string>
 	<string name="get_plugin">Obtener</string>
 <string name="free">"Libre %1$s "</string>
 	<string name="device_memory">Memoria del dispositivo</string>
@@ -1959,7 +1959,7 @@
 	<string name="rename_failed">Falló el renombrado.</string>
 	<string name="currently_recording_track">Actualmente registrando traza</string>
 	<string name="back_to_map">Volver al mapa</string>
-	<string name="selected_tracks">Seleccionada(s)</string>
+	<string name="shared_string_selected">Seleccionada(s)</string>
 	<string name="track_segments">Segmentos de traza</string>
 	<string name="track_points">Puntos de traza</string>
 	</resources>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index e5c18a4b1c..d80081072d 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -440,14 +440,14 @@
   <string name="show_ruler_level">Erregela erakutsi</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Kokapenera itzuli</string>
-  <string name="help">Laguntza</string>
+  <string name="shared_string_help">Laguntza</string>
   <string name="show_details">Xehetasunak erakutsi</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="accessibility_on">On</string>
-  <string name="accessibility_off">Off</string>
+  <string name="shared_string_on">On</string>
+  <string name="shared_string_off">Off</string>
   <string name="accessibility_default">Sistemako ezarpen orokorraren arabera</string>
   <string name="backToMenu">Menura Itzuli</string>
   <string name="zoomOut">Urrundu</string>
@@ -697,7 +697,7 @@
   <string name="map_underlay">Azpiazal mapa</string>
   <string name="map_underlay_descr">Aukeratu azpiazal mapa</string>
   <string name="layer_overlay">Gainazal mapa…</string>
-  <string name="default_none">Bat ere ez</string>
+  <string name="shared_string_none">Bat ere ez</string>
   <string name="map_overlay">Gainazal mapa</string>
   <string name="map_overlay_descr">Aukeratu gainazal mapa</string>
   <string name="tile_source_already_installed">Mapa iadanik instalatuta dago, ezarpenak eguneratuak izango dira</string>
@@ -729,8 +729,8 @@
   <string name="tip_map_context_menu_t">⇥Maparen menua mapan edo trackball-ean sakatuta mantenduz ireki dezakezu.⏎\n⇥⇥⏎\n⇥Honek koordinatuak dituen kaxa bat sortzen du. Maparen menuaren dialogoa irekitzeko, sakatu bertan. (Edo sakatuta mantendu kaxa berriro ezkutatzeko.)⏎\n⇥⇥⏎\n⇥Maparen menua puntu (kokapen) batekin erlazionaturiko ekintza guztiak dakartza.⏎\n⇥</string>
   <string name="tip_initial">Aholku eta trikimailuak</string>
   <string name="tip_initial_t">⇥OsmAnd ezaugarri asko dituen nabigazio aplikazio bat da. ⏎\n⇥⇥⏎\n⇥Oinarrizko sarrera moduan, aholku eta trikimailu batzuen estekak dituzu pantaila nagusian (begiratu \'?\' ikonoa).⏎\n⇥</string>
-  <string name="next_button">Ondorengoa</string>
-  <string name="previous_button">Aurrekoa</string>
+  <string name="shared_string_next">Ondorengoa</string>
+  <string name="shared_string_previous">Aurrekoa</string>
   <string name="unit_of_length_descr">Luzeera eta abiaduraren unitateak aldatu</string>
   <string name="unit_of_length">Neurtze unitatea</string>
   <string name="si_mi_foots">Milak/oinak</string>
@@ -773,7 +773,7 @@
   <string name="indexing_map">Mapa indexatzen…</string>
   <string name="indexing_poi">POI indexatzen…</string>
   <string name="indexing_transport">Garraioa indexatzen…</string>
-  <string name="input_output_error">I/O errorea gertatu da</string>
+  <string name="shared_string_io_error">I/O errorea gertatu da</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -942,7 +942,7 @@
   <string name="transport_stops_to_pass">pasatu beharreko geldialdiak</string>
   <string name="transport_route_distance">Ibilbidearen distantzia</string>
   <string name="transport">Garraioa</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Erakutsi garraio publikoko geldialdiak mapan</string>
   <string name="show_transport_over_map">Erakutsi garraioko geldialdiak</string>
   <string name="hello">OsmAnd nabigatzaile aplikazioa</string>
@@ -959,7 +959,7 @@
   <string name="search_history_building">Eraikina: {0}, {1}, {2}</string>
   <string name="favorite">Gogokoena</string>
   <string name="clear_all">Guztia garbitu</string>
-  <string name="history">Historiala</string>
+  <string name="shared_string_history">Historiala</string>
   <string name="uploading_data">Datuak igotzen…</string>
   <string name="uploading">Igotzen…</string>
   <string name="search_nothing_found">Ez da ezer aurkitu</string>
@@ -1033,7 +1033,7 @@
   <string name="map_preferences_descr">Ezarri maparen ezarpenak: mapa iturburua, biraketa, markatzailearen kokapena, pantaila orientazioa</string>
   <string name="osm_settings">OSM edizioa</string>
   <string name="additional_settings">Gainerako ezarpenak</string>
-  <string name="settings">Ezarpenak</string>
+  <string name="shared_string_settings">Ezarpenak</string>
   <string name="save_current_track_descr">Uneko bidea SDan gorde orain</string>
   <string name="save_current_track">Uneko GPX bidea gorde</string>
   <string name="save_track_interval">Jarraipen tartea</string>
@@ -1108,11 +1108,11 @@
   <string name="context_menu_item_update_map">Mapa eguneratu</string>
   <string name="context_menu_item_open_bug">Ireki OSM akats jakinarazpena</string>
   <string name="context_menu_item_create_poi">POIa sortu</string>
-  <string name="default_buttons_yes">Bai</string>
-  <string name="default_buttons_cancel">Ezeztatu</string>
+  <string name="shared_string_yes">Bai</string>
+  <string name="shared_string_cancel">Ezeztatu</string>
   <string name="default_buttons_apply">Aplikatu</string>
   <string name="default_buttons_add">Gehitu</string>
-  <string name="default_buttons_no">Ez</string>
+  <string name="shared_string_no">Ez</string>
   <string name="add_favorite_dialog_top_text">Gogokoaren izena sartu</string>
   <string name="add_favorite_dialog_default_favourite_name">Gogokoena</string>
   <string name="add_favorite_dialog_favourite_added_template">Gogokoen \"{0}\" puntua arrakastaz gehitu da.</string>
@@ -1178,8 +1178,8 @@
     <string name="keep_and_add_destination_point">Helmuga puntua bezala gehitu</string>
     <string name="select_gpx">Aukeratu GPX …</string>
     <string name="route_descr_select_destination">Aukeratu Helmuga</string>
-    <string name="route_descr_select_on_map">Aukeratu mapan …</string>
-    <string name="route_descr_favorite">Gogokoena …</string>
+    <string name="shared_string_select_on_map">Aukeratu mapan …</string>
+    <string name="shared_string_favorite">Gogokoena …</string>
     <string name="route_preferences">Ibilbide lehentasunak</string>
     <string name="route_info">Ibilbide informazioa</string>
     <string name="routing_attr_prefer_motorway_name">Autopistak nahiago</string>
@@ -1281,9 +1281,9 @@
     <string name="about_settings">Buruz</string>
     <string name="about_settings_descr">Bertsioaren informazioa ,lizantziak ,proiektu kideak</string>
     <string name="tip_map_styles">Maparen estiloa</string>
-	<string name="default_or">edo</string>
+	<string name="shared_string_or">edo</string>
 	<string name="gps_status_eclipsim">GPSaren egoera</string>
-    <string name="default_and">eta</string>
+    <string name="shared_string_and">eta</string>
     <string name="local_osm_changes_delete_all">Dena ezabatu</string>
     <string name="remember_choice">Nire aukera gogoratu</string>
     <string name="animate_routing_route_not_calculated">Kalkulatu ibilbidea lehenengo, mesedez</string>
@@ -1304,7 +1304,7 @@
     <string name="loading_smth">Kargatzen %1$s …</string>
     <string name="map_widget_plain_time">Oraingo ordua</string>
     <string name="selected_gpx_info_show">\n\nZanpatuta mantendu mapan ikusteko</string>
-    <string name="selected">hautatua</string>
+    <string name="shared_string_selected_lowercase">hautatua</string>
     <string name="gpx_info_distance">"Distantzia: %1$s (%2$s puntu) "</string>
 	<string name="gpx_info_start_time">"Hasierako ordua: %1$tF, %1$tT "</string>
 	<string name="gpx_info_end_time">"Bukaerako ordua: %1$tF, %1$tT "</string>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index dbb8d69d4e..71f29efe45 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -258,11 +258,11 @@
 	<string name="context_menu_item_update_map">به روز رسانی نقشه</string>
 	<string name="context_menu_item_open_bug">بازکردن اشکال OSM</string>
 	<string name="context_menu_item_create_poi">ایجاد POI</string>
-	<string name="default_buttons_yes">بله</string>
-	<string name="default_buttons_cancel">لغو</string>
+	<string name="shared_string_yes">بله</string>
+	<string name="shared_string_cancel">لغو</string>
 	<string name="default_buttons_apply">بکارگیری</string>
 	<string name="default_buttons_add">افزودن</string>
-	<string name="default_buttons_no">خیر</string>
+	<string name="shared_string_no">خیر</string>
 	<string name="add_favorite_dialog_top_text">نام علاقمندی را وارد کنید</string>
 	<string name="add_favorite_dialog_default_favourite_name">علاقمندی</string>
 	<string name="add_favorite_dialog_favourite_added_template">نقطه علاقمندی \'{0}\' اضافه شد.</string>
@@ -345,7 +345,7 @@
 	<string name="get_directions">مسیرها</string>
 	<string name="show_gps_status">نشان دادن /\'وضعیت GPS/\'</string>
 	<string name="opening_hours">ساعات باز بودن</string>
-	<string name="history">تاریخچه</string>
+	<string name="shared_string_history">تاریخچه</string>
 	<string name="search_nothing_found">چیزی پیدا نشد</string>
 	<string name="searching">درحال جستجو…</string>
 	<string name="searching_address">درحال جستجوی آدرس…</string>
@@ -354,8 +354,8 @@
 	<string name="max_level_download_tile">حداکثر زوم آنلاین</string>
 	<string name="download_question">{0} - {1} دانلود شود؟</string>
 	<string name="route_general_information">مسافت کل %1$s، مدت سفر %2$d ساعت و %3$d دقیقه.</string>
-	<string name="next_button">بعدی</string>
-	<string name="previous_button">قبلی</string>
+	<string name="shared_string_next">بعدی</string>
+	<string name="shared_string_previous">قبلی</string>
 	<string name="unit_of_length_descr">تغییر واحد طول و سرعت</string>
 	<string name="unit_of_length">واحد اندازه گیری</string>
 	<string name="local_index_descr_title">مدیریت نقشه ها</string>
@@ -480,10 +480,10 @@
 	<string name="show_ruler_level">نمایش خط کش</string>	
 	<string name="info_button">اطلاعات</string>
 	<string name="back_to_location">برگشتن به موقعیت</string>
-	<string name="help">کمک</string>
+	<string name="shared_string_help">کمک</string>
 	<string name="show_details">نمایش جزئیات</string>
-	<string name="accessibility_on">روشن</string>
-	<string name="accessibility_off">خاموش</string>
+	<string name="shared_string_on">روشن</string>
+	<string name="shared_string_off">خاموش</string>
 	<string name="accessibility_default">طبق تنظیمات کلی سیستم</string>
 	<string name="backToMenu">برگشت به منو</string>
 	<string name="zoomOut">ریزتر</string>
@@ -623,7 +623,7 @@
 	<string name="show_poi_over_map_description">نشان دادن POI بر روی نقشه (استفاده از فیلترهای انتخاب شده قبلی)</string>
 	<string name="favourites_activity">علاقمندی ها</string>
 	<string name="data_settings">داده‌ها</string>
-	<string name="settings">تنظیمات</string>
+	<string name="shared_string_settings">تنظیمات</string>
 	<string name="additional_settings">تنظیمات اضافی</string>
 	<string name="update_tile">بروز رسانی نقشه</string>
 	<string name="download_indexes">بارگذاری داده بصورت آفلاین</string>
@@ -825,7 +825,7 @@
 	<string name="map_underlay">نقشه زیری</string>
 	<string name="map_underlay_descr">انتخاب نقشه زیرین</string>
 	<string name="layer_overlay">نقشه رویی…</string>
-	<string name="default_none">هیچیک</string>
+	<string name="shared_string_none">هیچیک</string>
 	<string name="map_overlay">نقشه رویی</string>
 	<string name="map_overlay_descr">انتخاب نقشه رویی</string>
 	<string name="tile_source_already_installed">نقشه قبلاً نصب شده است، تنظیمات به روز خواهد شد</string>
@@ -861,7 +861,7 @@
 	<string name="indexing_map">درحال ایندکس نقشه…</string>
 	<string name="indexing_poi">درحال ایندکس POI…</string>
 	<string name="indexing_transport">درحال ایندکس حمل و نقل عمومی…</string>
-	<string name="input_output_error">خطای ورودی/خروجی رخ داد</string>
+	<string name="shared_string_io_error">خطای ورودی/خروجی رخ داد</string>
 	<string name="km">کیلومتر</string>
 	<string name="m">متر</string>
 	<string name="map_tile_source">منبع نقشه تصویری</string>
@@ -964,7 +964,7 @@
 	<string name="hello">برنامه مسیریابی OsmAnd</string>
 	<string name="update_poi_success">داده های POI با موفقیت آپلود شد ({0} مورد بارگزاری شد)</string>
 	<string name="update_poi_error_local">خطا در هنگام به روز رسانی لیست POI محلی</string>
-	<string name="default_buttons_ok">خُب</string>
+	<string name="shared_string_ok">خُب</string>
 	<string name="transport">حمل و نقل</string>
 	<string name="transport_route_distance">مسافت مسیر</string>
 	<string name="transport_Stop">توقف</string>
@@ -1589,8 +1589,8 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. 
     
     <string name="map_magnifier">ذره بین نقشه</string>
     <string name="base_world_map">نقشه کل جهان</string>
-	<string name="default_and">و</string>
-    <string name="default_or">یا</string>
+	<string name="shared_string_and">و</string>
+    <string name="shared_string_or">یا</string>
 	<string name="animate_routing_route_not_calculated">لطفاً ابتدا مسیر را محاسبه کن</string>
     <string name="animate_routing_route">شبیه سازی با استفاده از مسیر محاسبه شده </string>
     <string name="animate_routing_gpx">شبیه سازی با استفاده از مسیر GPX</string>
@@ -1649,8 +1649,8 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. 
 	<string name="routing_attr_weight_description">تعیین محدودیت وزن خودرو</string>
     <string name="select_gpx">انتخاب فایل جی پی ایکس …</string>
     <string name="route_descr_select_destination">انتخاب مقصد</string>
-    <string name="route_descr_select_on_map">انتخاب روی نقشه …</string>
-    <string name="route_descr_favorite">علاقه مندی ها …</string>
+    <string name="shared_string_select_on_map">انتخاب روی نقشه …</string>
+    <string name="shared_string_favorite">علاقه مندی ها …</string>
     <string name="route_preferences">تنظیمات مسیر</string>
     <string name="route_info">اطلاعات مسیر</string>
     <string name="use_displayed_track_for_navigation">آیا می‌خواهید از مسیر نمایش داده شده برای مسیریابی استفاده کنید؟</string>
@@ -1840,7 +1840,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. 
     <string name="gpx_wpt">نقطه بین راهی</string>
     <string name="selected_gpx_info_show">\n\n برای نمایش بر روی نقشه انگشت خود را چند لحظه بر روی صفحه نگه دارید</string>
     <string name="delay_navigation_start">شروع راهنمای به صورت گام به گام و خودکار</string>
-    <string name="selected">انتخاب</string>
+    <string name="shared_string_selected_lowercase">انتخاب</string>
     <string name="gpx_split_interval">بازه زمانی</string>
     <string name="gpx_info_subtracks">مسیر فرعی: %1$s </string>
 	<string name="gpx_info_waypoints">ایستگاههای بین راه: %1$s </string>
@@ -2085,12 +2085,12 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. 
     <string name="navigate_point_easting">به طرف شرق</string>
     <string name="download_tab_downloads">همه دانلودها</string>
     <string name="download_tab_updates">به‌روز‌رسانی‌ها</string>
-    <string name="dismiss">نپذیرفتن</string>
+    <string name="shared_string_dismiss">نپذیرفتن</string>
     <string name="use_opengl_render">استفاده از دندرینگ OpenGL</string>
     <string name="use_opengl_render_descr">استفاده از رندریگ تسریع‌یافته OpenGL (بر روی برخی دستگاه‌ها کار نمیکند)</string>
     <string name="lock_screen_request_explanation">%1$s این مجوز را نیاز دارد تا خصوصیت صرفه‌جویی انرژی صقجه نمایش را خاموش کند.</string>
     <string name="wake_on_voice_descr">صفحه نمایش قبل از رسیدن به پیچ، روشن شود (اگر خاموش است)</string>
-    <string name="wake_on_voice_never">هیچگاه</string>
+    <string name="shared_string_never">هیچگاه</string>
     <string name="rendering_attr_trolleybusRoutes_name">مسیرهای اتوبوس برقی</string>
     <string name="rendering_attr_busRoutes_name">مسیرهای اتوبوس</string>
     <string name="rendering_category_routes">مسیرها</string>
@@ -2100,10 +2100,10 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. 
 	<string name="plugin_install_needs_network">برای نصب این افزونه به اتصال اینترنت نیاز دارید.</string>
 	<string name="plugin_settings_button_caption">تنظیمات</string>
 	<string name="plugin_description_title">توضیح</string>
-	<string name="disable_plugin2">غیرفعال کردن</string>
-	<string name="enable_plugin2">فعال کردن</string>
-	<string name="disable_plugin">فعال</string>
-	<string name="enable_plugin">غیرفعال</string>
+	<string name="shared_string_disable">غیرفعال کردن</string>
+	<string name="shared_string_enable">فعال کردن</string>
+	<string name="shared_string_enabled">فعال</string>
+	<string name="shared_string_disabled">غیرفعال</string>
 	<string name="export">صادرکردن</string>
 	<string name="voices">اعلان‌های صوتی</string>
 	<string name="local_index_description">بر روی هر مورد کلیک کنید تا توضیحات بیشتری ببینید، بزنید و نگه دارید تا غیرفعال یا پاک کنید. داده فعلی بر روی دستگاه (%1$s آزاد):</string>
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index 518ec6e71f..91f47bc777 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -88,8 +88,8 @@
 	<string name="gpxup_private">Yksityinen</string>
 	<string name="route_kl">Pysy vasemmalla ja aja suoraan</string>
 	<string name="route_kr">Pysy oikealla ja jatka suoraan</string>
-	<string name="default_buttons_no">Ei</string>
-	<string name="default_buttons_yes">Kyllä</string>
+	<string name="shared_string_no">Ei</string>
+	<string name="shared_string_yes">Kyllä</string>
 	<string name="email">sähköposti</string>
 <string name="extra_settings">Kehittyneet asetukset</string>
 	<string name="gpx_tags_txt">Avainsanat</string>
@@ -100,10 +100,10 @@
 	<string name="show_ruler_level">Näytä viivain</string>	
 	<string name="info_button">Tietoja</string>
 	<string name="back_to_location">Takaisin sijaintiin</string>
-	<string name="help">Ohje</string>
+	<string name="shared_string_help">Ohje</string>
 	<string name="show_details">Näytä tiedot</string>
-	<string name="accessibility_on">Päällä</string>
-	<string name="accessibility_off">Pois päältä</string>
+	<string name="shared_string_on">Päällä</string>
+	<string name="shared_string_off">Pois päältä</string>
 	<string name="backToMenu">Takaisin valikkoon</string>
 	<string name="north">pohjoinen</string>
 	<string name="north_north_east">pohjoiskoillinen</string>
@@ -291,7 +291,7 @@
 	<string name="transport_to_go_before">seuraava etäisyys</string>
 	<string name="transport_stops_to_pass">pysäkkejä ohitettavana</string>
 	<string name="transport_route_distance">Reitin matka</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">Näytä julkisen liikenteen pysäkit kartalla</string>
 	<string name="show_transport_over_map">Näytä liikennepysäkit</string>
 	<string name="hello">Navigointisovellus OsmAnd</string>
@@ -306,7 +306,7 @@
 	<string name="search_history_building">Rakennus: {0}, {1}, {2}</string>
 	<string name="favorite">Suosikki</string>
 	<string name="clear_all">Tyhjennä kaikki</string>
-	<string name="history">Historia</string>
+	<string name="shared_string_history">Historia</string>
 	<string name="uploading_data">Lähetetään dataa…</string>
 	<string name="uploading">Lähetetään…</string>
 	<string name="search_nothing_found">Mitään ei löytynyt</string>
@@ -357,7 +357,7 @@
 	<string name="use_online_routing_descr">Käytä internettiä reitin laskentaan</string>
 	<string name="use_online_routing">Käytä online navigointia</string>
 	<string name="additional_settings">Lisäasetukset</string>
-	<string name="settings">Asetukset</string>
+	<string name="shared_string_settings">Asetukset</string>
 	<string name="save_current_track_descr">Tallenna nykyinen reitti muistikortille nyt</string>
 	<string name="save_current_track">Tallenna nykyinen GPX reitti</string>
 	<string name="save_track_interval">Kirjausväli</string>
@@ -409,7 +409,7 @@
 	<string name="search_tabs_location">Sijainti</string>
 	<string name="context_menu_item_add_favorite">Lisää suosikkeihin</string>
 	<string name="context_menu_item_update_map">Päivitä kartta</string>
-	<string name="default_buttons_cancel">Peruuta</string>
+	<string name="shared_string_cancel">Peruuta</string>
 	<string name="default_buttons_apply">Käytä</string>
 	<string name="default_buttons_add">Lisää</string>
 	<string name="add_favorite_dialog_top_text">Anna suosikin nimi</string>
@@ -638,7 +638,7 @@
 	<string name="si_mi_foots">Mailia/jalkaa</string>
 	<string name="si_mi_yard">Mailia/jaardia</string>
 	<string name="si_km_m">Kilometrejä/metrejä</string>
-	<string name="previous_button">Edellinen</string>
+	<string name="shared_string_previous">Edellinen</string>
 	<string name="dist_control_start">Aloita</string>
     <string name="stop_routing_confirm">Oletko varma että haluat lopettaa navigoinnin?</string>
     <string name="clear_dest_confirm">Haluatko varmasti poistaa päätepisteen?</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 3fd40d8cf2..c452a5d4a7 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -185,7 +185,7 @@
  
   
   
-  <string name="local_index_installed">Version du</string>
+  <string name="local_index_installed">Version locale</string>
   <string name="local_index_items_backuped">%1$d sur %2$d élément(s) désactivé(s).</string>
   <string name="local_index_items_deleted">%1$d sur %2$d éléments supprimés.</string>
   <string name="local_index_items_restored">%1$d sur %2$d éléments restaurés.</string>
@@ -252,7 +252,7 @@
   <string name="map_underlay">Fond de carte</string>
   <string name="map_underlay_descr">Choisir un fond de carte</string>
   <string name="layer_overlay">Sur-couche de carte…</string>
-  <string name="default_none">Aucun</string>
+  <string name="shared_string_none">Aucun</string>
   <string name="map_overlay">Sur-couche de la carte</string>
   <string name="map_overlay_descr">Choisir la carte en sur-couche</string>
   <string name="tile_source_already_installed">Carte déjà installée, paramètres seront mis à jour</string>
@@ -308,8 +308,8 @@
   <string name="tip_initial">Aide</string>
   <string name="tip_initial_t">"OsmAnd est une application de navigation avec beaucoup de fonctionnalités.
 \n\nUne introduction générale, les astuces et l\'aide avancée sont disponibles via \'Menu\'→\'Aide\' sur l\'écran principal. "</string>
-  <string name="next_button">Suivant</string>
-  <string name="previous_button">Précédent</string>
+  <string name="shared_string_next">Suivant</string>
+  <string name="shared_string_previous">Précédent</string>
   <string name="unit_of_length_descr">Sélectionnez les unités de longueur et de vitesse</string>
   <string name="unit_of_length">Unités de mesure</string>
   <string name="si_mi_foots">Miles/pieds</string>
@@ -352,7 +352,7 @@
   <string name="indexing_map">Indexation de la carte…</string>
   <string name="indexing_poi">Indexation du PI…</string>
   <string name="indexing_transport">Indexation des transports…</string>
-  <string name="input_output_error">Erreur d\'entrée/sortie</string>
+  <string name="shared_string_io_error">Erreur d\'entrée/sortie</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -535,7 +535,7 @@
   <string name="transport_stops_to_pass">nombre d\'arrêts :</string>
   <string name="transport_route_distance">Distance de l\'itinéraire :</string>
   <string name="transport">Transport</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Afficher les arrêts de transport publics sur la carte</string>
   <string name="show_transport_over_map">Afficher les arrêts de transports publics</string>
   <string name="hello">Application de navigation OsmAnd</string>
@@ -552,7 +552,7 @@
   <string name="search_history_building">Bâtiment :\n{0} {1}\n{2}</string>
   <string name="favorite">Favori </string>
   <string name="clear_all">Supprimer tout</string>
-  <string name="history">Historique</string>
+  <string name="shared_string_history">Historique</string>
   <string name="uploading_data">Envoi des données…</string>
   <string name="uploading">Envoi…</string>
   <string name="search_nothing_found">Rien n\'a été trouvé</string>
@@ -630,7 +630,7 @@
   <string name="auto_zoom_map_descr">Zoom automatique sur la carte en fonction de la vitesse</string>
   <string name="auto_zoom_map">Zoom automatique de la carte</string>
   <string name="additional_settings">Paramètres supplémentaires</string>
-  <string name="settings">Paramètres</string>
+  <string name="shared_string_settings">Paramètres</string>
   <string name="save_current_track_descr">Enregistrer la trace actuelle sur la carte SD</string>
   <string name="save_current_track">Enregistrer la trace GPX</string>
   <string name="save_track_interval_descr">Sélectionnez l\'intervalle d\'enregistrement de la trace pendant la navigation</string>
@@ -704,11 +704,11 @@
   <string name="context_menu_item_update_map">Mettre à jour la carte</string>
   <string name="context_menu_item_open_bug">Ouvrir un bogue OSM</string>
   <string name="context_menu_item_create_poi">Créer un point d\'intérêt</string>
-  <string name="default_buttons_yes">Oui</string>
-  <string name="default_buttons_cancel">Annuler</string>
+  <string name="shared_string_yes">Oui</string>
+  <string name="shared_string_cancel">Annuler</string>
   <string name="default_buttons_apply">Appliquer</string>
   <string name="default_buttons_add">Enregistrer</string>
-  <string name="default_buttons_no">Non</string>
+  <string name="shared_string_no">Non</string>
   <string name="add_favorite_dialog_top_text">Nom du favori</string>
   <string name="add_favorite_dialog_default_favourite_name">Favoris</string>
   <string name="add_favorite_dialog_favourite_added_template">Le point \'\'{0}\'\' a été ajouté aux favoris.</string>
@@ -807,14 +807,14 @@
   <string name="show_ruler_level">Afficher l\'échelle</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Retourner à la position</string>
-  <string name="help">Aide</string>
+  <string name="shared_string_help">Aide</string>
   <string name="show_details">Afficher les détails</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="accessibility_on">Oui</string>
-  <string name="accessibility_off">Non</string>
+  <string name="shared_string_on">Oui</string>
+  <string name="shared_string_off">Non</string>
   <string name="accessibility_default">Selon les paramètres globaux</string>
   <string name="backToMenu">Retour menu</string>
   <string name="zoomOut">Zoom -</string>
@@ -1421,8 +1421,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	\n\t* Des tas de modifications dans l\'interface utilisateur
 	\n\t* Résolution de bogues dans l\'affichage des distances, analyseur GPX, traitement des points de passage, widget de planning, chargement vers OSM, protocole https
     </string>
-    <string name="default_and">et</string>
-    <string name="default_or">ou</string>
+    <string name="shared_string_and">et</string>
+    <string name="shared_string_or">ou</string>
 	<string name="route_is_too_long">Le calcul d’itinéraire par OsmAnd peut prendre beaucoup de temps (et peut même parfois ne pas aboutir) pour des points séparés de plus de 200 km. Veuillez ajouter des étapes intermédiaires pour une meilleure performance.</string>
 	<string name="auto_zoom_none">Pas de zoom automatique</string>
 	<string name="auto_zoom_close">Pour agrandir</string>
@@ -1487,8 +1487,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="routing_attr_weight_description">Spécifiez la limite de poids à respecter pour emprunter les routes</string>
     <string name="select_gpx">Sélectionner GPX…</string>
     <string name="route_descr_select_destination">Sélectionnez la destination</string>
-    <string name="route_descr_select_on_map">Sélectionner sur la carte…</string>
-    <string name="route_descr_favorite">Favori…</string>
+    <string name="shared_string_select_on_map">Sélectionner sur la carte…</string>
+    <string name="shared_string_favorite">Favori…</string>
     <string name="route_preferences">Préférences d\'itinéraire</string>
     <string name="route_info">Informations sur l\'itinéraire</string>
     <string name="keep_and_add_destination_point">Ajouter comme destination</string>
@@ -1668,7 +1668,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="my_data_activity">Favoris</string>
     <string name="selected_gpx_info_show">\n\nAppui long pour afficher sur la carte</string>
     <string name="delay_navigation_start">Démarrer la navigation pas à pas automatiquement</string>
-    <string name="selected">sélectionné(s)</string>
+    <string name="shared_string_selected_lowercase">sélectionné(s)</string>
     <string name="gpx_split_interval">Intervalle de division</string>
     <string name="local_index_gpx_info_show">\n\nAppui long pour afficher les options</string>
 <string name="gpx_info_subtracks">Sections : %1$s </string>
@@ -1851,7 +1851,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="wake_on_voice">Allumer l\'écran</string>
     <string name="wake_on_voice_descr">Allumer l\'écran (si éteint) à l\'approche d\'une bifurcation</string>
     <string name="lock_screen_request_explanation">%1$s a besoin de cette permission pour éteindre l\'écran en mode économie d\'énergie.</string>
-    <string name="wake_on_voice_never">Jamais</string>
+    <string name="shared_string_never">Jamais</string>
     <string name="advanced_settings">Avancé</string>
 	<string name="osmo_use_https_descr">Utiliser une connexion sécurisée avec le serveur</string>
     <string name="osmo_use_https">Utiliser HTTPS</string>
@@ -1865,7 +1865,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="use_opengl_render">Utiliser le rendu OpenGL</string>
     <string name="use_opengl_render_descr">Utiliser le rendu matériel accéléré OpenGL (cette option peut être inopérante sur certains appareils)</string>
     <string name="everything_up_to_date">Tous les fichiers sont à jour</string>
-    <string name="dismiss">Ignorer</string>
+    <string name="shared_string_dismiss">Ignorer</string>
     <string name="no_internet_connection">Téléchargement impossible. Veuillez vous connecter à Internet (Wifi ou données mobiles) pour poursuivre.</string>
     <string name="download_tab_downloads">Tous les téléchargements</string>
     <string name="download_tab_updates">Mises à jour</string>
@@ -1916,14 +1916,14 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="gps_status">État du GPS</string>
     <string name="parking_place">Place de stationnement</string>
     <string name="remove_the_tag">Retirer l\'étiquette</string>
-    <string name="enable_plugin">Désactivé</string>
-	<string name="disable_plugin">Activé</string>
+    <string name="shared_string_disabled">Désactivé</string>
+	<string name="shared_string_enabled">Activé</string>
 <string name="plugin_description_title">Description</string>
 	<string name="plugin_settings_button_caption">Paramètres</string>
 <string name="edit_group">Modifier le groupe</string>
     <string name="plugin_install_needs_network">Vous devez être connecté à Internet pour installer ce greffon.</string>
-<string name="enable_plugin2">Activer</string>
-	<string name="disable_plugin2">Désactiver</string>
+<string name="shared_string_enable">Activer</string>
+	<string name="shared_string_disable">Désactiver</string>
 	<string name="get_plugin">Obtenir</string>
 <string name="plugin_ski_name">Pistes de ski</string>
     <string name="plugin_nautical_name">Carte marine</string>
@@ -1964,5 +1964,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="back_to_map">Retour à la carte</string>
 	<string name="turn_off_all">Tout éteindre</string>
 	<string name="showed_on_map">Affiché sur la carte</string>
-	<string name="selected_tracks">Sélectionné</string>
+	<string name="shared_string_selected">Sélectionné</string>
+	<string name="track_points">Points de trace</string>
+	<string name="route_points">Points d\'itinéraire</string>
+	<string name="track_segments">Segments de trace</string>
 	</resources>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index cd76df3e0b..9de9ec00ac 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -129,7 +129,7 @@
     <string name="gpx_wpt">Punto de pasaxe</string>
     <string name="selected_gpx_info_show">\n\nManteña premido para ver no mapa</string>
     <string name="delay_navigation_start">Iniciar a orientación paso a paso automaticamente</string>
-    <string name="selected">seleccionado</string>
+    <string name="shared_string_selected_lowercase">seleccionado</string>
     <string name="local_index_gpx_info_show">\n\nManteña premido para ver opcións</string>
 	<string name="gpx_info_subtracks">"Subpistas: %1$s "</string>
 	<string name="gpx_info_waypoints">"Puntos de pasaxe: %1$s "</string>
@@ -308,8 +308,8 @@
     <string name="keep_and_add_destination_point">Engadir como punto de destino</string>
     <string name="select_gpx">Seleccionar GPX…</string>
     <string name="route_descr_select_destination">Seleccionar destino</string>
-    <string name="route_descr_select_on_map">Seleccionar no mapa…</string>
-    <string name="route_descr_favorite">Favorito…</string>
+    <string name="shared_string_select_on_map">Seleccionar no mapa…</string>
+    <string name="shared_string_favorite">Favorito…</string>
     <string name="route_preferences">Preferencias da ruta</string>
     <string name="route_info">Información sobre a ruta</string>
     <string name="routing_attr_prefer_motorway_name">Preferir as autoestradas</string>
@@ -368,8 +368,8 @@
     <string name="animate_routing_gpx">Simular empregando pista GPX</string>
     <string name="remember_choice">Lembrar a miña escolla</string>
     <string name="gps_status_eclipsim">Estado do GPS</string>
-    <string name="default_and">e</string>
-    <string name="default_or">ou</string>
+    <string name="shared_string_and">e</string>
+    <string name="shared_string_or">ou</string>
 	<string name="route_is_too_long">O cálculo de rutas sen conexión de OsmAnd pode levar moito tempo (e ás veces non funcionar) para puntos que fiquen a máis de 200 km entre si. Habitualmente axuda engadir puntos de pasaxe intermedios.</string>
 	<string name="auto_zoom_none">Sen ampliación automática</string>
 	<string name="auto_zoom_close">A primeiro plano</string>
@@ -916,14 +916,14 @@
 	<string name="show_ruler_level">Mostrar a regra</string>	
 	<string name="info_button">Información</string>
 	<string name="back_to_location">Regresar á posición</string>
-	<string name="help">Axuda</string>
+	<string name="shared_string_help">Axuda</string>
 	<string name="show_details">Mostrar os detalles</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="accessibility_on">Activar</string>
-	<string name="accessibility_off">Desactivar</string>
+	<string name="shared_string_on">Activar</string>
+	<string name="shared_string_off">Desactivar</string>
 	<string name="accessibility_default">Segundo a opción global do sistema</string>
 	<string name="backToMenu">Regresar ao menú</string>
 	<string name="zoomOut">Afastar</string>
@@ -1227,7 +1227,7 @@
 	<string name="map_underlay">Mapa sometido</string>
 	<string name="map_underlay_descr">Escoller o mapa sometido</string>
 	<string name="layer_overlay">Mapa sobreposto…</string>
-	<string name="default_none">Ningún</string>
+	<string name="shared_string_none">Ningún</string>
 	<string name="map_overlay">Mapa sobreposto</string>
 	<string name="map_overlay_descr">Escoller o mapa sobreposto</string>
 	<string name="tile_source_already_installed">O mapa xa está instalado; vaise actualizar a configuración</string>
@@ -1255,8 +1255,8 @@
 	<string name="tip_app_mode_t_v2">"OsmAnd admite diferentes perfís (personalizábeis) do aplicativo para diferentes casos de uso.\n\nÉ posíbel cambiar os perfís co botón de perfís do recuncho inferior esquerdo da pantalla do mapa (icona do coche, a bicicleta ou o peón) ou ao crear un itinerario («modo de transporte»). "</string>
 	<string name="tip_map_context_menu">Menú «Empregar a situación»</string>
 	<string name="tip_map_context_menu_t">"O menú de contexto «Empregar a situación» contén todas as accións referidas a un punto (situación).\n\nEstá dispoñíbel mantendo premido calquera punto do mapa (e tocando a seguir o seu marcador) ou premendo no botón da trackball ou seleccionando «Menú» → «Empregar a situación» (estes dous últimos xeitos toman o centro do mapa como referencia).\n\nPódese agochar unha caixa de marcador de novo manténdoo premido. "</string>
-	<string name="next_button">Seguinte</string>
-	<string name="previous_button">Anterior</string>
+	<string name="shared_string_next">Seguinte</string>
+	<string name="shared_string_previous">Anterior</string>
 	<string name="unit_of_length_descr">Cambiar as unidades de distancia e de velocidade</string>
 	<string name="unit_of_length">Unidade de medida</string>
 	<string name="si_mi_foots">Millas/pés</string>
@@ -1299,7 +1299,7 @@
 	<string name="indexing_map">A indexar o mapa…</string>
 	<string name="indexing_poi">A indexar os PDI…</string>
 	<string name="indexing_transport">A indexar os transportes…</string>
-	<string name="input_output_error">Produciuse un erro de E/S</string>
+	<string name="shared_string_io_error">Produciuse un erro de E/S</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -1469,7 +1469,7 @@
 	<string name="transport_stops_to_pass">paraxes que pasar</string>
 	<string name="transport_route_distance">Distancia do itinerario</string>
 	<string name="transport">Transporte</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">Mostrar as paraxes de transporte público no mapa</string>
 	<string name="show_transport_over_map">Mostrar as paraxes de transporte</string>
 	<string name="hello">Aplicativo de transporte OsmAnd</string>
@@ -1486,7 +1486,7 @@
 	<string name="search_history_building">Edificio: {0}, {1}, {2}</string>
 	<string name="favorite">Favorito</string>
 	<string name="clear_all">Limpar todo</string>
-	<string name="history">Historial</string>
+	<string name="shared_string_history">Historial</string>
 	<string name="uploading_data">A actualizar os datos…</string>
 	<string name="uploading">A actualizar…</string>
 	<string name="search_nothing_found">Non se atopou nada</string>
@@ -1559,7 +1559,7 @@
 	<string name="map_preferences_descr">Indique a configuración do mapa: fonte do mapa, rotación, posición do marcador, orientación da pantalla</string>
 	<string name="osm_settings">Edición de OSM</string>
 	<string name="additional_settings">Opcións adicionais</string>
-	<string name="settings">Configuración</string>
+	<string name="shared_string_settings">Configuración</string>
 	<string name="update_tile">Actualizar o mapa</string>
 	<string name="reload_tile">Recargar a tesela</string>
 	<string name="mark_point">Destino</string>
@@ -1628,11 +1628,11 @@
 	<string name="context_menu_item_update_map">Actualizar o mapa</string>
 	<string name="context_menu_item_open_bug">Abrir un informe de fallos de OSM</string>
 	<string name="context_menu_item_create_poi">Crear un PDI</string>
-	<string name="default_buttons_yes">Si</string>
-	<string name="default_buttons_cancel">Cancelar</string>
+	<string name="shared_string_yes">Si</string>
+	<string name="shared_string_cancel">Cancelar</string>
 	<string name="default_buttons_apply">Aplicar</string>
 	<string name="default_buttons_add">Engadir</string>
-	<string name="default_buttons_no">Non</string>
+	<string name="shared_string_no">Non</string>
 	<string name="add_favorite_dialog_top_text">Introduza o nome do favorito</string>
 	<string name="add_favorite_dialog_default_favourite_name">Favorito</string>
 	<string name="add_favorite_dialog_favourite_added_template">O punto favorito «{0}» foi engadido correctamente.</string>
@@ -1712,7 +1712,7 @@
     <string name="download_tab_updates">Actualizacións</string>
     <string name="download_tab_local">Local</string>
 	<string name="no_internet_connection">Non é posíbel descargar. Conéctese a unha rede con wi-fi para proseguir.</string>
-    <string name="dismiss">Desbotar</string>
+    <string name="shared_string_dismiss">Desbotar</string>
     <string name="everything_up_to_date">Todos os ficheiros están actualizados</string>
     <string name="use_opengl_render">Empregar o renderizado con OpenGL</string>
     <string name="use_opengl_render_descr">Empregar renderizado con OpenGL acelerado co hardware (podería non funcionar nalgúns dispositivos)</string>
@@ -1730,7 +1730,7 @@
 	<string name="lock_screen_request_explanation">%1$s require este permiso para apagar a pantalla para a funcionalidade de aforro de enerxía.</string>
     <string name="wake_on_voice">Acender a pantalla</string>
     <string name="wake_on_voice_descr">Acender a pantalla do dispositivo ao aproximarse unha manobra</string>
-    <string name="wake_on_voice_never">Nunca</string>
+    <string name="shared_string_never">Nunca</string>
     <string name="select_impassable_road">Seleccionar no mapa…</string>
     <string name="impassable_road">Evitar estradas…</string>
     <string name="tip_recent_changes_1_9_t">"Cambios en 1.9: * Updated maps styles with road surface rendering, transport layers and hiking symbols * Search POI along the route * Mark road as impassable per session * Easier to download and update maps * Get visual and audio notification by approaching to waypoint * Print itinerary and turn information * Support of turn lanes * Support Android Wear * Lots UI changes * Separate zoom for Text Size on the map * Special audio notifications in case you are off the route * OsMo login functionality * Fix OsMo version incompatibilities "</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index df74bdf392..6e784cde65 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-	<string name="default_buttons_no">לא</string>
-	<string name="default_buttons_yes">כן</string>
+	<string name="shared_string_no">לא</string>
+	<string name="shared_string_yes">כן</string>
 	<string name="close_changeset">סגירת ערכת השינויים</string>
 	<string name="zxing_barcode_scanner_not_found">יישום סריקת הברקודים ZXing אינו מותקן. לחפש בחנות?</string>
 	<string name="rendering_attr_roadColors_description">בחירת ערכת צבעי דרך:</string>
@@ -262,14 +262,14 @@
 	<string name="show_ruler_level">הצגת סרגל</string>	
 	<string name="info_button">פרטים</string>
 	<string name="back_to_location">חזרה למיקום</string>
-	<string name="help">עזרה</string>
+	<string name="shared_string_help">עזרה</string>
 	<string name="show_details">הצגת פרטים</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_on">פעיל</string>
-	<string name="accessibility_off">כבוי</string>
+	<string name="shared_string_on">פעיל</string>
+	<string name="shared_string_off">כבוי</string>
 	<string name="accessibility_default">בהתאם להגדרות המערכת הכלליות</string>
 	<string name="backToMenu">חזרה לתפריט</string>
 	<string name="zoomOut">התרחקות</string>
@@ -568,7 +568,7 @@
 	<string name="map_underlay">מפה תחתונה</string>
 	<string name="map_underlay_descr">נא לבחור במפה תחתונה</string>
 	<string name="layer_overlay">מפה עליונה…</string>
-	<string name="default_none">ללא</string>
+	<string name="shared_string_none">ללא</string>
 	<string name="map_overlay">מפה עליונה</string>
 	<string name="map_overlay_descr">נא לבחור במפה עליונה</string>
 	<string name="tile_source_already_installed">המפה כבר מותקנת, ההגדרות יעודכנו</string>
@@ -612,8 +612,8 @@
 	<string name="tip_initial">עצות ותכסיסים</string>
 	<string name="tip_initial_t">"\tOsmAnd הנו יישום ניווט עם תכונות רבות.
 \n\tכצעד היכרות בסיסי, חלק מהעצות והתכסיסים לשימוש מקושרים למסך הראשי (לפריט לחצן ה־\'?\'). "</string>
-	<string name="next_button">הבא</string>
-	<string name="previous_button">הקודם</string>
+	<string name="shared_string_next">הבא</string>
+	<string name="shared_string_previous">הקודם</string>
 	<string name="unit_of_length_descr">שינוי יחידות האורך והמהירות</string>
 	<string name="unit_of_length">יחידת המידה</string>
 	<string name="si_mi_foots">מיילים/רגל</string>
@@ -656,7 +656,7 @@
 	<string name="indexing_map">המפה נשמרת באינדקס…</string>
 	<string name="indexing_poi">נ״ע נשמרת באינדקס…</string>
 	<string name="indexing_transport">התחבורה נשמרת באינדקס…</string>
-	<string name="input_output_error">התרחשה שגיאת קלט/פלט</string>
+	<string name="shared_string_io_error">התרחשה שגיאת קלט/פלט</string>
 	<string name="km">ק״מ</string>
 	<string name="km_h">קמ״ש</string>
 	<string name="m">מ׳</string>
@@ -788,7 +788,7 @@
 	<string name="transport_stops_to_pass">תחנות לעבור</string>
 	<string name="transport_route_distance">מרחק המסלול</string>
 	<string name="transport">תחבורה</string>
-	<string name="default_buttons_ok">אישור</string>
+	<string name="shared_string_ok">אישור</string>
 	<string name="show_transport_over_map_description">הצגת תחנות תחבורה ציבורית במפה</string>
 	<string name="show_transport_over_map">הצגת תחנות תחבורה</string>
 	<string name="hello">יישום הניווט OsmAnd</string>
@@ -857,7 +857,7 @@
 	<string name="search_history_building">בניין: {0}, {1}, {2}</string>
 	<string name="favorite">מועדף</string>
 	<string name="clear_all">לנקות הכול</string>
-	<string name="history">היסטוריה</string>
+	<string name="shared_string_history">היסטוריה</string>
 	<string name="uploading_data">הנתונים נשלחים…</string>
 	<string name="uploading">מתבצעת העלאה…</string>
 	<string name="search_nothing_found">לא נמצא דבר</string>
@@ -934,7 +934,7 @@
 	<string name="map_preferences_descr">נא לציין הגדרות מפה: מקור המפה, אופן סיבוב, מיקום הסמן, כיוון המסך</string>
 	<string name="osm_settings">עריכה ב־OSM</string>
 	<string name="additional_settings">הגדרות נוספות</string>
-	<string name="settings">הגדרות</string>
+	<string name="shared_string_settings">הגדרות</string>
 	<string name="save_current_track_descr">שמירת הדרך הנוכחית לכרטיס ה־SD כעת</string>
 	<string name="save_current_track">שמירת דרך ה־GPX הנוכחית</string>
 	<string name="save_track_interval">מרווח בין השמירות ליומן</string>
@@ -1011,7 +1011,7 @@
 	<string name="context_menu_item_update_map">עדכון המפה</string>
 	<string name="context_menu_item_open_bug">פתיחת תקלה ב־OSM</string>
 	<string name="context_menu_item_create_poi">יצירת נ״ע</string>
-	<string name="default_buttons_cancel">ביטול</string>
+	<string name="shared_string_cancel">ביטול</string>
 	<string name="default_buttons_apply">החלה</string>
 	<string name="default_buttons_add">הוספה</string>
 	<string name="add_favorite_dialog_top_text">נא להזין שם למועדף</string>
diff --git a/OsmAnd/res/values-hi/strings.xml b/OsmAnd/res/values-hi/strings.xml
index b75f08b37b..0d34930039 100644
--- a/OsmAnd/res/values-hi/strings.xml
+++ b/OsmAnd/res/values-hi/strings.xml
@@ -7,8 +7,8 @@
          If you are making/correcting english translations make sure :
          1. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     -->
-<string name="default_buttons_no">नही</string>
-	<string name="default_buttons_yes">हा</string>
+<string name="shared_string_no">नही</string>
+	<string name="shared_string_yes">हा</string>
 	<string name="prefer_motorways">बडी सड़को को प्राधान्य दो</string>
 	<string name="prefer_in_routing_title">प्राधान्य…</string>
 	</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hr/strings.xml b/OsmAnd/res/values-hr/strings.xml
index eabae9f9af..e7d751d175 100644
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@@ -193,11 +193,11 @@
 	<string name="plugins_screen">Dodaci</string>
 	<string name="prefs_plugins">Dodaci</string>
 	<string name="send_files_to_osm">Poslati GPX datoteke na OSM?</string>
-	<string name="help">Pomoć</string>
+	<string name="shared_string_help">Pomoć</string>
 	<string name="back_to_location">Natrag na poziciju</string>
 	<string name="show_details">Prikaži detalje</string>
-	<string name="accessibility_on">Uključeno</string>
-	<string name="accessibility_off">Isključeno</string>
+	<string name="shared_string_on">Uključeno</string>
+	<string name="shared_string_off">Isključeno</string>
 	<string name="backToMenu">Povratak na izbornik</string>
 	<string name="zoomOut">Udalji</string>
 	<string name="zoomIn">Približi</string>
@@ -300,12 +300,12 @@
 	<string name="osb_comment_menu_item">Dodaj komentar</string>
 	<string name="favourites_context_menu_edit">Uredi favorite</string>
 	<string name="favourites_context_menu_delete">Brisanje favorita</string>
-	<string name="default_buttons_cancel">Zatvori</string>
+	<string name="shared_string_cancel">Zatvori</string>
 	<string name="default_buttons_apply">Primijeni</string>
 	<string name="default_buttons_add">Dodaj</string>
-	<string name="default_buttons_no">Ne</string>
+	<string name="shared_string_no">Ne</string>
 	<string name="add_favorite_dialog_top_text">Unesite naziv favorita</string>
-	<string name="default_buttons_yes">Da</string>
+	<string name="shared_string_yes">Da</string>
 	<string name="context_menu_item_add_favorite">Dodaj u favorite</string>
 	<string name="context_menu_item_create_poi">Stvori POI</string>
 	<string name="context_menu_item_update_map">Ažuriraj karte</string>
@@ -358,7 +358,7 @@
 	<string name="save_current_track">Spremi trenutni GPX</string>
 	<string name="additional_settings">Dodatne postavke</string>
 	<string name="save_current_track_descr">Spremi trenutnu stazu na memorijsku karticu</string>
-	<string name="settings">Postavke</string>
+	<string name="shared_string_settings">Postavke</string>
 	<string name="data_settings">Podaci</string>
 	<string name="use_online_routing_descr">Koristi internet za izračun rute</string>
 	<string name="use_online_routing">Koristi online navigaciju</string>
@@ -413,7 +413,7 @@
 	<string name="searching_address">Tražim adresu…</string>
 	<string name="hint_search_online">Kućni broj, ulica, grad</string>
 	<string name="clear_all">Izbriši sve</string>
-	<string name="history">Povijest</string>
+	<string name="shared_string_history">Povijest</string>
 	<string name="favorite">Favoriti</string>
 	<string name="search_history_city">Grad: {0}</string>
 	<string name="search_history_street">Ulica: {0}, {1}</string>
@@ -520,7 +520,7 @@
 	<string name="indexing_map">Indeksiranje karte…</string>
 	<string name="indexing_poi">Indeksiranje POI…</string>
 	<string name="indexing_transport">Indeksiranje prijevoza…</string>
-	<string name="input_output_error">I/O pogreška</string>
+	<string name="shared_string_io_error">I/O pogreška</string>
 	<string name="indexing_address">Indeksiranje adresa…</string>
 	<string name="amenity_type_barrier">Barijera</string>
 	<string name="amenity_type_education">Obrazovanje</string>
@@ -547,8 +547,8 @@
 	<string name="si_mi_yard">Milje/jardi</string>
 	<string name="si_km_m">Kilometri/metri</string>
 	<string name="unit_of_length_descr">Promjenite jedinice duljine i brzine</string>
-	<string name="next_button">Sljedeće</string>
-	<string name="previous_button">Prethodno</string>
+	<string name="shared_string_next">Sljedeće</string>
+	<string name="shared_string_previous">Prethodno</string>
 	<string name="tip_map_switch">Izaberite izvor karte</string>
 	<string name="preferred_locale_descr">Odaberite jezik prikaza</string>
 	<string name="preferred_locale">Prikaz jezika</string>
@@ -627,7 +627,7 @@
 	<string name="transport_stops_to_pass">stanice do izlaza</string>
 	<string name="transport_route_distance">Udaljenost rute</string>
 	<string name="transport">Prijevoz</string>
-	<string name="default_buttons_ok">U redu</string>
+	<string name="shared_string_ok">U redu</string>
 	<string name="hello">Navigacijska aplikacija OsmAnd</string>
 	<string name="update_poi_success">POI podaci su uspješno ažurirani ({0} su učitani)</string>
 	<string name="update_poi_error_local">Pogreška pri ažuriranju lokalnog POI popisa</string>
@@ -731,7 +731,7 @@
 	<string name="select_tile_source_to_install">Odaberite karte za instalirati ili ažurirati</string>
 	<string name="map_overlay_descr">Odaberite slojnu kartu</string>
 	<string name="map_overlay">Karta sloja</string>
-	<string name="default_none">Bez</string>
+	<string name="shared_string_none">Bez</string>
 	<string name="layer_overlay">Karta sloja…</string>
 	<string name="layer_underlay">Temeljna karta…</string>
 	<string name="map_underlay">Temeljna karta</string>
@@ -954,8 +954,8 @@
     <string name="animate_routing_gpx">Simulacija pomoću GPX zapisa</string>
     <string name="remember_choice">Zapamti moj izbor</string>
     <string name="gps_status_eclipsim">Status GPS signala</string>
-    <string name="default_and">i</string>
-    <string name="default_or">ili</string>
+    <string name="shared_string_and">i</string>
+    <string name="shared_string_or">ili</string>
 	<string name="base_world_map">Osnovna karta svijeta</string>
 	<string name="about_version">Inačica :</string>
     <string name="about_settings_descr">Podaci o inačici, licence, članovi projekta</string>
@@ -1172,7 +1172,7 @@
     <string name="keep_and_add_destination_point">Dodaj kao odredišnu točku</string>
     <string name="select_gpx">Odaberite GPX …</string>
     <string name="route_descr_select_destination">Odaberite Odredište</string>
-    <string name="route_descr_select_on_map">Odaberite na karti …</string>
+    <string name="shared_string_select_on_map">Odaberite na karti …</string>
     <string name="more">Više…</string>
     <string name="rendering_value_car_name">Auto</string>
     <string name="rendering_value_bicycle_name">Bicikl</string>
@@ -1228,7 +1228,7 @@
     <string name="map_widget_plain_time">Trenutno vrijeme</string>
     <string name="selected_gpx_info_show">\n\nPritisnite i držite za prikaz na karti</string>
     <string name="delay_navigation_start">Započni turn-by-turn navođenje automatski</string>
-    <string name="selected">odabrano</string>
+    <string name="shared_string_selected_lowercase">odabrano</string>
     <string name="gpx_info_distance">"Udaljenost: %1$s (%2$s points) "</string>
 	<string name="gpx_info_start_time">"Vrijeme Početka: %1$tF, %1$tT "</string>
 	<string name="gpx_info_average_speed">"Prosječna brzina: %1$s "</string>
@@ -1297,7 +1297,7 @@
 	<string name="rendering_attr_tramTrainRoutes_name">Tramvajske i željezničke rute</string>
 	<string name="wake_on_voice">Uključi ekran</string>
     <string name="wake_on_voice_descr">Uključiti zaslon telefona kada se približavate skretanju</string>
-    <string name="wake_on_voice_never">Nikad</string>
+    <string name="shared_string_never">Nikad</string>
     <string name="select_impassable_road">Označi na karti</string>
     <string name="impassable_road">Izbjegavaj ceste…</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Željezničke rute</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 680bfa8319..547410ce50 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -15,14 +15,14 @@
   <string name="show_ruler_level">Lépték megjelenítése</string>
   <string name="info_button">Információ</string>
   <string name="back_to_location">Vissza a pozícióra</string>
-  <string name="help">Segítség</string>
+  <string name="shared_string_help">Segítség</string>
   <string name="show_details">Részletek megjelenítése</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="accessibility_on">Bekapcsol</string>
-  <string name="accessibility_off">Kikapcsol</string>
+  <string name="shared_string_on">Bekapcsol</string>
+  <string name="shared_string_off">Kikapcsol</string>
   <string name="accessibility_default">Rendszerbeállítás szerint</string>
   <string name="backToMenu">Vissza a menübe</string>
   <string name="zoomOut">Kicsinyít</string>
@@ -304,7 +304,7 @@
   <string name="map_underlay">Alátét térkép</string>
   <string name="map_underlay_descr">Alátét térkép kiválasztás</string>
   <string name="layer_overlay">Rátét térkép…</string>
-  <string name="default_none">Nincs</string>
+  <string name="shared_string_none">Nincs</string>
   <string name="map_overlay">Rátét térkép</string>
   <string name="map_overlay_descr">Rátét térkép kiválasztás</string>
   <string name="tile_source_already_installed">A térkép már telepítve van, a beállítások frissítésre kerülnek</string>
@@ -364,8 +364,8 @@
   <string name="tip_initial">Súgó</string>
   <string name="tip_initial_t">"Az OsmAnd navigációs alkalmazás sok lehetőséggel rendelkezik.
 \n\nEgy gyors bemutatót és hasznos tippeket találsz a térkép képernyő \'menü\' → \'Súgó\' gombjára kattintva. "</string>
-  <string name="next_button">Következő</string>
-  <string name="previous_button">Előző</string>
+  <string name="shared_string_next">Következő</string>
+  <string name="shared_string_previous">Előző</string>
   <string name="unit_of_length_descr">Hosszúság és sebesség mértékegységének megváltoztatása</string>
   <string name="unit_of_length">Hosszmértékegység</string>
   <string name="si_mi_foots">Mérföld/láb</string>
@@ -408,7 +408,7 @@
   <string name="indexing_map">Térkép indexelése…</string>
   <string name="indexing_poi">POI-k indexelése…</string>
   <string name="indexing_transport">Közlekedési eszközök indexelése…</string>
-  <string name="input_output_error">Be-kimeneti hiba történt</string>
+  <string name="shared_string_io_error">Be-kimeneti hiba történt</string>
   <string name="km">km</string>
   <string name="km_h">km/ó</string>
   <string name="m">m</string>
@@ -588,7 +588,7 @@
   <string name="transport_stops_to_pass">ennyi megálló:</string>
   <string name="transport_route_distance">Útvonal távolsága</string>
   <string name="transport">Közlekedés</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Tömegközlekedési megállok megjelenítése a térképen</string>
   <string name="show_transport_over_map">Tömegközlekedési megállok megjelenítése</string>
   <string name="hello">OsmAnd navigációs alkalmazás</string>
@@ -605,7 +605,7 @@
   <string name="search_history_building">Épület: {0}, {1}, {2}</string>
   <string name="favorite">Kedvenc</string>
   <string name="clear_all">Mindent töröl</string>
-  <string name="history">Előzmények</string>
+  <string name="shared_string_history">Előzmények</string>
   <string name="uploading_data">Adat feltöltése…</string>
   <string name="uploading">Feltöltés…</string>
   <string name="search_nothing_found">Semmi sem található</string>
@@ -683,7 +683,7 @@
   <string name="auto_zoom_map_descr">Térkép automatikus nagyítása a sebesség függvényében</string>
   <string name="auto_zoom_map">Automatikus nagyítás</string>
   <string name="additional_settings">További beállítások</string>
-  <string name="settings">Beállítások</string>
+  <string name="shared_string_settings">Beállítások</string>
   <string name="save_current_track_descr">Jelenlegi útvonal SD kártyára mentése</string>
   <string name="save_current_track">Jelenlegi útvonal mentése</string>
   <string name="save_track_interval_descr">Válassz naplózási időközt a navigáció alatti útvonalrögzítéshez</string>
@@ -763,11 +763,11 @@
   <string name="context_menu_item_update_map">Térkép frissítése</string>
   <string name="context_menu_item_open_bug">OSM Bug nyitása</string>
   <string name="context_menu_item_create_poi">POI készítés</string>
-  <string name="default_buttons_yes">Igen</string>
-  <string name="default_buttons_cancel">Mégse</string>
+  <string name="shared_string_yes">Igen</string>
+  <string name="shared_string_cancel">Mégse</string>
   <string name="default_buttons_apply">Alkalmaz</string>
   <string name="default_buttons_add">Hozzáad</string>
-  <string name="default_buttons_no">Nem</string>
+  <string name="shared_string_no">Nem</string>
   <string name="add_favorite_dialog_top_text">Kedvenc neve</string>
   <string name="add_favorite_dialog_default_favourite_name">Kedvenc</string>
   <string name="add_favorite_dialog_favourite_added_template">Kedvenc pont: \'\'{0}\'\' sikeresen hozzáadva.</string>
@@ -1349,8 +1349,8 @@
     <string name="animate_routing_gpx">Szimuláció GPX nyomvonalon</string>
     <string name="remember_choice">Emlékezz a választásomra</string>
     <string name="gps_status_eclipsim">GPS Státusz</string>
-    <string name="default_and">és</string>
-    <string name="default_or">vagy</string>
+    <string name="shared_string_and">és</string>
+    <string name="shared_string_or">vagy</string>
 	<string name="amenity_type_seamark">Hajózási jelzés</string>
     <string name="app_modes_choose_descr">Milyen felhasználási módok jelenjenek meg az alkalmazásban</string>
     <string name="app_modes_choose">Felhasználási módok</string>
@@ -1374,8 +1374,8 @@
     <string name="keep_and_add_destination_point">Hozzáadás a célpontokhoz</string>
     <string name="select_gpx">GPX kiválasztása…</string>
     <string name="route_descr_select_destination">Válassz célpontot!</string>
-    <string name="route_descr_select_on_map">Kiválasztás a térképen…</string>
-    <string name="route_descr_favorite">Kedvenc…</string>
+    <string name="shared_string_select_on_map">Kiválasztás a térképen…</string>
+    <string name="shared_string_favorite">Kedvenc…</string>
     <string name="route_preferences">Útvonal beállítások</string>
     <string name="route_info">Útvonal információ</string>
     <string name="routing_attr_prefer_motorway_name">Autópályák preferálása</string>
@@ -1520,7 +1520,7 @@
     <string name="gpx_wpt">Útpont</string>
     <string name="selected_gpx_info_show">\n\nTérképen megtekintéshez nyomd meg hosszan</string>
     <string name="delay_navigation_start">Navigáció indítása automatikusan</string>
-    <string name="selected">kiválasztott</string>
+    <string name="shared_string_selected_lowercase">kiválasztott</string>
     <string name="gpx_split_interval">Felosztási intervallum</string>
     <string name="gpx_info_subtracks">Résznyomvonalak: %1$s </string>
 	<string name="gpx_info_waypoints">Útpontok: %1$s </string>
@@ -1770,7 +1770,7 @@
     <string name="osmand_extended_description_4000_chars">" Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (internetkapcsolat nélkül) is.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (plugin telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán &amp; Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea,  Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság "</string>
 	<string name="osmand_plus_extended_description_4000_chars">" Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (Internetkapcsolat nélkül) is.\n\nAz OsmAnd+ az alkalmazás fizetős változata. A megvételével támogatod a projektet, megalapozod új funkciók fejlesztését, és megkapod a legújabb frissítéseket. Ha vársárlás előtt kipróbálnád az alkalmazást, telepítsd az OsmAndot.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (bővítmény telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán &amp; Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea,  Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság "</string>
 	<string name="lock_screen_request_explanation">Az %1$s számára engedély szükséges a képernyő kikapcsolásához energiatakarékossági célból.</string>
-    <string name="wake_on_voice_never">Soha</string>
+    <string name="shared_string_never">Soha</string>
     <string name="error_avoid_specific_road">Nem található kerülőút</string>
     <string name="home_button">Kezdőlap</string>
     <string name="osmo_use_https_descr">Biztonságos kapcsolat használata a kiszolgálóval</string>
@@ -1792,7 +1792,7 @@
     <string name="download_tab_downloads">Minden elérhető</string>
     <string name="download_tab_local">Helyi</string>
 	<string name="no_internet_connection">A letöltés nem lehetséges, ellenőrizze az internet-kapcsolatát.</string>
-    <string name="dismiss">Elutasít</string>
+    <string name="shared_string_dismiss">Elutasít</string>
     <string name="everything_up_to_date">Minden fájl naprakész</string>
     <string name="use_opengl_render">OpenGL renderelő használata</string>
     <string name="use_opengl_render_descr">Hardveresen gyorsított OpenGL renderelő (néhány eszközön nem működik)</string>
@@ -1832,15 +1832,15 @@
 	<string name="proxy_host_descr">Állítsd be a proxy szervered hosztnevét (pl. 127.0.0.1)</string>
 	<string name="proxy_port_title">Proxy port</string>
 	<string name="proxy_port_descr">Állítsd be a proxy szervered portszámát (pl. 8118)</string>
-	<string name="enable_plugin">Letiltva</string>
-	<string name="disable_plugin">Engedélyezve</string>
+	<string name="shared_string_disabled">Letiltva</string>
+	<string name="shared_string_enabled">Engedélyezve</string>
 	<string name="plugin_description_title">Leírás</string>
 	<string name="plugin_settings_button_caption">Beállítások</string>
 <string name="edit_group">Csoport szerkesztése</string>
     <string name="remove_the_tag">CÍMKE ELTÁVOLÍTÁSA</string>
     <string name="version_settings_descr">Napi összeállítások letöltése</string>
-    <string name="enable_plugin2">Engedélyezés</string>
-	<string name="disable_plugin2">Letiltás</string>
+    <string name="shared_string_enable">Engedélyezés</string>
+	<string name="shared_string_disable">Letiltás</string>
 	<string name="plugin_install_needs_network">Internetkapcsolat szükséges a bővítmény telepítéséhez.</string>
 	<string name="get_plugin">Beszerzés</string>
 <string name="version_settings">Összeállítások</string>
@@ -1866,11 +1866,12 @@
 
 	<string name="track_segments">Nyomvonal szakaszok</string>
 	<string name="track_points">Nyomvonal pontok</string>
-	<string name="selected_tracks">Kijelölve</string>
+	<string name="shared_string_selected">Kijelölve</string>
 	<string name="turn_off_all">Összes kikapcsolása</string>
 	<string name="showed_on_map">Megjelenítve a térképen</string>
 	<string name="rename_failed">Az átnevezés nem sikerült.</string>
 	<string name="currently_recording_track">Jelenleg rögzített nyomvonal</string>
 	<string name="back_to_map">Vissza a térképhez</string>
 	<string name="location_on_map">Helyzet:\n Szélesség %1$s\n Hosszúság %2$s</string>
+	<string name="route_points">Útvonal pontok</string>
 	</resources>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index de840c5777..6e58d98ef3 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -126,8 +126,8 @@
     <string name="local_index_tile_data_downloadable">Բեռնվող: %1$s</string>
     <string name="select_gpx">Ընտրել GPX …</string>
     <string name="route_descr_select_destination">Ընտրել Նպատակակետը</string>
-    <string name="route_descr_select_on_map">Ընտրել քարտեզի վրա …</string>
-    <string name="route_descr_favorite">Նախընտրելի …</string>
+    <string name="shared_string_select_on_map">Ընտրել քարտեզի վրա …</string>
+    <string name="shared_string_favorite">Նախընտրելի …</string>
     <string name="routing_attr_short_way_name">Կարճ ճանապարհ</string>
 	<string name="routing_attr_short_way_description">Օգտագործել կարճ ճանապարհը</string>
 	<string name="routing_attr_avoid_toll_name">Խուսափել վճարովի ճանապարհները</string>
@@ -147,6 +147,6 @@
 	<string name="routing_attr_weight_name">Կշիռ</string>
 	<string name="routing_attr_weight_description">Կշռի սահմանափակման նշում</string>
     <string name="osmand_distance_planning_plugin_description">Ստեղծել ուղիներ (կամ օգտագործել/փոփոխել առկա GPX ֆայլերը) կետեռի միջև հեռավորության չափման համար։ Պահպանել որպես GPX, որը կարող է օգտագործվել GPX ուղիների պլանավորման համար։</string>
-    <string name="default_buttons_no">Ոչ</string>
-	<string name="default_buttons_yes">Այո</string>
+    <string name="shared_string_no">Ոչ</string>
+	<string name="shared_string_yes">Այո</string>
 	</resources>
diff --git a/OsmAnd/res/values-id/strings.xml b/OsmAnd/res/values-id/strings.xml
index 781dca59eb..4bb1e93adf 100644
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@@ -63,6 +63,6 @@
     <string name="about_settings_descr">Info versi, lisensi, anggota</string>
     <string name="tips_and_tricks">Tip</string>
     <string name="local_index_tile_data_downloadable">Dapat di download: %1$s</string>
-    <string name="default_buttons_no">No</string>
-	<string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_no">No</string>
+	<string name="shared_string_yes">Yes</string>
 	</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index e54c95e841..b1c3b39a67 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
   <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
   <string name="offline_edition">Modifiche offline</string>
@@ -180,7 +180,7 @@
   
   
   
-  <string name="local_index_installed">Edizione</string>
+  <string name="local_index_installed">Versione locale</string>
   <string name="local_index_items_backuped">%1$d su %2$d oggetto/i disattivati correttamente.</string>
   <string name="local_index_items_deleted">%1$d su %2$d oggetto/i eliminato/i correttamente.</string>
   <string name="local_index_items_restored">%1$d su %2$d oggetto/i ripristinato/i.</string>
@@ -247,7 +247,6 @@
   <string name="map_underlay">Mappa di sfondo</string>
   <string name="map_underlay_descr">Scegli la mappa di sfondo</string>
   <string name="layer_overlay">Mappa sovrapposta…</string>
-  <string name="default_none">Nessuno</string>
   <string name="map_overlay">Mappa sovrapposta</string>
   <string name="map_overlay_descr">Scegli la mappa sovrapposta</string>
   <string name="tile_source_already_installed">La mappa è già installata, le impostazioni verranno aggiornate</string>
@@ -303,8 +302,6 @@
 	</string>
   <string name="tip_initial">Aiuto</string>
   <string name="tip_initial_t">"OsmAnd è un\'applicazione di navigazione con molte funzioni.\n\nUn\'introduzione basilare, alcuni suggerimenti per l\'uso sono raggiungibili attraverso \'Menù\' → \'Suggerimenti\' a partire dalla schermata della mappa. "</string>
-  <string name="next_button">Avanti</string>
-  <string name="previous_button">Indietro</string>
   <string name="unit_of_length_descr">Cambia le unità di misura per lunghezza e velocità</string>
   <string name="unit_of_length">Unità di misura</string>
   <string name="si_mi_foots">Miglia/piede</string>
@@ -347,7 +344,6 @@
   <string name="indexing_map">Indicizzazione mappa…</string>
   <string name="indexing_poi">Indicizzazione PDI…</string>
   <string name="indexing_transport">Indicizzazione trasporti pubblici…</string>
-  <string name="input_output_error">Errore di I/O</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -530,7 +526,6 @@
   <string name="transport_stops_to_pass">fermate da passare</string>
   <string name="transport_route_distance">Distanza itinerario</string>
   <string name="transport">Trasporto pubblico</string>
-  <string name="default_buttons_ok">OK</string>
   <string name="show_transport_over_map_description">Visualizza le fermate di trasporto pubblico sulla mappa</string>
   <string name="show_transport_over_map">Visualizza le fermate del trasporto pubblico</string>
   <string name="hello">Applicazione di navigazione OsmAnd</string>
@@ -547,7 +542,6 @@
   <string name="search_history_building">Edifici: {0}, {1}, {2}</string>
   <string name="favorite">Preferito</string>
   <string name="clear_all">Azzera tutto</string>
-  <string name="history">Cronologia</string>
   <string name="uploading_data">Invio dati…</string>
   <string name="uploading">Invio…</string>
   <string name="search_nothing_found">Trovato nulla</string>
@@ -625,7 +619,6 @@
   <string name="auto_zoom_map_descr">Zoom mappa automatico in base alla velocità (fintanto che la mappa è sincronizzata con la posizione corrente)</string>
   <string name="auto_zoom_map">Zoom automatico mappa</string>
   <string name="additional_settings">Impostazioni aggiuntive</string>
-  <string name="settings">Impostazioni</string>
   <string name="save_current_track_descr">Salva adesso la traccia corrente nella scheda SD</string>
   <string name="save_current_track">Salva la traccia corrente</string>
   <string name="save_track_interval_descr">Scegli l\'intervallo di registrazione per la traccia durante la navigazione</string>
@@ -705,11 +698,8 @@
   <string name="context_menu_item_update_map">Aggiorna la mappa</string>
   <string name="context_menu_item_open_bug">Segnala un errore OSM</string>
   <string name="context_menu_item_create_poi">Crea PDI</string>
-  <string name="default_buttons_yes">Si</string>
-  <string name="default_buttons_cancel">Annulla</string>
   <string name="default_buttons_apply">Applica</string>
   <string name="default_buttons_add">Aggiungi</string>
-  <string name="default_buttons_no">No</string>
   <string name="add_favorite_dialog_top_text">Inserisci il nome del preferito</string>
   <string name="add_favorite_dialog_default_favourite_name">Preferito</string>
   <string name="add_favorite_dialog_favourite_added_template">Il punto preferito \'\'{0}\'\' è stato aggiunto.</string>
@@ -821,14 +811,11 @@
   <string name="show_ruler_level">Visualizza la scala grafica</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Torna alla posizione</string>
-  <string name="help">Aiuto</string>
   <string name="show_details">Visualizza dettagli</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_on">Attivato</string>
-  <string name="accessibility_off">Disattivato</string>
   <string name="accessibility_default">Basata sulle impostazioni globali di sistema</string>
   <string name="backToMenu">Torna al menu</string>
   <string name="zoomOut">Zoom indietro</string>
@@ -1174,7 +1161,7 @@
 <string name="audionotes_location_not_defined">La posizione da associare con la nota non è ancora definita. \"Usa posizione ...\" per assegnare una nota alla posizione specificata</string>
     <string name="monitoring_control_stop">Ferma</string>
     <string name="osmand_srtm_short_description_80_chars">Plugin Osmand per le curve di livello offline</string>
-    <string name="osmand_srtm_long_description_1000_chars">Questo plugin fornisce le linee di livello che possono essere visualizzate nelle mappe offline di OsmAnd. I dati globali (fra i 70 gradi nord e 70 gradi sud) sono basati su misurazioni del SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), uno strumento misuratore di terra a bordo, il satellite della NASA del sistema di osservazione della terra. ASTER è uno sforzo di cooperazione tra NASA, il Ministero dell\'Economia del Giappone, Commercio e Industria (METI) e sistema spaziale giapponese (J-spacesystems).</string>
+    <string name="osmand_srtm_long_description_1000_chars">"Questo plugin fornisce sia le linee di livello che lo strado ombreggiamento dei rilievi che possono essere visualizzate nelle mappe offline di OsmAnd. Questa funzionalità sarà molto apprezzata dagli atleti, dagli escursionisti, e tutti coloro che sono interessati all\'orografia e al paesaggio.\n\nI dati globali (fra i 70 gradi nord e 70 gradi sud) sono basati su misurazioni del SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), uno strumento misuratore di terra a bordo, il satellite della NASA del sistema di osservazione della terra. ASTER è uno sforzo di cooperazione tra NASA, il Ministero dell\'Economia del Giappone, Commercio e Industria (METI) e sistema spaziale giapponese (J-spacesystems). "</string>
     
     
     <string name="map_widget_distancemeasurement">Misurazione della distanza</string>
@@ -1583,8 +1570,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="auto_zoom_close">A corto raggio</string>
     <string name="auto_zoom_far">A medio raggio</string>
     <string name="auto_zoom_farthest">A lungo raggio</string>
-    <string name="default_and">e</string>
-    <string name="default_or">o</string>
 	<string name="remember_choice">Ricorda la scelta</string>
     <string name="gps_status_eclipsim">Stato GPS</string>
     <string name="animate_routing_route_not_calculated">Per favore, calcolare il percorso prima</string>
@@ -1638,8 +1623,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="routing_attr_weight_description">Specifica il peso del veicolo consentito sulle strade</string>
     <string name="select_gpx">Scegli GPX…</string>
     <string name="route_descr_select_destination">Scegli la destinazione</string>
-    <string name="route_descr_select_on_map">Scegli sulla mappa…</string>
-    <string name="route_descr_favorite">Preferito…</string>
     <string name="route_preferences">Preferenze di percorso</string>
     <string name="route_info">Informazioni sul percorso</string>
     <string name="keep_and_add_destination_point">Aggiungi come destinazione</string>
@@ -1840,7 +1823,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="gpx_selection_points">%1$s \nPunti</string>
     <string name="gpx_selection_track">%1$s \nTraccia %2$s</string>
     <string name="gpx_available_current_track">Traccia attualmente in registrazione</string>
-    <string name="selected">selezionato</string>
     <string name="gpx_split_interval">Intervallo suddivisione</string>
     <string name="loading_smth">Caricamento di %1$s…</string>
     <string name="gpx_wpt">Tappa</string>
@@ -1943,7 +1925,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="speak_poi">Annuncia PDI nelle vicinanze</string>
     <string name="index_tours">Itinerari</string>
     <string name="flat_list_waypoints">Tutto</string>
-    <string name="record_plugin_description">Attiva la funzionalità di registrazione delle tue tracce con il pulsante dedicato nello schermo della mappa e visualizza le impostazioni per la registrazione dei vostri viaggi in file GPX localmente o online utilizzando un servizio web.</string>
+    <string name="record_plugin_description">"Questo componente aggiuntivo attiva la funzionalità di registrazione delle tue tracce o manualmente attraverso il pulsante dedicato nello schermo della mappa oppure automaticamente tenendo traccia di tutti i tuoi spostamenti in un file GPX.\n\nLe tracce registrate possono essere condivise con i tuoi amici o essere usate per chi contribuire a OSM. Gli alteti possono utilizzate le tracce registrate per monitorare i loro allenamenti. Alcuni analisi di base possono essere fatte direttamente in OsmAnd, come il tempo sul giro, la velocità media ecc., le tracce naturalmente possono essere in seguito analizzate con strumenti di analisi esterni. "</string>
     <string name="record_plugin_name">Registrazione viaggio</string>
     <string name="int_hour">h</string>
     <string name="duration">Durata</string>
@@ -2001,7 +1983,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="rendering_category_hide">Nascondi</string>
     <string name="wake_on_voice">Accendi lo schermo</string>
     <string name="wake_on_voice_descr">Accendi lo schermo (se spento) all\'approssimarsi di una svolta</string>
-    <string name="wake_on_voice_never">Mai</string>
     <string name="lock_screen_request_explanation">%1$s necessita di questa autorizzazione per spegnere lo schermo per la funzionalità di risparmio energetico.</string>
     <string name="advanced_settings">Avanzato</string>
 	<string name="osmo_use_https">Usa HTTPS</string>
@@ -2016,7 +1997,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="use_opengl_render">Utilizzare il rendering OpenGL</string>
     <string name="use_opengl_render_descr">Utilizzare il rendering OpenGL accelerato via hardware (potrebbe non funzionare in alcuni dispositivi)</string>
     <string name="everything_up_to_date">Tutti i file sono aggiornati</string>
-    <string name="dismiss">Tralascia</string>
     <string name="no_internet_connection">Non è possibile scaricare. Prego, verifica la connessione a internet.</string>
     <string name="download_tab_downloads">Tutti i download</string>
     <string name="download_tab_updates">Aggiornabili</string>
@@ -2067,14 +2047,10 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="gps_status">Stato GPS</string>
     <string name="parking_place">Parcheggio</string>
     <string name="remove_the_tag">RIMUOVI IL TAG</string>
-    <string name="enable_plugin">Disattivato</string>
-	<string name="disable_plugin">Attivato</string>
 <string name="plugin_description_title">Descrizione</string>
 	<string name="plugin_settings_button_caption">Impostazioni</string>
 <string name="edit_group">Modifica il gruppo</string>
     <string name="plugin_install_needs_network">Per installare questo componente aggiuntivo è necessaria la connessione a internet.</string>
-<string name="enable_plugin2">Attiva</string>
-	<string name="disable_plugin2">Disattiva</string>
 	<string name="get_plugin">Ottieni</string>
 <string name="plugin_ski_name">Viuslizzazione mappa sci</string>
     <string name="plugin_nautical_name">Visualizzazione mappa nautica</string>
@@ -2116,7 +2092,78 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="showed_on_map">Visualizzato sulla mappa</string>
 	<string name="days_behind">giorni fa</string>
 	<string name="currently_recording_track">Traccia attualmente in registrazione</string>
-<string name="selected_tracks">Selezionato</string>
 	<string name="track_segments">Spezzoni di traccia</string>
 	<string name="track_points">Punti della traccia</string>
+	<string name="route_points">Punti del percorso</string>
+	<string name="shared_string_release">Rilasciato</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">OK</string>
+	<string name="shared_string_cancel">Cancella</string>
+	<string name="shared_string_dismiss">Abbandona</string>
+	<string name="shared_string_yes">Si</string>
+	<string name="shared_string_no">No</string>
+	<string name="shared_string_on">Acceso</string>
+	<string name="shared_string_off">Spento</string>
+	<string name="shared_string_previous">Precedente</string>
+	<string name="shared_string_next">Successivo</string>
+	<string name="shared_string_enable">Abilita</string>
+	<string name="shared_string_disable">Disabilita</string>
+	<string name="shared_string_enabled">Abilitato</string>
+	<string name="shared_string_disabled">Disabilitato</string>
+	<string name="shared_string_selected">Selezionato</string>
+	<string name="shared_string_selected_lowercase">selezionato</string>
+	<string name="shared_string_never">Mai</string>
+	<string name="shared_string_none">Nessuno</string>
+	<string name="shared_string_and">e</string>
+	<string name="shared_string_or">o</string>
+	<string name="shared_string_help">Aiuto</string>
+	<string name="shared_string_settings">Impostazioni</string>
+	<string name="shared_string_history">Cronologia</string>
+	<string name="shared_string_select_on_map">Seleziona sulla mappa</string>
+	<string name="shared_string_select_all">Seleziona tutto</string>
+	<string name="shared_string_deselect">Deseleziona</string>
+	<string name="shared_string_deselect_all">Deseleziona tutto</string>
+	<string name="shared_string_clear">Pulisci</string>
+	<string name="shared_string_clear_all">Pulisci tutto</string>
+	<string name="shared_string_save">Salva</string>
+	<string name="shared_string_save_as_gpx">Salva coma traccia GPX</string>
+	<string name="shared_string_rename">Rinomina</string>
+	<string name="shared_string_delete">Elimina</string>
+	<string name="shared_string_delete_all">Elimina tutto</string>
+	<string name="shared_string_share">Condividi</string>
+	<string name="shared_string_add">Aggiungi</string>
+	<string name="shared_string_apply">Aplica</string>
+	<string name="shared_string_control_start">Avvia</string>
+	<string name="shared_string_control_stop">Ferma</string>
+	<string name="shared_string_import">Importa</string>
+	<string name="shared_string_export">Esporta</string>
+	<string name="shared_string_more">Di più</string>
+	<string name="shared_string_more_actions">Più azioni</string>
+	<string name="shared_string_do_not_show_again">Non mostrare nuovamente</string>
+	<string name="shared_string_remember_my_choice">Ricorda la scelta</string>
+	<string name="shared_string_refresh">Ricarica</string>
+	<string name="shared_string_download">Download</string>
+	<string name="shared_string_downloading">In download</string>
+	<string name="shared_string_download_successful">Download eseguito</string>
+	<string name="shared_string_io_error">Errore di I/O</string>
+	<string name="shared_string_unexpected_error">Si è verificato un errore imprevisto</string>
+	<string name="shared_string_action_template">"Azione {0}"</string>
+	<string name="shared_string_close">Chiudi</string>
+	<string name="shared_string_exit">Esci</string>
+	<string name="shared_string_show">Mostra</string>
+	<string name="shared_string_show_all">Mostra tutto</string>
+	<string name="shared_string_show_on_map">Mostra sulla mappa</string>
+	<string name="shared_string_map">Mappa</string>
+	<string name="shared_string_favorite">Preferito</string>
+	<string name="shared_string_favorites">Preferiti</string>
+	<string name="shared_string_add_to_favorites">Aggiungi ai preferiti</string>
+	<string name="shared_string_my_location">La mia posizione</string>
+	<string name="shared_string_my_places">I miei luoghi</string>
+	<string name="shared_string_my_favorites">I miei preferiti</string>
+	<string name="shared_string_my_tracks">Le mie tracce</string>
+	<string name="shared_string_currently_recording_track">Traccia in corso di registrazione</string>
+	<string name="shared_string_audio">Audio</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Foto</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index ecd147a0af..0018ee3524 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -38,7 +38,7 @@
      <string name="map_underlay">アンダーレイマップ</string>
      <string name="map_underlay_descr">アンダーレイマップを選択</string>
      <string name="layer_overlay">オーバーレイマップ…</string>
-     <string name="default_none">無し</string>
+     <string name="shared_string_none">無し</string>
      <string name="map_overlay">オーバーレイマップ</string>
      <string name="map_overlay_descr">オーバーレイマップを選択</string>
      <string name="tile_source_already_installed">マップは既に
@@ -117,8 +117,8 @@ Eメール, SMS(テキスト), あるいはクリップボードに位置座標
      <string name="tip_initial">ヘルプ</string>
      <string name="tip_initial_t">"OsmAndは多くの機能を持つナビゲーションアプリです。
 \n基礎的な使い方のヒントやテクニックをマップ画面の\'メニュー\'→\'ヘルプ\'から参照することが出来ます。 "</string>
-     <string name="next_button">次へ</string>
-     <string name="previous_button">前へ</string>
+     <string name="shared_string_next">次へ</string>
+     <string name="shared_string_previous">前へ</string>
 
      <string name="unit_of_length_descr">長さと速度の単位を変更</string>
      <string name="unit_of_length">長さの単位</string>
@@ -164,7 +164,7 @@ Eメール, SMS(テキスト), あるいはクリップボードに位置座標
      <string name="indexing_map">マップを索引化</string>
      <string name="indexing_poi">POIを索引化</string>
      <string name="indexing_transport">交通機関を索引化</string>
-     <string name="input_output_error">I/O エラー発生</string>
+     <string name="shared_string_io_error">I/O エラー発生</string>
      <string name="km">km</string>
      <string name="km_h">km/h</string>
      <string name="m">m</string>
@@ -392,7 +392,7 @@ MB)をダウンロードしますか?</string>
      <string name="transport_stops_to_pass">通過する乗り場</string>
      <string name="transport_route_distance">ルートの距離</string>
      <string name="transport">交通機関</string>
-     <string name="default_buttons_ok">OK</string>
+     <string name="shared_string_ok">OK</string>
      <string name="show_transport_over_map_description">マップ上に公共交通機関乗り場を表示</string>
      <string name="show_transport_over_map">交通機関乗り場を表示</string>
      <string name="hello">ナビゲーションアプリケーション OsmAnd</string>
@@ -414,7 +414,7 @@ POIの更新は利用できません</string>
      <string name="search_history_building">建物: {0}, {1}, {2}</string>
      <string name="favorite">お気に入り</string>
      <string name="clear_all">全てクリア</string>
-     <string name="history">履歴</string>
+     <string name="shared_string_history">履歴</string>
      <string name="uploading_data">データをアップロード中…</string>
      <string name="uploading">アップロード中</string>
      <string name="search_nothing_found">何も見つかりません</string>
@@ -504,7 +504,7 @@ POIの更新は利用できません</string>
  <string name="additional_settings">追加設定</string>
  <string name="settings_preset_descr">地図の表示とナビゲーションの設定はプロファイルごとに記憶されます。デフォルトのプロファイルを設定してください。</string>
  <string name="settings_preset">デフォルトプロファイル</string>
- <string name="settings">設定</string>
+ <string name="shared_string_settings">設定</string>
  <string name="save_current_track_descr">現在の経路を今すぐSDに保存</string>
  <string name="save_current_track">現在の経路を保存</string>
  <string name="save_track_interval_descr">ナビゲーション中の経路の記録間隔を選択</string>
@@ -594,11 +594,11 @@ POIの更新は利用できません</string>
 <string name="context_menu_item_open_bug">OSM バグをオープン</string>
 <string name="context_menu_item_create_poi">POIを作成</string>
 
-<string name="default_buttons_yes">はい</string>
-<string name="default_buttons_cancel">キャンセル</string>
+<string name="shared_string_yes">はい</string>
+<string name="shared_string_cancel">キャンセル</string>
 <string name="default_buttons_apply">適用</string>
 <string name="default_buttons_add">追加</string>
-<string name="default_buttons_no">いいえ</string>
+<string name="shared_string_no">いいえ</string>
 <string name="add_favorite_dialog_top_text">お気に入りの名前を入力</string>
 <string name="add_favorite_dialog_default_favourite_name">お気に入り</string>
 <string name="add_favorite_dialog_favourite_added_template">お気に入り地点
@@ -1076,14 +1076,14 @@ POIの更新は利用できません</string>
 	<string name="show_ruler_level">尺度を表示</string>	
 	<string name="info_button">インフォメーション</string>
 	<string name="back_to_location">現在位置に戻す</string>
-	<string name="help">ヘルプ</string>
+	<string name="shared_string_help">ヘルプ</string>
 	<string name="show_details">詳細を表示</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_on">オン</string>
-	<string name="accessibility_off">オフ</string>
+	<string name="shared_string_on">オン</string>
+	<string name="shared_string_off">オフ</string>
 	<string name="accessibility_default">グローバルシステム設定に従う</string>
 	<string name="backToMenu">メニューに戻る</string>
 	<string name="zoomOut">縮小</string>
@@ -1151,8 +1151,8 @@ POIの更新は利用できません</string>
     <string name="animate_routing_gpx">GPXトラックを利用してシミュレーション</string>
     <string name="remember_choice">選択を記憶</string>
     <string name="gps_status_eclipsim">GPSステータス</string>
-    <string name="default_and">と</string>
-    <string name="default_or">または</string>
+    <string name="shared_string_and">と</string>
+    <string name="shared_string_or">または</string>
 	<string name="route_is_too_long">OsmAndオフラインルート計算は、指定地点間の距離が200km以上有ると非常に時間がかかります(場合によっては動作しません)。 中間経由点を作成することでルート計算に掛かる時間を短くすることが出来ます。</string>
 	<string name="auto_zoom_none">自動ズームしない</string>
 	<string name="auto_zoom_close">ズーム 大</string>
@@ -1709,8 +1709,8 @@ OsmAndはオープンソースであり、活発に開発が進められいま
 	<string name="keep_and_add_destination_point">目的地として追加</string>
     <string name="select_gpx">GPXファイルを選択…</string>
     <string name="route_descr_select_destination">目的地を選択</string>
-    <string name="route_descr_select_on_map">地図から選択…</string>
-    <string name="route_descr_favorite">お気に入り…</string>
+    <string name="shared_string_select_on_map">地図から選択…</string>
+    <string name="shared_string_favorite">お気に入り…</string>
     <string name="route_preferences">ルート設定</string>
     <string name="route_info">ルート情報</string>
     <string name="routing_attr_prefer_motorway_name">高速道路を優先する</string>
@@ -1817,7 +1817,7 @@ OsmAndはオープンソースであり、活発に開発が進められいま
     <string name="gpx_wpt">経由点</string>
     <string name="selected_gpx_info_show">\n\nマップ上に表示するには長押ししてください</string>
     <string name="delay_navigation_start">ターン・バイ・ターン形式誘導を自動起動</string>
-    <string name="selected">選択済み</string>
+    <string name="shared_string_selected_lowercase">選択済み</string>
     <string name="gpx_info_subtracks">"サブトラック: %1$s "</string>
 	<string name="gpx_info_waypoints">"経由点: %1$s "</string>
 	<string name="gpx_info_distance">"距離: %1$s (%2$s 地点) "</string>
@@ -2075,7 +2075,7 @@ OsmAndはオープンソースであり、活発に開発が進められいま
 	<string name="lock_screen_request_explanation">省電力機能で画面をオフにするには%1$s の権限が必要です。</string>
     <string name="wake_on_voice">画面をオフ</string>
     <string name="wake_on_voice_descr">方向転換地点に近づくと携帯電話の画面をオンにする</string>
-    <string name="wake_on_voice_never">しない</string>
+    <string name="shared_string_never">しない</string>
     <string name="select_impassable_road">地図上で選択</string>
     <string name="impassable_road">無視する道路…</string>
     <string name="tip_recent_changes_1_9_t">"1.9での変更点： 路面レンダリング、移送用レイヤとハイキングシンボル等の追加に伴うマップ形式の更新 * ルート沿いのPOI検索 * セッションごとの通行止め道路の記録 * より簡単なマップのダウンロードと更新 * 経由点に近づいたときに、ビジュアルと音声で通知 * 旅程と移動指示情報を印刷可能に * 複数車線で進行可能情報の表示 * Androidウェアをサポート * インターフェイスの大幅変更 * 地図上の文字サイズごとに個別のズーム追加 * 経路から外れた場合の特別な音声通知を追加 * OsMoへのログイン機能追加 * OsMo バージョンの不一致部分を修正 "</string>
@@ -2149,7 +2149,7 @@ OsmAndはオープンソースであり、活発に開発が進められいま
     <string name="download_tab_updates">更新</string>
     <string name="download_tab_local">ローカル</string>
 	<string name="no_internet_connection">ダウンロード出来ません、インターネット接続を確認してください。</string>
-    <string name="dismiss">退ける</string>
+    <string name="shared_string_dismiss">退ける</string>
     <string name="everything_up_to_date">すべてのファイルを最新状態に</string>
     <string name="use_opengl_render">OpenGLレンダリングを使用</string>
     <string name="use_opengl_render_descr">ハードウェアのOpenGLレンダリングを使用(デバイスによっては動作しません)</string>
@@ -2162,6 +2162,6 @@ OsmAndはオープンソースであり、活発に開発が進められいま
 	<string name="proxy_port_title">プロキシポート</string>
 	<string name="proxy_port_descr">プロキシのポート番号設定(例：8118)</string>
 	<string name="voices">音声プロンプト</string>
-	<string name="enable_plugin">有効</string>
-	<string name="disable_plugin">無効</string>
+	<string name="shared_string_disabled">有効</string>
+	<string name="shared_string_enabled">無効</string>
 </resources>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 5871e328f9..4197da907c 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -56,14 +56,14 @@
   <string name="show_ruler_level">სახაზავის ჩვენება</string>
   <string name="info_button">ინფორმაცია</string>
   <string name="back_to_location">ადგილზე დაბრუნება</string>
-  <string name="help">დახმარება</string>
+  <string name="shared_string_help">დახმარება</string>
   <string name="show_details">დეტალების ჩვენება</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_on">ჩართული</string>
-  <string name="accessibility_off">გამორთული</string>
+  <string name="shared_string_on">ჩართული</string>
+  <string name="shared_string_off">გამორთული</string>
   <string name="accessibility_default">გლობალურ სისტემურ პარამეტრებზე დაყრდნობით</string>
   <string name="backToMenu">მენიუში დაბრუნება</string>
   <string name="zoomOut">დაპატარავება</string>
@@ -326,7 +326,7 @@
   <string name="map_underlay">ქვედა რუკა</string>
   <string name="map_underlay_descr">ქვედა რუკის არჩევა</string>
   <string name="layer_overlay">ზედა რუკა…</string>
-  <string name="default_none">არა</string>
+  <string name="shared_string_none">არა</string>
   <string name="map_overlay">ზედა რუკა</string>
   <string name="map_overlay_descr">ზედა რუკის არჩევა</string>
   <string name="tile_source_already_installed">რუკა უკვე დაყენებულია. მიმდინარეობს პარამეტრების განახლება</string>
@@ -363,8 +363,8 @@
   <string name="tip_map_context_menu_t">"\tრუკის კონტექსტური მენიუ წვდომადია რუკაზე დაჭერით ან ტრეკბოლის ღილაკზე დაჭერით.\n\tშედეგია ფანჯარა წერტილის კოორდინატებით. რუკის კონტექსტური მენიუს გამოსატანად დაარტყით მას თითი, ან დააჭირეთ მენიუს ღილაკს\n\tრუკის კონტექსტური მენიუ შეიცავს ყველა მოქმედებას მდებარეობასთან დაკავშირებით. "</string>
   <string name="tip_initial">მცირედი დახმარება</string>
   <string name="tip_initial_t">"\tOsmAnd არის აპლიკაცია ბევრი სასარგებლო თვისებით.\n\tპროგრამის გაშვებისას მისი თვისებები ეკრანზე გამოჩნდება. "</string>
-  <string name="next_button">შემდეგი</string>
-  <string name="previous_button">წინა</string>
+  <string name="shared_string_next">შემდეგი</string>
+  <string name="shared_string_previous">წინა</string>
   <string name="unit_of_length_descr">სიგრძისა და სიჩქარის ერთეულები</string>
   <string name="unit_of_length">გაზომვის ერთეული</string>
   <string name="si_mi_foots">მილი/ფუტი</string>
@@ -407,7 +407,7 @@
   <string name="indexing_map">რუკების ინდექსირება…</string>
   <string name="indexing_poi">POI-ის ინდექსირება…</string>
   <string name="indexing_transport">ტრანსპორტის ინდექსირება…</string>
-  <string name="input_output_error">მოხდა I/O შეცდომა</string>
+  <string name="shared_string_io_error">მოხდა I/O შეცდომა</string>
   <string name="km">კმ</string>
   <string name="km_h">კმ/ს</string>
   <string name="m">მ</string>
@@ -585,7 +585,7 @@
   <string name="transport_stops_to_pass">დარჩენილი გაჩერებები</string>
   <string name="transport_route_distance">გზის სიგრძე</string>
   <string name="transport">ტრანსპორტი</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">რუკაზე საზოგადოებრივი ტრანსპორტის გაჩერებების ჩვენება</string>
   <string name="show_transport_over_map">გაჩერებების ჩვენება</string>
   <string name="hello">OsmAnd - სანავიგაციო აპლიკაცია</string>
@@ -602,7 +602,7 @@
   <string name="search_history_building">შენობა: {0}, {1}, {2}</string>
   <string name="favorite">რჩეული</string>
   <string name="clear_all">გასუფთავება</string>
-  <string name="history">ისტორია</string>
+  <string name="shared_string_history">ისტორია</string>
   <string name="uploading_data">მონაცემების ატვირთვა…</string>
   <string name="uploading">ატვირთვა…</string>
   <string name="search_nothing_found">არაფერი არ იქნა ნაპოვნი</string>
@@ -679,7 +679,7 @@
   <string name="auto_zoom_map_descr">სიჩქარეზე რუკის ავტომატური გადიდება</string>
   <string name="auto_zoom_map">რუკის ავტომატური გადიდება</string>
   <string name="additional_settings">დამატებითი პარამეტრები</string>
-  <string name="settings">პარამეტრები</string>
+  <string name="shared_string_settings">პარამეტრები</string>
   <string name="save_current_track_descr">მიმდინარე ძებნის SDCard-ზე ჩაწერა</string>
   <string name="save_current_track">მიმდინარე დევნის დამახსოვრება</string>
   <string name="save_track_interval">ჟურნალირების ინტერვალი</string>
@@ -759,11 +759,11 @@
   <string name="context_menu_item_update_map">რუკის განახლება</string>
   <string name="context_menu_item_open_bug">OSM-ის შეცდომის რეპორტი</string>
   <string name="context_menu_item_create_poi">POI-ის შექმნა</string>
-  <string name="default_buttons_yes">დიახ</string>
-  <string name="default_buttons_cancel">გაუქმება</string>
+  <string name="shared_string_yes">დიახ</string>
+  <string name="shared_string_cancel">გაუქმება</string>
   <string name="default_buttons_apply">გამოყენება</string>
   <string name="default_buttons_add">ჩამატება</string>
-  <string name="default_buttons_no">არა</string>
+  <string name="shared_string_no">არა</string>
   <string name="add_favorite_dialog_top_text">რჩეულის სახელი</string>
   <string name="add_favorite_dialog_default_favourite_name">რჩეული</string>
   <string name="add_favorite_dialog_favourite_added_template">რჩეული წერტილი \'\'{0}\'\' წარმატებით დაემატა.</string>
@@ -1087,8 +1087,8 @@
     <string name="animate_routing_gpx">სიმულაცია GPX მიყოლით</string>
     <string name="remember_choice">ჩემი არჩევნის დამახსოვრება</string>
     <string name="gps_status_eclipsim">GPS-ის სტატუსი</string>
-    <string name="default_and">და</string>
-    <string name="default_or">ან</string>
+    <string name="shared_string_and">და</string>
+    <string name="shared_string_or">ან</string>
 	<string name="route_is_too_long">შესაძლებელია გზა მეტისმეტად გრძელია OsmAnd გათიშული მთვლელისათვის.
 	გათიშული გზის შესაძლო მაქსიმალური სიგრძეა 200კმ. გთხოვთ ჩაამატოთ შუალედური წერტილები.</string>
 	<string name="auto_zoom_none">ავტომატური გადიდების გათიშვა</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 3243f53931..0cde3f8447 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
 	
 	<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
@@ -27,15 +27,12 @@
 	
 	<string name="info_button">정보</string>
 	<string name="back_to_location">위치로 돌아감</string>
-	<string name="help">도움말</string>
 	<string name="show_details">세부정보 표시</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_on">접근성 켜기</string>
-	<string name="accessibility_off">접근성 끄기</string>
 	<string name="accessibility_default">글로벌 시스템 설정에 따름</string>
 	
 	<string name="backToMenu">메뉴로 돌아감</string>
@@ -349,7 +346,6 @@
 	<string name="map_underlay">언더레이 맵</string>
 	<string name="map_underlay_descr">언더레이 맵을 선택합니다</string>
 	<string name="layer_overlay">오버레이 맵…</string>
-	<string name="default_none">없음</string>
 	<string name="map_overlay">오버레이 맵</string>
 	<string name="map_overlay_descr">오버레이 맵을 선택합니다</string>
 	<string name="tile_source_already_installed">맵이 이미 설치되어, 설정이 업데이트될 것입니다</string>
@@ -410,9 +406,6 @@
 
 	<string name="tip_initial">도움말</string>
 	<string name="tip_initial_t">"OsmAnd는 많은 기능을 가진 내비게이션 앱입니다.\n기본적인 소개로서, 몇 가지 유용한 도움말을 지도화면에서  [메뉴-도움말]에서 찾을 수 있습니다. "</string>
-	<string name="next_button">다음</string>
-	<string name="previous_button">이전</string>
-
 	<string name="unit_of_length_descr">거리와 속도 단위를 변경합니다</string>
 	<string name="unit_of_length">측정 단위</string>
 	<string name="si_mi_foots">마일/피트</string>
@@ -454,7 +447,6 @@
 	<string name="indexing_map">맵 인덱싱…</string>
 	<string name="indexing_poi">POI 인덱싱…</string>
 	<string name="indexing_transport">대중교통 인덱싱…</string>
-	<string name="input_output_error">입출력 오류가 발생하였습니다</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -486,7 +478,7 @@
 	<string name="select_build_to_install">설치할 OsmAnd 빌드 선택</string>
 	<string name="contribution_activity">버전 설치</string>
 
-	<string name="gps_status_app_not_found">GPS Status 앱이 설치되지 않았습니다. 구글마켓에서 찾을까요?</string>
+	<string name="gps_status_app_not_found">GPS status 앱이 설치되지 않았습니다. 구글마켓에서 찾을까요?</string>
 
 	<string name="voice_is_not_available_msg">"음성 안내를 사용할 수 없습니다. \'설정 - 일반 - 음성안내\' 로 가서, 선호하는 음성 안내  패키지를 선택하고 다운로드하세요."</string>
 	<string name="voice_is_not_available_title">선택된 음성 안내 없음</string>
@@ -649,7 +641,6 @@
 	<string name="transport_stops_to_pass">경유할 정류소들</string>
 	<string name="transport_route_distance">교처로까지 거리</string>
 	<string name="transport">대중교통</string>
-	<string name="default_buttons_ok">OK</string>
 	<string name="show_transport_over_map_description">대중교통 정류소를 지도에 표시</string>
 	<string name="show_transport_over_map">대중교통 정류소 표시</string>
 	<string name="hello">내비게이션 앱 OsmAnd</string>
@@ -666,7 +657,6 @@
 	<string name="search_history_building">빌딩: {0}, {1}, {2}</string>
 	<string name="favorite">즐겨찾기</string>
 	<string name="clear_all">모두 지우기</string>
-	<string name="history">기록</string>
 	<string name="uploading_data">데이터를 업로드하는 중…</string>
 	<string name="uploading">업로드하는 중…</string>
 	<string name="search_nothing_found">아무것도 찾지 못했습니다</string>
@@ -744,7 +734,6 @@
     <string name="auto_zoom_map_descr">속도에 따라 자동으로 지도 줌(zoom)을 합니다</string>
     <string name="auto_zoom_map">자동 맵 줌</string>
     <string name="additional_settings">추가 설정</string>
-    <string name="settings">설정</string>
     <string name="save_current_track_descr">현재 트랙을 SD 카드에 저장합니다</string>
     <string name="save_current_track">현재 트랙을 GPX 파일로 저장</string>
     <string name="save_track_interval_descr">운행하는 동안 트랙 레코딩을 위한 로깅 간격을 선택합니다</string>
@@ -828,11 +817,8 @@
 <string name="context_menu_item_open_bug">OSM 버그 열기</string>
 <string name="context_menu_item_create_poi">POI 생성</string>
 
-<string name="default_buttons_yes">예</string>
-<string name="default_buttons_cancel">취소</string>
 <string name="default_buttons_apply">적용</string>
 <string name="default_buttons_add">추가</string>
-<string name="default_buttons_no">아니오</string>
 <string name="add_favorite_dialog_top_text">즐겨찾기 이름 입력</string>
 <string name="add_favorite_dialog_default_favourite_name">즐겨찾기</string>
 <string name="add_favorite_dialog_favourite_added_template">즐겨찾기 포인트 \'\'{0}\'\' 이 성공적으로 추가되었습니다.</string>
@@ -937,8 +923,6 @@
     <string name="keep_and_add_destination_point">도착지로 추가</string>
     <string name="select_gpx">GPX 선택…</string>
     <string name="route_descr_select_destination">도착지 선택</string>
-    <string name="route_descr_select_on_map">지도에서 선택…</string>
-    <string name="route_descr_favorite">즐겨찾기…</string>
     <string name="route_info">경로 정보</string>
     <string name="routing_attr_prefer_motorway_name">전용도로 선호</string>
 	<string name="routing_attr_prefer_motorway_description">전용도로 선호</string>
@@ -983,8 +967,6 @@
     <string name="animate_routing_gpx">GPX경로를 이용하여 모의주행하기</string>
     <string name="remember_choice">내 선택을 기억하기</string>
     <string name="gps_status_eclipsim">GPS status</string>
-    <string name="default_and">그리고</string>
-    <string name="default_or">또는</string>
 	<string name="auto_zoom_none">자동 줌 안됨</string>
 	<string name="map_magnifier">지도 확대경</string>
 	<string name="base_world_map">세계 기본지도</string>
@@ -1586,7 +1568,7 @@
 \n\t* 많은 UX 개선 및 사용성 고정.
 \n\t* 음성 속도 설정 추가. "</string>
     <string name="av_camera_focus_edof">필드의 확장된 깊이(EDoF )</string>
-	<string name="local_index_installed">편집</string>
+	<string name="local_index_installed">로컬 버전</string>
 	<string name="voice_not_specified">지정없음</string>
 	<string name="incomplete_locale">불완성</string>
 	<string name="downloading_file_new">다운로드 중…</string>
@@ -1899,7 +1881,6 @@
     <string name="gpx_wpt">경유지</string>
     <string name="selected_gpx_info_show">\n\n지도를 보려면 누르고 계십시요</string>
     <string name="delay_navigation_start">순차적인 안내를 시작합니다</string>
-    <string name="selected">선택됨</string>
     <string name="gpx_split_interval">분할 간격</string>
     <string name="gpx_info_waypoints">"경유지: %1$s "</string>
 	<string name="gpx_info_asc_altitude">하강/상승: %1$s</string>
@@ -2068,7 +2049,6 @@
     <string name="wake_on_voice">화면 켜기</string>
     <string name="wake_on_voice_descr">교차로에 접근할 때 화면 켜기</string>
     <string name="lock_screen_request_explanation">%1$의 절전 기능에 대한 화면을 해제 하려면 이 권한이 필요 합니다.</string>
-    <string name="wake_on_voice_never">결코</string>
     <string name="advanced_settings">고급</string>
 	<string name="osmo_use_https">HTTPS 사용하기</string>
 	<string name="osmo_use_https_descr">서버에 보안 연결 이용</string>
@@ -2081,7 +2061,6 @@
 	<string name="error_avoid_specific_road">우회로 없음</string>
     <string name="use_opengl_render">OpenGL 렌더링 사용</string>
     <string name="use_opengl_render_descr">하드웨어로 가속된 OpenGL 렌더링 사용 (일부 장치에는 작동 하지 않을 수 있습니다)</string>
-    <string name="dismiss">해제</string>
     <string name="everything_up_to_date">모든 파일 업데이트</string>
     <string name="no_internet_connection">다운로드가 불가능 합니다. 인터넷 연결을 체크해 주세요.</string>
     <string name="navigate_point_zone">존(지역)</string>
@@ -2130,17 +2109,13 @@
     <string name="tracks">경로</string>
     <string name="my_location">내 위치</string>
     <string name="osm_editing_manage">관리</string>
-    <string name="gps_status">GPS 상태</string>
+    <string name="gps_status">GPS status 앱</string>
     <string name="parking_place">주차장</string>
     <string name="remove_the_tag">태그를 제거</string>
-    <string name="enable_plugin">비활성화됨</string>
-	<string name="disable_plugin">활성화됨</string>
 <string name="plugin_description_title">설명</string>
 	<string name="plugin_settings_button_caption">설정</string>
 <string name="edit_group">그룹 편집</string>
     <string name="plugin_install_needs_network">이 플러그인을 설치 하려면 인터넷에 연결을 해야 합니다.</string>
-<string name="enable_plugin2">활성화</string>
-	<string name="disable_plugin2">비활성화</string>
 	<string name="get_plugin">가져오기</string>
 <string name="plugin_ski_name">스키 지도 보기</string>
     <string name="plugin_nautical_name">항해 지도 보기</string>
@@ -2182,7 +2157,78 @@
 	<string name="rename_failed">이름 바꾸기 실패 했습니다.</string>
 	<string name="currently_recording_track">현재 기록중인 트랙</string>
 	<string name="back_to_map">지도로 돌아가기</string>
-	<string name="selected_tracks">선택된 트랙</string>
 	<string name="track_segments">트랙 세그먼트</string>
 	<string name="track_points">트랙 포인트</string>
+	<string name="route_points">루트 포인트</string>
+	<string name="shared_string_release">릴리스</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">확인</string>
+	<string name="shared_string_cancel">취소</string>
+	<string name="shared_string_dismiss">기각</string>
+	<string name="shared_string_yes">예</string>
+	<string name="shared_string_no">아니오</string>
+	<string name="shared_string_on">켜기</string>
+	<string name="shared_string_off">끄기</string>
+	<string name="shared_string_previous">이전</string>
+	<string name="shared_string_next">다음</string>
+	<string name="shared_string_enable">활성화</string>
+	<string name="shared_string_disable">비활성화</string>
+	<string name="shared_string_enabled">활성화됨</string>
+	<string name="shared_string_disabled">비활성화됨</string>
+	<string name="shared_string_selected">선택한 것</string>
+	<string name="shared_string_selected_lowercase">선택한 것</string>
+	<string name="shared_string_never">결코</string>
+	<string name="shared_string_none">없음</string>
+	<string name="shared_string_and">그리고</string>
+	<string name="shared_string_or">또는</string>
+	<string name="shared_string_help">도움말</string>
+	<string name="shared_string_settings">설명</string>
+	<string name="shared_string_history">최근 기록</string>
+	<string name="shared_string_select_on_map">지도에서 선택</string>
+	<string name="shared_string_select_all">모두 선택</string>
+	<string name="shared_string_deselect">선택 취소</string>
+	<string name="shared_string_deselect_all">모두 선택 취소</string>
+	<string name="shared_string_clear">지우기</string>
+	<string name="shared_string_clear_all">모두 지우기</string>
+	<string name="shared_string_save">저장</string>
+	<string name="shared_string_save_as_gpx">현재 트랙을 GPX 파일로 저장</string>
+	<string name="shared_string_rename">이름 바꾸기</string>
+	<string name="shared_string_delete">삭제</string>
+	<string name="shared_string_delete_all">모두 삭제</string>
+	<string name="shared_string_share">공유</string>
+	<string name="shared_string_add">추가</string>
+	<string name="shared_string_apply">적용</string>
+	<string name="shared_string_control_start">시작</string>
+	<string name="shared_string_control_stop">정지</string>
+	<string name="shared_string_import">가져오기</string>
+	<string name="shared_string_export">내보내기</string>
+	<string name="shared_string_more">더보기</string>
+	<string name="shared_string_more_actions">더 많은 작업</string>
+	<string name="shared_string_do_not_show_again">다시 표시하지 않음</string>
+	<string name="shared_string_remember_my_choice">내 선택을 기억하기</string>
+	<string name="shared_string_refresh">새로고침</string>
+	<string name="shared_string_download">다운로드</string>
+	<string name="shared_string_downloading">다운로드 중</string>
+	<string name="shared_string_download_successful">성공적인 다운로드</string>
+	<string name="shared_string_io_error">입출력 오류가 발생하였습니다</string>
+	<string name="shared_string_unexpected_error">예기치 않은 오류가 발생 했습니다</string>
+	<string name="shared_string_action_template">"작업 {0}"</string>
+	<string name="shared_string_close">닫기</string>
+	<string name="shared_string_exit">종료</string>
+	<string name="shared_string_show">보기</string>
+	<string name="shared_string_show_all">모두 표시</string>
+	<string name="shared_string_show_on_map">지도에 표시</string>
+	<string name="shared_string_map">지도</string>
+	<string name="shared_string_favorite">즐겨찾기</string>
+	<string name="shared_string_favorites">즐겨찾기</string>
+	<string name="shared_string_add_to_favorites">즐겨찾기에 추가</string>
+	<string name="shared_string_my_location">내 위치</string>
+	<string name="shared_string_my_places">저장소</string>
+	<string name="shared_string_my_favorites">모든 즐겨찾기</string>
+	<string name="shared_string_my_tracks">경로</string>
+	<string name="shared_string_currently_recording_track">현재 기록중인 트랙</string>
+	<string name="shared_string_audio">소리</string>
+	<string name="shared_string_video">영상</string>
+	<string name="shared_string_photo">사진</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 7808cf3d70..c28df4034f 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -127,14 +127,14 @@
   <string name="show_ruler_level">Rodyti liniuotę</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Atgal į vietą</string>
-  <string name="help">Pagalba</string>
+  <string name="shared_string_help">Pagalba</string>
   <string name="show_details">Rodyti detales</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="accessibility_on">Įjungta</string>
-  <string name="accessibility_off">Išjungta</string>
+  <string name="shared_string_on">Įjungta</string>
+  <string name="shared_string_off">Išjungta</string>
   <string name="accessibility_default">Pagal globalius sistemos nustatymus</string>
   <string name="backToMenu">Atgal į meniu</string>
   <string name="zoomOut">Sumažinti</string>
@@ -446,7 +446,7 @@
   <string name="map_underlay">Apatinis žemėlapio sluoksnis</string>
   <string name="map_underlay_descr">Pasirinkti apatinį žemėlapio sluoksnį</string>
   <string name="layer_overlay">Viršutinis žemėlapio sluoksnis…</string>
-  <string name="default_none">Nėra</string>
+  <string name="shared_string_none">Nėra</string>
   <string name="map_overlay">Viršutinis žemėlapio sluoksnis</string>
   <string name="map_overlay_descr">Pasirinkti viršutinį žemėlapio sluoksnį</string>
   <string name="tile_source_already_installed">Žemėlapis jau įdiegtas, nustatymai bus atnaujinti</string>
@@ -506,8 +506,8 @@
   <string name="tip_initial">Pagalba</string>
   <string name="tip_initial_t">"OsmAnd yra daug funkcijų turinti navigacijos programa.
 \n\nInformacija pradiniam supažindinimui, patarimai ir detalesnė pagalba pasiekiami žemėlapio rodinyje pasirinkus \'Meniu\' → \'Patarimai\'. "</string>
-  <string name="next_button">Kitas</string>
-  <string name="previous_button">Ankstesnis</string>
+  <string name="shared_string_next">Kitas</string>
+  <string name="shared_string_previous">Ankstesnis</string>
   <string name="unit_of_length_descr">Pakeisti ilgio ir greičio matavimo vienetus</string>
   <string name="unit_of_length">Matavimo vienetai</string>
   <string name="si_mi_foots">Mylios/pėdos</string>
@@ -550,7 +550,7 @@
   <string name="indexing_map">Indeksuojamas žemėlapis…</string>
   <string name="indexing_poi">Indeksuojamos LV…</string>
   <string name="indexing_transport">Indeksuojamas transportas…</string>
-  <string name="input_output_error">Įvyko I/O klaida</string>
+  <string name="shared_string_io_error">Įvyko I/O klaida</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -728,7 +728,7 @@
   <string name="transport_stops_to_pass">pravažiuoti stotelių</string>
   <string name="transport_route_distance">Maršruto ilgis</string>
   <string name="transport">Transportas</string>
-  <string name="default_buttons_ok">Gerai</string>
+  <string name="shared_string_ok">Gerai</string>
   <string name="show_transport_over_map_description">Rodyti viešojo transporto stoteles žemėlapyje</string>
   <string name="show_transport_over_map">Rodyti viešojo transporto stoteles</string>
   <string name="hello">Navigacijos programa OsmAnd</string>
@@ -745,7 +745,7 @@
   <string name="search_history_building">Pastatas: {0}, {1}, {2}</string>
   <string name="favorite">Įsimintos vietos</string>
   <string name="clear_all">Išvalyti viską</string>
-  <string name="history">Istorija</string>
+  <string name="shared_string_history">Istorija</string>
   <string name="uploading_data">Siunčiami duomenys…</string>
   <string name="uploading">Siunčiama…</string>
   <string name="search_nothing_found">Nieko nerasta</string>
@@ -822,7 +822,7 @@
   <string name="auto_zoom_map_descr">Automatiškai priderinti žemėlapio mastelį pagal jūsų greitį</string>
   <string name="auto_zoom_map">Automatiškai keisti mastelį</string>
   <string name="additional_settings">Papildomi nustatymai</string>
-  <string name="settings">Nustatymai</string>
+  <string name="shared_string_settings">Nustatymai</string>
   <string name="save_current_track_descr">Dabar išsaugoti judėjimo istoriją į SD kortelę</string>
   <string name="save_current_track">Išsaugoti dabartinę judėjimo istoriją</string>
   <string name="save_track_interval">Informacijos išsaugojimo intervalas naviguojant</string>
@@ -902,11 +902,11 @@
   <string name="context_menu_item_update_map">Atnaujinti žemėlapį</string>
   <string name="context_menu_item_open_bug">Atidaryti OSM klaidą</string>
   <string name="context_menu_item_create_poi">Sukurti LV</string>
-  <string name="default_buttons_yes">Taip</string>
-  <string name="default_buttons_cancel">Atšaukti</string>
+  <string name="shared_string_yes">Taip</string>
+  <string name="shared_string_cancel">Atšaukti</string>
   <string name="default_buttons_apply">Taikyti</string>
   <string name="default_buttons_add">Pridėti</string>
-  <string name="default_buttons_no">Ne</string>
+  <string name="shared_string_no">Ne</string>
   <string name="add_favorite_dialog_top_text">Įveskite įsimintos vietos pavadinimą</string>
   <string name="add_favorite_dialog_default_favourite_name">Įsiminta vieta</string>
   <string name="add_favorite_dialog_favourite_added_template">Įsiminta vieta \'\'{0}\'\' buvo sėkmingai įrašyta.</string>
@@ -1419,8 +1419,8 @@
     
     <string name="remember_choice">Atsiminti mano pasirinkimą</string>
     <string name="gps_status_eclipsim">GPS statusas</string>
-    <string name="default_and">ir</string>
-    <string name="default_or">arba</string>
+    <string name="shared_string_and">ir</string>
+    <string name="shared_string_or">arba</string>
 	<string name="animate_routing_route_not_calculated">Pirmiausia apskaičiuokite maršrutą</string>
     <string name="animate_routing_route">Simuliuoti naudojant apskaičiuotą maršrutą </string>
     <string name="animate_routing_gpx">Simuliuoti naudojant GPX maršrutą</string>
@@ -1478,8 +1478,8 @@
     <string name="keep_and_add_destination_point">Įtraukti kaip kelionės tikslą</string>
     <string name="select_gpx">Pasirinkti GPX…</string>
     <string name="route_descr_select_destination">Pasirinkti kelionės tikslą</string>
-    <string name="route_descr_select_on_map">Pasirinkti žemėlapyje…</string>
-    <string name="route_descr_favorite">Įsiminta vieta…</string>
+    <string name="shared_string_select_on_map">Pasirinkti žemėlapyje…</string>
+    <string name="shared_string_favorite">Įsiminta vieta…</string>
     <string name="route_preferences">Maršruto parinktys</string>
     <string name="route_info">Maršruto informacija</string>
     <string name="use_displayed_track_for_navigation">Ar rodomą maršrutą norite naudoti navigacijai?</string>
@@ -1664,7 +1664,7 @@
     <string name="gpx_wpt">Kelionės taškas</string>
     <string name="selected_gpx_info_show">\n\nPaspauskite ir laikykite kad pamatytumėte žemėlapyje</string>
     <string name="delay_navigation_start">Pradėti navigaciją automatiškai</string>
-    <string name="selected">pasirinkti</string>
+    <string name="shared_string_selected_lowercase">pasirinkti</string>
     <string name="gpx_split_interval">Padalinimo intervalas</string>
     <string name="sort_by_distance">Rūšiuoti pagal atstumą</string>
     <string name="sort_by_name">Rūšiuoti pagal pavadinimą</string>
@@ -1840,7 +1840,7 @@
     <string name="wake_on_voice">Įjungti ekraną</string>
     <string name="wake_on_voice_descr">Įjungti ekraną (jei išjungtas) artėjant prie posūkio</string>
     <string name="lock_screen_request_explanation">%1$s prašo leidimo išjungti ekraną tausojant energiją.</string>
-    <string name="wake_on_voice_never">Niekada</string>
+    <string name="shared_string_never">Niekada</string>
     <string name="osmo_use_https">Naudoti HTTPS</string>
 	<string name="osmo_use_https_descr">Prie serverio jungtis saugiu ryšiu</string>
     <string name="advanced_settings">Plačiau</string>
@@ -1875,7 +1875,7 @@
     <string name="routing_attr_no_new_routing_name">Nenaudoti 1.9 versijos maršrutizavimo</string>
     <string name="routing_attr_no_new_routing_description">Nenaudoti 1.9 versijos maršrutizavimo</string>
     <string name="dash_download_msg_none">Ar norite atsisiųsti bet kurį žemėlapį naudojimui be interneto?</string>
-    <string name="dismiss">Nesiųsti</string>
+    <string name="shared_string_dismiss">Nesiųsti</string>
     <string name="traffic_warning_railways">Geležinkelio pervaža</string>
 	<string name="traffic_waring_pedestrian">Pėstieji</string>
 	<string name="show_railway_warnings">Rodyti geležinkelių pervažas</string>
@@ -1906,14 +1906,14 @@
 	<string name="proxy_port_title">Proksi serverio portas</string>
 	<string name="proxy_port_descr">Nurodykite jūsų proksi serverio porto numerį (pvz., 8118)</string>
 	<string name="enable_proxy_descr">"Konfigūruoti  HTTP proksi serverį visoms tinklo užklausoms"</string>
-	<string name="enable_plugin">Išjungta</string>
-	<string name="disable_plugin">Įjungta</string>
+	<string name="shared_string_disabled">Išjungta</string>
+	<string name="shared_string_enabled">Įjungta</string>
 <string name="plugin_description_title">Aprašymas</string>
 	<string name="plugin_settings_button_caption">Nustatymai</string>
 <string name="edit_group">Redaguoti grupę</string>
     <string name="plugin_install_needs_network">Prisijunkite prie interneto, jei norite įdiegti šį priedą.</string>
-<string name="enable_plugin2">Įjungti</string>
-	<string name="disable_plugin2">Išjungti</string>
+<string name="shared_string_enable">Įjungti</string>
+	<string name="shared_string_disable">Išjungti</string>
 	<string name="get_plugin">Gauti</string>
 <string name="plugin_ski_name">Slidinėjimo žemėlapiai</string>
     <string name="world_ski_missing">Tam, kad būtų atvaizduojami slidinėjimo žemėlapiai, būtina atsisiųsti specializuotus žemėlapius</string>
@@ -1935,7 +1935,7 @@
 	<string name="plugin_nautical_descr">Aktyvavus šį rodinį bus rodomas jūrlapis su jūriniais navigaciniais ženklais ir simboliais.</string>
 	<string name="rename_failed">Nepavyko pervardinti.</string>
 	<string name="back_to_map">Grįžti į žemėlapį</string>
-	<string name="selected_tracks">Pasirinkta</string>
+	<string name="shared_string_selected">Pasirinkta</string>
 	<string name="showed_on_map">Rodoma žemėlapyje</string>
 	<string name="share_note">Pasidalinti pastaba</string>
 	</resources>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index 74a044f9cd..7f0e5c3d9b 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -35,14 +35,14 @@
   <string name="show_ruler_level">Rādīt lineālu</string>
   <string name="info_button">Informācija</string>
   <string name="back_to_location">Atgriezties atrašanās vietā</string>
-  <string name="help">Palīdzība</string>
+  <string name="shared_string_help">Palīdzība</string>
   <string name="show_details">Rādīt detaļas</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="accessibility_on">Ieslēgts</string>
-  <string name="accessibility_off">Izslēgts</string>
+  <string name="shared_string_on">Ieslēgts</string>
+  <string name="shared_string_off">Izslēgts</string>
   <string name="accessibility_default">Atbilstoši sistēmas uzstādījumiem</string>
   <string name="backToMenu">Atpakaļ uz izvēlni</string>
   <string name="zoomOut">Samazināt</string>
@@ -312,7 +312,7 @@
   <string name="map_underlay">Paklāja karte</string>
   <string name="map_underlay_descr">Izvēlēties paklāja karti</string>
   <string name="layer_overlay">Pārklāja karte…</string>
-  <string name="default_none">Nekas</string>
+  <string name="shared_string_none">Nekas</string>
   <string name="map_overlay">Pārklāja karte</string>
   <string name="map_overlay_descr">Izvēlēties pārklāja karti</string>
   <string name="tile_source_already_installed">Karte jau ir instalēta, uzstādījumi tiks atjaunoti</string>
@@ -364,8 +364,8 @@
 ……	……	……\n\nVairāki noderīgi padomi ir pievienoti galvenā ekrāna izvēlnē \'Padomi\'
 ……	……
 	</string>
-  <string name="next_button">Tālāk</string>
-  <string name="previous_button">Atpakaļ</string>
+  <string name="shared_string_next">Tālāk</string>
+  <string name="shared_string_previous">Atpakaļ</string>
   <string name="unit_of_length_descr">Attāluma un braukšanas ātruma mērvienības</string>
   <string name="unit_of_length">Mērvienības</string>
   <string name="si_mi_foots">Jūdzes/pēdas</string>
@@ -408,7 +408,7 @@
   <string name="indexing_map">Karšu indeksācija…</string>
   <string name="indexing_poi">Indeksē POI…</string>
   <string name="indexing_transport">Indeksē transportu…</string>
-  <string name="input_output_error">I/O kļūda</string>
+  <string name="shared_string_io_error">I/O kļūda</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -588,7 +588,7 @@
   <string name="transport_stops_to_pass">Pieturvietu skaits</string>
   <string name="transport_route_distance">Ceļa garums</string>
   <string name="transport">Transports</string>
-  <string name="default_buttons_ok">Labi</string>
+  <string name="shared_string_ok">Labi</string>
   <string name="show_transport_over_map_description">Rādīt uz kartes sabiedriskā transporta pieturas</string>
   <string name="show_transport_over_map">Rādīt pieturas</string>
   <string name="hello">OsmAnd navigācija</string>
@@ -605,7 +605,7 @@
   <string name="search_history_building">Ēka: {0}, {1}, {2}</string>
   <string name="favorite">Izlase</string>
   <string name="clear_all">Noņemt visu</string>
-  <string name="history">Vēsture</string>
+  <string name="shared_string_history">Vēsture</string>
   <string name="uploading_data">Augšupielādē datus…</string>
   <string name="uploading">Augšupielādē…</string>
   <string name="search_nothing_found">Nekas netika atrasts</string>
@@ -683,7 +683,7 @@
   <string name="auto_zoom_map_descr">Automātiski mērogot karti atkarībā no pārvietošanās ātruma</string>
   <string name="auto_zoom_map">Automātiski mērogot karti</string>
   <string name="additional_settings">Papildus uzstādījumi</string>
-  <string name="settings">Uzstādījumi</string>
+  <string name="shared_string_settings">Uzstādījumi</string>
   <string name="save_current_track_descr">Saglabāt pašreizējo ceļu SD kartē</string>
   <string name="save_current_track">Saglabāt patreizējo GPX trasi</string>
   <string name="save_track_interval">Pierakstīšanas intervāls</string>
@@ -763,11 +763,11 @@
   <string name="context_menu_item_update_map">Atjaunot karti</string>
   <string name="context_menu_item_open_bug">Atvērt OSM bug</string>
   <string name="context_menu_item_create_poi">Izveidot POI</string>
-  <string name="default_buttons_yes">Jā</string>
-  <string name="default_buttons_cancel">Atcelt</string>
+  <string name="shared_string_yes">Jā</string>
+  <string name="shared_string_cancel">Atcelt</string>
   <string name="default_buttons_apply">Pielietot</string>
   <string name="default_buttons_add">Pievienot</string>
-  <string name="default_buttons_no">Nē</string>
+  <string name="shared_string_no">Nē</string>
   <string name="add_favorite_dialog_top_text">Ievadiet vietas nosaukumu</string>
   <string name="add_favorite_dialog_default_favourite_name">Izlase</string>
   <string name="add_favorite_dialog_favourite_added_template">Izlases punkts \'\'{0}\'\' veiksmīgi pievienots.</string>
@@ -1057,8 +1057,8 @@
     <string name="animate_routing_gpx">GPX trases simulācija</string>
     <string name="remember_choice">Atcerēties manu izvēli</string>
     <string name="gps_status_eclipsim">GPS statuss</string>
-    <string name="default_and">un</string>
-    <string name="default_or">vai</string>
+    <string name="shared_string_and">un</string>
+    <string name="shared_string_or">vai</string>
 	<string name="route_is_too_long">OsmAnd maršruta aprēķināšana var aizņemt ļoti ilgu laiku (vai pat neizdoties), ja ceļa punkti atrodas vairāk nekā 200km attālumā. Pievienojiet papildus pieturas vietas, lai optimizētu aprēķināšanu.</string>
 	<string name="auto_zoom_close">Tuvināti</string>
 	<string name="auto_zoom_far">Vidēji tuvu</string>
@@ -1487,11 +1487,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="routing_attr_weight_description">Norādīt transportlīdzekļa maksimālā svara ierobežojumus</string>
     <string name="select_gpx">Atzīmēt GPX…</string>
     <string name="route_descr_select_destination">Atlasīt galamērķi</string>
-    <string name="route_descr_select_on_map">Atzīmēt no kartes…</string>
+    <string name="shared_string_select_on_map">Atzīmēt no kartes…</string>
     <string name="route_preferences">Maršruta uzstādījumi</string>
     <string name="route_info">Maršruta informācija</string>
     <string name="keep_and_add_destination_point">Pievienot kā galamērķi</string>
-    <string name="route_descr_favorite">Izlase…</string>
+    <string name="shared_string_favorite">Izlase…</string>
     <string name="calculate_osmand_route_without_internet">Aprēķināt OsmAnd maršruta segmentu, neizmantojot internetu</string>
     <string name="gpx_option_calculate_first_last_segment">Aprēķināt OsmAnd maršrutu pirmajam un pēdējam segmentam</string>
     <string name="use_displayed_track_for_navigation">Vai lietot norādīto ceļu navigācijai?</string>
@@ -1741,7 +1741,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="gpx_wpt">Ceļapunkts</string>
     <string name="selected_gpx_info_show">\n\nTuriet nospiestu, lai rādītu uz kartes</string>
     <string name="delay_navigation_start">Sākt navigāciju ar aizturi</string>
-    <string name="selected">Izvēlēts</string>
+    <string name="shared_string_selected_lowercase">Izvēlēts</string>
     <string name="gpx_split_interval">Sadalījuma intervāls</string>
     <string name="gpx_info_subtracks">Apakšposmi: %1$s </string>
 	<string name="gpx_info_waypoints">Ceļapunkti: %1$s </string>
@@ -1865,7 +1865,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="download_tab_updates">Atjauninājumi</string>
     <string name="download_tab_local">Vietējie</string>
 	<string name="no_internet_connection">Lejupielāde neizdevās, lūdzu pārbaudiet interneta savienojumu.</string>
-    <string name="dismiss">Atcelt</string>
+    <string name="shared_string_dismiss">Atcelt</string>
     <string name="everything_up_to_date">Visi faili ir atjaunoti</string>
     <string name="use_opengl_render">Lietot OpenGL renderēšanu</string>
     <string name="use_opengl_render_descr">Lietot iebūvēto paātrināto OpenGL renderēšanu (jābūt saderīgai ierīcei)</string>
@@ -1884,7 +1884,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="lock_screen_request_explanation">%1$s ir nepieciešama šī atļauja, lai izslēgtu ekrānu enerģijas taupīšanai.</string>
     <string name="wake_on_voice">Ieslēgt ekrānu</string>
     <string name="wake_on_voice_descr">Ieslēgt ekrānu, kad tuvojas pagrieziens</string>
-    <string name="wake_on_voice_never">Nekad</string>
+    <string name="shared_string_never">Nekad</string>
     <string name="select_impassable_road">Arzīmēt kartē</string>
     <string name="impassable_road">Izvairīties no ceļiem…</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Vilciena maršruti</string>
diff --git a/OsmAnd/res/values-mr/strings.xml b/OsmAnd/res/values-mr/strings.xml
index de1024dce7..5746b3879f 100644
--- a/OsmAnd/res/values-mr/strings.xml
+++ b/OsmAnd/res/values-mr/strings.xml
@@ -21,10 +21,10 @@
   
   <string name="show_ruler_level">पट्टी दाखवा</string>
   <string name="info_button">माहिती</string>
-  <string name="help">मदत</string>
+  <string name="shared_string_help">मदत</string>
   <string name="show_details">तपशील दाखवा</string>
-  <string name="accessibility_on">चालू</string>
-  <string name="accessibility_off">बंद</string>
+  <string name="shared_string_on">चालू</string>
+  <string name="shared_string_off">बंद</string>
   <string name="backToMenu">पुन्हा मेनूकडे</string>
   <string name="zoomOut">झूम कमी करा</string>
   <string name="zoomIn">झूम वाढवा</string>
@@ -136,8 +136,8 @@
   <string name="map_text_size">अक्षरांचा आकार</string>
   <string name="voice_not_use">वापरू नका</string>
   <string name="voice_not_specified">कुठलाच नाही</string>
-  <string name="next_button">पुढे</string>
-  <string name="previous_button">मागे</string>
+  <string name="shared_string_next">पुढे</string>
+  <string name="shared_string_previous">मागे</string>
   <string name="si_mi_foots">मैल/फूट</string>
   <string name="si_mi_yard">मैल/यार्ड</string>
   <string name="si_km_m">किमी/मी</string>
@@ -222,7 +222,7 @@
   <string name="transport_stop_to_go_out">उतरण्याचा थांबा निवडा</string>
   <string name="transport_route_distance">मार्गाचे अंतर</string>
   <string name="transport">परिवहन</string>
-  <string name="default_buttons_ok">ठिक आहे</string>
+  <string name="shared_string_ok">ठिक आहे</string>
   <string name="show_transport_over_map_description">सार्वजनिक परिवहन थांबे नकाशावर दाखवा</string>
   <string name="show_transport_over_map">परिवहन थांबे दाखवा</string>
   <string name="search_history_city">शहर: {0}</string>
@@ -263,7 +263,7 @@
   <string name="use_online_routing">ऑनलाइन दिशादर्शन वापरा</string>
   <string name="data_settings">डेटा</string>
   <string name="additional_settings">आधिक सेटिंग्स</string>
-  <string name="settings">सेटिंग्स</string>
+  <string name="shared_string_settings">सेटिंग्स</string>
   <string name="update_tile">नकाशा अपडेट करा</string>
   <string name="favourites_activity">आवडती ठिकाणे</string>
   <string name="add_to_favourite">आवडत्या ठिकणात नोंद करा</string>
@@ -308,9 +308,9 @@
   <string name="context_menu_item_add_favorite">आवडत्या ठिकणात नोंद करा</string>
   <string name="context_menu_item_update_map">नकाशा अपडेट करा</string>
   <string name="context_menu_item_create_poi">पिओआय तयार करा</string>
-  <string name="default_buttons_yes">हो</string>
-  <string name="default_buttons_cancel">रद्द करा</string>
-  <string name="default_buttons_no">नाही</string>
+  <string name="shared_string_yes">हो</string>
+  <string name="shared_string_cancel">रद्द करा</string>
+  <string name="shared_string_no">नाही</string>
   <string name="favourites_context_menu_edit">आवडते ठिकण बदला</string>
   <string name="favourites_context_menu_delete">आवडते ठिकाण काढून टाका</string>
   <string name="poi_edit_title">पिओआय बदला</string>
diff --git a/OsmAnd/res/values-nb/bidforfix.xml b/OsmAnd/res/values-nb/bidforfix.xml
index dade9abe1e..61f1581515 100644
--- a/OsmAnd/res/values-nb/bidforfix.xml
+++ b/OsmAnd/res/values-nb/bidforfix.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="bidforfix_loading">Laster</string>
-    <string name="bidforfix_supporters">%1$d Støttespillere</string>
+    <string name="bidforfix_supporters">%1$d støttespillere</string>
 	<string name="bidforfix_funded">finansiert: %d%%</string>    
 </resources>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 6e7c79f7f0..e792eae81b 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -126,14 +126,14 @@
 	<string name="show_ruler_level">Vis målestokk</string>
 	<string name="info_button">Info</string>
 	<string name="back_to_location">Tilbake til posisjon</string>
-	<string name="help">Hjelp</string>
+	<string name="shared_string_help">Hjelp</string>
 	<string name="show_details">Vis detaljer</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="accessibility_on">På</string>
-	<string name="accessibility_off">Av</string>
+	<string name="shared_string_on">På</string>
+	<string name="shared_string_off">Av</string>
 	<string name="accessibility_default">Ifølge den globale systeminnstillingen</string>
 	<string name="backToMenu">Tilbake til meny</string>
 	<string name="zoomOut">Zoom ut</string>
@@ -355,8 +355,8 @@
 	<string name="tip_initial">Hjelp</string>
 	<string name="tip_initial_t">"OsmAnd er et navigeringsprogram med mange funksjoner.
 \n\nSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "</string>
-	<string name="next_button">Neste</string>
-	<string name="previous_button">Forrige</string>
+	<string name="shared_string_next">Neste</string>
+	<string name="shared_string_previous">Forrige</string>
 	<string name="unit_of_length_descr">Endre lengde- og hastighetsenhet</string>
 	<string name="unit_of_length">Måleenhet</string>
 	<string name="si_km_m">Kilometer/meter</string>
@@ -386,7 +386,7 @@
 	<string name="indexing_map">Indekserer kart…</string>
 	<string name="indexing_poi">Indekserer interessepunkt…</string>
 	<string name="indexing_transport">Indekserer transport…</string>
-	<string name="input_output_error">I/O feil oppstod</string>
+	<string name="shared_string_io_error">I/O feil oppstod</string>
 	<string name="km">km</string>
 	<string name="km_h">km/t</string>
 	<string name="m">m</string>
@@ -474,7 +474,7 @@
 	<string name="transport_Routes">Ruter</string>
 	<string name="transport_route_distance">Reiserutedistanse</string>
 	<string name="transport">Transport</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">Vis stoppesteder for offentlig transport på kart</string>
 	<string name="show_transport_over_map">Vis stoppesteder</string>
 	<string name="hello">Navigeringsprogrammet OsmAnd</string>
@@ -486,7 +486,7 @@
 	<string name="search_history_building">Bygning: {0}, {1}, {2}</string>
 	<string name="favorite">Favoritt</string>
 	<string name="clear_all">Slett alle</string>
-	<string name="history">Historikk</string>
+	<string name="shared_string_history">Historikk</string>
 	<string name="uploading_data">Laster opp data…</string>
 	<string name="uploading">Laster opp…</string>
 	<string name="search_nothing_found">Ingenting funnet</string>
@@ -522,7 +522,7 @@
 	<string name="opening_hours">Åpningstider</string>
 	<string name="poi">Interessepunkt</string>
 	<string name="additional_settings">Tilleggsinnstillinger</string>
-	<string name="settings">Innstillinger</string>
+	<string name="shared_string_settings">Innstillinger</string>
 	<string name="save_current_track_descr">Lagre gjeldende spor til SD nå</string>
 	<string name="save_current_track">Lagre gjeldende GPX-spor</string>
 	<string name="save_track_interval">Loggeintervall under navigering</string>
@@ -599,11 +599,11 @@
 	<string name="context_menu_item_update_map">Oppdater kart</string>
 	<string name="context_menu_item_open_bug">Åpne OSM-feil</string>
 	<string name="context_menu_item_create_poi">Opprett interessepunkt</string>
-	<string name="default_buttons_yes">Ja</string>
-	<string name="default_buttons_cancel">Avbryt</string>
+	<string name="shared_string_yes">Ja</string>
+	<string name="shared_string_cancel">Avbryt</string>
 	<string name="default_buttons_apply">Bruk</string>
 	<string name="default_buttons_add">Legg til</string>
-	<string name="default_buttons_no">Nei</string>
+	<string name="shared_string_no">Nei</string>
 	<string name="add_favorite_dialog_top_text">Oppfør favorittnavn</string>
 	<string name="add_favorite_dialog_default_favourite_name">Favoritt</string>
 	<string name="add_favorite_dialog_favourite_added_template">Favorittpunkt \'\'{0}\'\' ble vellykket lagt til.</string>
@@ -715,8 +715,8 @@
     <string name="animate_routing_gpx">Simuler med et GPX-spor</string>
     <string name="remember_choice">Husk mitt valg</string>
     <string name="gps_status_eclipsim">GPS-status</string>
-    <string name="default_and">og</string>
-    <string name="default_or">eller</string>
+    <string name="shared_string_and">og</string>
+    <string name="shared_string_or">eller</string>
 	<string name="lang_en">Engelsk</string>
 	<string name="lang_af">Afrikaans</string>
 	<string name="lang_hy">Armensk</string>
@@ -822,7 +822,7 @@
     <string name="lang_he">Hebraisk</string>
     <string name="rendering_attr_hideText_name">Skjul tekst</string>
     <string name="visible_element">Vis på kart</string>
-    <string name="switch_to_raster_map_to_see">Ingen offline-vektorkart foreligger for dette stedet. Du kan laste ned et kart i Innstillinger (Karthåndtering), eller skifte til nettbaserte kart (aktiver programtillegg for online-kart for dette).</string>
+    <string name="switch_to_raster_map_to_see">Ingen offline-vektorkart foreligger for dette stedet. Du kan laste ned et kart i Innstillinger (Karthåndtering), eller skifte til nettbaserte kart (aktiver programtillegg for nettbaserte kart for dette).</string>
 	<string name="rendering_category_others">Andre kartattributter</string>
     <string name="av_control_start">Start</string>
     <string name="save_route_as_gpx">Lagre rute som GPX-fil</string>
@@ -845,7 +845,7 @@
     <string name="rendering_attr_hideBuildings_name">Skjul bygninger</string>
     <string name="osmand_parking_warning">Varsel</string>
 	<string name="wake_on_voice_descr">Slå på enhetens skjerm (hvis av) når du nærmer deg en sving</string>
-    <string name="wake_on_voice_never">Aldri</string>
+    <string name="shared_string_never">Aldri</string>
     <string name="search_radius_proximity">I nærhet av</string>
     <string name="speed_limit_exceed_message">Velg toleransemargin for fartsgrense, overskrides denne vil du få talevarsel.</string>
 	<string name="fav_point_dublicate">Duplisering av favorittpunktnavn</string>
@@ -984,8 +984,8 @@
 	<string name="lang_zh_TW">Tradisjonell kinesisk</string>
 	<string name="keep_and_add_destination_point">Legg til som målpunkt</string>
     <string name="select_gpx">Velg GPX…</string>
-    <string name="route_descr_select_on_map">Velg på kart…</string>
-    <string name="route_descr_favorite">Favoritt…</string>
+    <string name="shared_string_select_on_map">Velg på kart…</string>
+    <string name="shared_string_favorite">Favoritt…</string>
     <string name="route_preferences">Ruteinnstillinger</string>
     <string name="route_info">Ruteinformasjon</string>
     <string name="calculate_osmand_route_gpx">Beregn OsmAnd offline-rute</string>
@@ -1078,7 +1078,7 @@
 	<string name="download_tab_downloads">Alle nedlastinger</string>
     <string name="download_tab_updates">Oppdateringer</string>
     <string name="no_internet_connection">Ikke mulig å laste ned, kontroller internettforbindelsen.</string>
-    <string name="dismiss">Avvis</string>
+    <string name="shared_string_dismiss">Avvis</string>
     <string name="everything_up_to_date">Alle filer er oppdaterte</string>
     <string name="use_opengl_render">Bruk OpenGL-opptegning</string>
     <string name="use_opengl_render_descr">Bruk maskinvareakselerert OpenGL-opptegning (virker kanskje ikke på enkelte enheter)</string>
@@ -1222,4 +1222,34 @@
 	<string name="photo">Foto</string>
 	<string name="rename_recording">Endre navn på opptak</string>
     <string name="anonymous_user">Anonym bruker</string>
-    </resources>
+    <string name="user_name_descr">Trengs for bidrag til openstreetmap.org</string>
+	<string name="user_password_descr">Trengs for bidrag til openstreetmap.org</string>
+	<string name="download_files_not_enough_space">Det er ikke nok ledig plass til å laste ned %1$s MB (ledig: %2$s).</string>
+	<string name="download_files_question_space">Ledig plass nå {2} MB! Laste ned {0} fil(er) ({1} MB)?</string>
+	<string name="auto_follow_route_navigation">Auto-sentrer bare navigering</string>
+	<string name="auto_follow_route_navigation_descr">Auto-sentrer kartvisning bare under navigering.</string>
+	<string name="auto_follow_location_enabled">Auto-sentrer kartvisning i bruk.</string>
+	<string name="pref_vector_rendering">Spesifikke alternativer for vektoropptegning</string>
+	<string name="local_index_mi_upload_gpx">Send til OSM</string>
+	<string name="shared_string_none">Ingen</string>
+	<string name="tile_source_already_installed">Kart er allerede installert, innstillinger blir oppdatert</string>
+	<string name="select_tile_source_to_install">Velg (flis)kart å installere eller oppdatere</string>
+	<string name="internet_not_available">En internettforbindelse kreves for denne operasjonen, men er ikke tilgjengelig</string>
+	<string name="reading_cached_tiles">Leser hurtigbufrede fliser…</string>
+	<string name="maps_could_not_be_downloaded">Dette kartet kan ikke lastes ned</string>
+	<string name="use_high_res_maps">Høyoppløselig visning</string>
+	<string name="layer_gpx_layer">GPX-spor…</string>
+	<string name="sd_unmounted">SD-kort er ikke tilgjengelig.\nDu vil ikke kunne se kart eller finne ting.</string>
+	<string name="sd_mounted_ro">SD-kort er skrivebeskyttet.\nDu kan bare se det forhåndslastede kartet og kan ikke laste ned fra internett.</string>
+	<string name="transport_finish_search">Avslutt søk</string>
+	<string name="transport_stop_to_go_out">Velg stoppested for avstigning</string>
+	<string name="failed_op">feilet</string>
+	<string name="osm_settings_descr">Spesifiser innstillinger for Openstreetmap.org (OSM) som er nødvendige for bidrag til OSM</string>
+	<string name="shared_string_disabled">Deaktivert</string>
+	<string name="shared_string_enabled">Aktivert</string>
+	<string name="shared_string_enable">Aktiver</string>
+	<string name="shared_string_disable">Deaktiver</string>
+	<string name="plugin_description_title">Beskrivelse</string>
+	<string name="plugin_settings_button_caption">Innstillinger</string>
+	<string name="plugin_install_needs_network">Du trenger en internettforbindelse for å installere dette programtillegget.</string>
+	</resources>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index 6bcfad57f5..336e62377c 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -26,8 +26,8 @@
 	<string name="poi_antiques_shop">Antiekwinkel</string>
 	<string name="poi_art_shop">Galerie</string>
 	<string name="poi_baby_goods">Babywinkel</string>
-	<string name="poi_bag_shop">Tassenwinkel</string>
-	<string name="poi_bathroom_furnishing_shop">Badkamermeubelwinkel</string>
+	<string name="poi_bag_shop">Lederwaren</string>
+	<string name="poi_bathroom_furnishing_shop">Sanitairwinkel</string>
 	<string name="poi_bed_shop">Beddenwinkel</string>
 	<string name="poi_boutique">Modezaak</string>
 	<string name="poi_carpet_shop">Tapijtwinkel</string>
@@ -56,19 +56,19 @@
 	<string name="poi_general_shop">Winkel in diverse goederen</string>
 	<string name="poi_herbalist">Kruidenierszaak</string>
 	<string name="poi_hifi_shop">Hi-Fi-winkel</string>
-	<string name="poi_houseware_shop">Huishoudelijke winkel</string>
+	<string name="poi_houseware_shop">Huishoudzaak</string>
 	<string name="poi_hunting_shop">Jachtwinkel</string>
 	<string name="poi_interior_decoration_shop">Interieurdecoratiewinkel</string>
 	<string name="poi_jewelry_shop">Juwelier</string>
 	<string name="poi_kiosk">Kiosk</string>
-	<string name="poi_kitchen_shop">Keukengereiwinkel</string>
+	<string name="poi_kitchen_shop">Kookwinkel</string>
 	<string name="poi_mobile_phone_shop">Mobiele telefoon-winkel</string>
 	<string name="poi_motorcycle_shop">Motorwinkel</string>
 	<string name="poi_musical_instrument_shop">Muziekinstrumentenwinkel</string>
 	<string name="poi_newsagent_shop">Persagentschap</string>
 	<string name="poi_optician_shop">Opticien</string>
 	<string name="poi_organic_shop">Biologische voedingswinkel</string>
-	<string name="poi_outdoor_shop">Outdoor-winkel</string>
+	<string name="poi_outdoor_shop">Buitensportwinkel</string>
 	<string name="poi_paint_shop">Verfwinkel</string>
 	<string name="poi_pet_shop">Dierenwinkel</string>
 	<string name="poi_radiotechnics_shop">Radiotechnics-winkel</string>
@@ -345,7 +345,7 @@
 	<string name="poi_gardener">Tuinier</string>
 	<string name="poi_locksmith">Slotenmaker</string>
 	<string name="poi_jeweller">Juwelier</string>
-	<string name="poi_key_cutter">Sleutelsnijder</string>
+	<string name="poi_key_cutter">Slotenmaker</string>
 	<string name="poi_optician">Opticien</string>
 	<string name="poi_painter">Schilder</string>
 	<string name="poi_photographer">Fotograaf</string>
@@ -376,7 +376,7 @@
 	<string name="poi_accountant">Accountant</string>
 	<string name="poi_cave_entrance">Grot-ingang</string>
 	<string name="poi_peak">Bergtop</string>
-	<string name="poi_saddle"/>
+	<string name="poi_saddle">Zadel</string>
 	<string name="poi_volcano">Vulkaan</string>
 	<string name="poi_crater">Krater</string>
 	<string name="poi_ridge">Bergrug</string>
@@ -557,7 +557,7 @@
 	<string name="poi_osmwiki">Wikipedia</string>
 	<string name="poi_user_defined_other">door de gebruiker gedefinieerd</string>
 	
-	<string name="poi_farm">boerderijwinkel</string>
+	<string name="poi_farm">Boerderijwinkel</string>
 	<string name="poi_wine">Wijnhandel</string>
 
 	<string name="poi_child_clothes_shop">Kinderkleding</string>
@@ -568,4 +568,121 @@
 	<string name="poi_halt">Station</string>
 	<string name="poi_railway_buffer_stop">Spoor stootblok</string>
 	<string name="poi_orienteering">Oriëntatieloop</string>
+	<string name="poi_paragliding">Parapenten</string>
+	<string name="poi_pelota">Pelota vasca</string>
+	<string name="poi_racquet">Squash</string>
+	<string name="poi_military_naval_base">Militaire marinebasis</string>
+	<string name="poi_man_made">Kunstmatig</string>
+	<string name="poi_service">Dienst</string>
+	<string name="poi_rugby_union">Rugby unie</string>
+	<string name="poi_rugby_league">Rugby competitie</string>
+	<string name="poi_team_handball">Handbal</string>
+	<string name="poi_toboggan">Rodelen</string>
+	<string name="poi_artwork">Kunst</string>
+	<string name="poi_boundary_stone">Grenspaal</string>
+	<string name="poi_rune_stone">Rune steen</string>
+	<string name="poi_lodging">Accommodatie</string>
+	<string name="poi_apartment">Appartement</string>
+
+	<string name="poi_internet_access_wlan">Internet toegang: wlan of wifi</string>
+	<string name="poi_internet_access_terminal">Internet toegang: internet computer</string>
+	<string name="poi_internet_access_wired">Internet toegang: bedraad</string>
+	<string name="poi_internet_access_public">Internet toegang: openbaar</string>
+	<string name="poi_internet_access_service">Internet toegang: dienst</string>
+	
+	<string name="poi_wayside_cross">Wegkruis</string>
+	<string name="poi_wayside_shrine">Odsey schrijn</string>
+	<string name="poi_tourism_information">VVV</string>
+	<string name="poi_viewpoint">Uitzicht</string>
+	<string name="poi_camp_site">Kampeerplaats</string>
+	<string name="poi_caravan_site">Caravanterrein</string>
+	<string name="poi_picnic_site">Picknickplaats</string>
+	<string name="poi_food_court">Eetplein</string>
+	<string name="poi_drinking_water">Drinkwater</string>
+	<string name="poi_agricultural_engines_craft">Landbouwmachines</string>
+	<string name="poi_carpet_layer">Stoffeerder</string>
+	<string name="poi_caterer">Traiteur</string>
+	<string name="poi_clockmaker">Horlogemaker</string>
+	<string name="poi_dressmaker">Kleermaker</string>
+	<string name="poi_glaziery_craft">Glasblazer</string>
+	<string name="poi_handicraft">Hobby- en handwerk</string>
+	<string name="poi_hvac">Loodgieters en installatie bedrijf</string>
+	<string name="poi_insulation_craft">Isolatiebedrijf</string>
+	<string name="poi_metal_construction_craft">Metaalconstructiebedrijf</string>
+	<string name="poi_parquet_layer">Parketteur</string>
+	<string name="poi_pottery_craft">Pottenbakkerij</string>
+	<string name="poi_sailmaker">Zeilmaker</string>
+	<string name="poi_sawmill">Houtzagerij</string>
+	<string name="poi_scaffolder">Steigerbouwer</string>
+	<string name="poi_sculptor">Beeldhouwer</string>
+	<string name="poi_stand_builder">Standbouwer</string>
+	<string name="poi_stonemason">Steenhouwer</string>
+	<string name="poi_sun_protection_craft">Buitensportwinkel</string>
+	<string name="poi_sweep">Vegen</string>
+	<string name="poi_tiler">Tegelzetter</string>
+	<string name="poi_tinsmith">Tingieter</string>
+	<string name="poi_upholsterer">Stoffeerder</string>
+	<string name="poi_watchmaker">Horlogemaker</string>
+	<string name="poi_window_construction">Vensterbouw</string>
+
+	<string name="poi_funeral_directors">Begrafenisondernemers</string>
+	<string name="poi_computer_craft">Computerwinkel</string>
+	<string name="poi_dry_cleaning">Stomerij</string>
+	<string name="poi_laundry">Wasserette</string>
+	<string name="poi_car_sharing">Autodelen</string>
+	<string name="poi_boat_sharing">Boot delen</string>
+	<string name="poi_money_lender">Kredietvertrekker</string>
+	<string name="poi_pawnbroker">Pandjesbaas</string>
+	<string name="poi_currencyexchange">Geldwisselkantoor</string>
+	<string name="poi_bitcoin_yes">Bitcoin betaling</string>
+
+	<string name="poi_stone">Natuursteen</string>
+	<string name="poi_cape">Kaap</string>
+	<string name="poi_strait">Zeestraat</string>
+	<string name="poi_seamark_anchorage">Ankerplaats</string>
+	<string name="poi_seamark_anchor_berth">Aanlegplaats</string>
+	<string name="poi_seamark_beacon">Baken</string>
+	<string name="poi_seamark_beacon_cardinal">Kardinale markering</string>
+	<string name="poi_seamark_beacon_lateral">Laterale betonning</string>
+	<string name="poi_seamark_beacon_safe_water">Betonning voor veilig vaarwater</string>
+	<string name="poi_seamark_beacon_special_purpose">Speciale betonning</string>
+	<string name="poi_seamark_berth">Ligplaats</string>
+	<string name="poi_seamark_building">Zeemarkering: gebouw</string>
+	<string name="poi_seamark_bridge">Zeemarkering: brug</string>
+	<string name="poi_seamark_buoy_cardinal">Kardinale boei</string>
+	<string name="poi_seamark_buoy_installation">Aanmeer boei</string>
+	<string name="poi_seamark_buoy_isolated_danger">Betonning voor geïsoleerd gevaar</string>
+	<string name="poi_seamark_buoy_lateral">Laterale boei</string>
+	<string name="poi_seamark_buoy_safe_water">Midvaarwaterboei</string>
+	<string name="poi_seamark_buoy_special_purpose">Speciale betonning</string>
+	<string name="poi_seamark_daymark">Dagmerk</string>
+	<string name="poi_seamark_distance_mark">Afstand markering</string>
+	<string name="poi_seamark_dry_dock">Drookdok</string>
+	<string name="poi_seamark_floating_dock">Drijvend dok</string>
+	<string name="poi_seamark_fog_signal">Misthoorn</string>
+	<string name="poi_seamark_harbour_basin">Havenkom</string>
+	<string name="poi_seamark_landmark">Herkenningspunt</string>
+	<string name="poi_seamark_light">Zeemarkering: lichtbaken</string>
+	<string name="poi_seamark_light_major">Zeemarkering: wallicht</string>
+	<string name="poi_seamark_light_minor">Zeemarkering: lichtopstand</string>
+	<string name="poi_seamark_light_float">Zeemarkering: lichtboei</string>
+	<string name="poi_seamark_light_vessel">Zeemarkering: lichtschip</string>
+	<string name="poi_seamark_mooring">Aanlegplaats</string>
+	<string name="poi_seamark_notice">Zeemarkering: opmerking</string>
+	<string name="poi_seamark_pile">Aanlegpaal</string>
+	<string name="poi_seamark_radar_transponder">Zeemarkering: radartransponder</string>
+	<string name="poi_seamark_radio_station">Zeemarkering: radio baken</string>
+	<string name="poi_seamark_signal_station_traffic">Zeemarkering: verkeerssignaal station</string>
+	<string name="poi_seamark_signal_station_warning">Zeemarkering: waarschuwingssignaal station</string>
+	<string name="poi_seamark_small_craft_facility">Pleziervaartuig voorziening</string>
+	<string name="poi_seamark_topmark">Zeemarkering: top-markering</string>
+	<string name="poi_seamark_rock">Zeemarkering: Rotsen</string>
+	<string name="poi_seamark_wreck">Zeemarkering: wrak</string>
+
+	<string name="poi_military_landuse">Militaire zone</string>
+	<string name="poi_military_airfield">Militair vliegveld</string>
+	<string name="poi_military_bunker">Militaire bunker</string>
+	<string name="poi_military_barracks">Kazerne</string>
+	<string name="poi_military_danger_area">Gevaarlijke gebied</string>
+	<string name="poi_military_range">Militaire schietbaan</string>
 	</resources>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index dc9d8a69c4..1a2417e0b3 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   
   <string name="layer_map_appearance">Configureer scherm</string>
@@ -43,14 +43,11 @@
   <string name="show_ruler_level">Schaalaanduiding weergeven</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Terug naar locatie</string>
-  <string name="help">Help</string>
   <string name="show_details">Toon details</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_on">Aan</string>
-  <string name="accessibility_off">Uit</string>
   <string name="accessibility_default">Gelijk aan systeeminstelling</string>
   <string name="backToMenu">Terug naar menu</string>
   <string name="zoomOut">Zoom uit</string>
@@ -276,7 +273,7 @@
   
   
   
-<string name="local_index_installed">Editie</string>
+<string name="local_index_installed">Lokale versie</string>
   <string name="local_index_items_backuped">%1$d van %2$d bestanden succesvol gedeactiveerd.</string>
   <string name="local_index_items_deleted">%1$d van %2$d bestanden succesvol verwijderd.</string>
   <string name="local_index_items_restored">%1$d van %2$d bestanden succesvol geactiveerd.</string>
@@ -344,7 +341,6 @@
   <string name="map_underlay">Underlay kaart</string>
   <string name="map_underlay_descr">Kies underlay-kaart</string>
   <string name="layer_overlay">Overlay-kaart…</string>
-  <string name="default_none">Geen</string>
   <string name="map_overlay">Overlay kaart</string>
   <string name="map_overlay_descr">Kies overlay-kaart</string>
   <string name="tile_source_already_installed">Kaart is al geïnstalleerd, instellingen worden geactualiseerd</string>
@@ -401,8 +397,6 @@
 	</string>
   <string name="tip_initial">Help</string>
   <string name="tip_initial_t">"OsmAnd is een navigatieprogramma met vele mogelijkheden.\n\nEen inleiding, tips en hulp zijn te vinden onder \'Menu\' → \'Help\', in het kaartscherm. "</string>
-  <string name="next_button">Volgende</string>
-  <string name="previous_button">Vorige</string>
   <string name="unit_of_length_descr">Wijzig eenheden van afstand en snelheid</string>
   <string name="unit_of_length">Eenheid van afstand</string>
   <string name="si_mi_foots">Mijlen/voeten</string>
@@ -445,7 +439,6 @@
   <string name="indexing_map">Kaart wordt geïndexeerd…</string>
   <string name="indexing_poi">Interessepunten worden geïndexeerd…</string>
   <string name="indexing_transport">OV wordt geïndexeerd…</string>
-  <string name="input_output_error">Datatransportfout opgetreden</string>
   <string name="km">km</string>
   <string name="km_h">km/u</string>
   <string name="m">m</string>
@@ -474,7 +467,7 @@
   <string name="loading_builds">OsmAnd-versies worden geladen…</string>
   <string name="select_build_to_install">Kies een OsmAnd-versie om te installeren</string>
   <string name="contribution_activity">Installeer versie</string>
-  <string name="gps_status_app_not_found">GPS Status is niet geïnstalleerd. Zoeken op Market?</string>
+  <string name="gps_status_app_not_found">GPS-status applicatie is niet geïnstalleerd. Zoeken op Market?</string>
   <string name="voice_is_not_available_msg">Stembegeleiding is niet aanwezig. Ga naar instellingen, kies een pakket stem-gegevens, en download het.</string>
   <string name="voice_is_not_available_title">Geen stem-begeleiding geselecteerd</string>
   <string name="daynight_mode_day">Dag</string>
@@ -625,7 +618,6 @@
   <string name="transport_stops_to_pass">Aantal haltes te gaan</string>
   <string name="transport_route_distance">Lengte van route</string>
   <string name="transport">Openbaar vervoer</string>
-  <string name="default_buttons_ok">OK</string>
   <string name="show_transport_over_map_description">Toon haltes openbaar vervoer op kaart</string>
   <string name="show_transport_over_map">Toon haltes openbaar vervoer</string>
   <string name="hello">Navigatieprogamma OsmAnd</string>
@@ -642,7 +634,6 @@
   <string name="search_history_building">Gebouw: {0}, {1}, {2}</string>
   <string name="favorite">Favoriet</string>
   <string name="clear_all">Wis alles</string>
-  <string name="history">Geschiedenis</string>
   <string name="uploading_data">Gegevens uploaden…</string>
   <string name="uploading">Uploaden…</string>
   <string name="search_nothing_found">Niets gevonden</string>
@@ -720,7 +711,6 @@
   <string name="auto_zoom_map_descr">Kaart automatisch zoomen naargelang de snelheid</string>
   <string name="auto_zoom_map">Kaart automatisch zoomen</string>
   <string name="additional_settings">Extra instellingen</string>
-  <string name="settings">Instellingen</string>
   <string name="save_current_track_descr">Huidige track nu op SD-kaart opslaan</string>
   <string name="save_current_track">Huidige GPX-track opslaan</string>
   <string name="save_track_interval">Registratie-interval bij navigatie</string>
@@ -801,11 +791,8 @@
   <string name="context_menu_item_update_map">Kaart bijwerken</string>
   <string name="context_menu_item_open_bug">Meld fout in OpenStreetMap</string>
   <string name="context_menu_item_create_poi">Maak interessepunt in OSM</string>
-  <string name="default_buttons_yes">Ja</string>
-  <string name="default_buttons_cancel">Annuleer</string>
   <string name="default_buttons_apply">Toepassen</string>
   <string name="default_buttons_add">Voeg toe</string>
-  <string name="default_buttons_no">Nee</string>
   <string name="add_favorite_dialog_top_text">Geef de favoriet een naam</string>
   <string name="add_favorite_dialog_default_favourite_name">Favoriet</string>
   <string name="add_favorite_dialog_favourite_added_template">Favoriet \'\'{0}\'\' is toegevoegd.</string>
@@ -1579,8 +1566,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="auto_zoom_close">Zoom naar close-up</string>
     <string name="auto_zoom_far">Zoom naar gemiddelde afstand</string>
     <string name="auto_zoom_farthest">Zoom naar grote afstand</string>
-    <string name="default_and">en</string>
-    <string name="default_or">of</string>
 	<string name="remember_choice">Onthoud mijn keuze</string>
     <string name="gps_status_eclipsim">GPS status</string>
     <string name="animate_routing_route_not_calculated">Eerst de route laten berekenen alsjeblieft</string>
@@ -1632,8 +1617,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="routing_attr_weight_name">Gewicht voertuig</string>
 	<string name="select_gpx">GPX-bestand kiezen…</string>
     <string name="route_descr_select_destination">Bestemming kiezen</string>
-    <string name="route_descr_select_on_map">Kies op de kaart…</string>
-    <string name="route_descr_favorite">Favoriet…</string>
     <string name="route_preferences">Route-voorkeuren</string>
     <string name="route_info">Route-informatie</string>
     <string name="keep_and_add_destination_point">Toevoegen als bestemming</string>
@@ -1847,7 +1830,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="gpx_wpt">Routepunt</string>
     <string name="selected_gpx_info_show">\n\nLang drukken om op de kaart te bekijken</string>
     <string name="delay_navigation_start">Start navigatie automatisch</string>
-    <string name="selected">gekozen</string>
     <string name="gpx_split_interval">Splits om de</string>
     <string name="gpx_info_waypoints">Routepunten: %1$s </string>
 	<string name="show_zoom_buttons_navigation_descr">Zoomknoppen tonen tijdens navigeren</string>
@@ -2001,7 +1983,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="select_impassable_road">Selecteer op kaart…</string>
     <string name="impassable_road">Vermijd wegen…</string>
     <string name="rendering_category_hide">Verberg</string>
-    <string name="wake_on_voice_never">Nooit</string>
     <string name="lock_screen_request_explanation">%1$s heeft toestemming nodig om het scherm uit te kunnen schakelen (als onderdeel van de stroombesparende functie).</string>
     <string name="advanced_settings">Geavanceerd</string>
 	<string name="osmo_use_https_descr">Gebruik beveiligde verbinding met server</string>
@@ -2016,7 +1997,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="use_opengl_render">Gebruik OpenGL</string>
     <string name="use_opengl_render_descr">Gebruik snelle, hardware-gebaseerde OpenGL weergave (werkt niet op alle apparaten)</string>
     <string name="error_avoid_specific_road">Er is geen alternatieve weg gevonden</string>
-    <string name="dismiss">Sluiten</string>
     <string name="no_internet_connection">Kan niet downloaden, gelieve uw internetverbinding na te kijken.</string>
     <string name="download_tab_downloads">Alle downloads</string>
     <string name="download_tab_updates">Updates</string>
@@ -2067,8 +2047,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="proxy_host_descr">Stel de hostname van je proxy in (bv. 127.0.0.1)</string>
 	<string name="proxy_port_title">Proxy-poort</string>
 	<string name="proxy_port_descr">Stel het poortnummer van je proxy in (bv. 8118)</string>
-	<string name="enable_plugin">Uitgezet</string>
-	<string name="disable_plugin">Aangezet</string>
 <string name="plugin_description_title">Omschrijving</string>
 	<string name="plugin_settings_button_caption">Instellingen</string>
 <string name="edit_group">Bewerk groep</string>
@@ -2076,10 +2054,8 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 <string name="plugin_nautical_name">Nautische kaartweergave</string>
     <string name="world_ski_missing">Om skikaarten te kunnen gebruiken, moet u de speciale offline skikaart downloaden</string>
     <string name="nautical_maps_missing">Om nautische kaarten te kunnen gebruiken, moet u de speciale offline nautische kaart downloaden</string>
-	<string name="enable_plugin2">Activeren</string>
-	<string name="disable_plugin2">Deactiveren</string>
 	<string name="get_plugin">Krijgen</string>
-<string name="currently_recording_track">Huidige opname track</string>
+<string name="currently_recording_track">Huidige route opname</string>
 	<string name="watch">Bekijk</string>
 	<string name="rendering_attr_pisteRoutes_name">Piste routes</string>
 	<string name="rendering_attr_pisteGrooming_name">Piste verzorging</string>
@@ -2090,7 +2066,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="plugin_nautical_descr">"Deze plug-in verrijkt de OsmAnd App met gegevens voor maken van nautische kaarten voor varen, zeilen, en andere vormen van watersport.\n\nDe speciale kaart add-on voor OsmAnd bied alle nautische navigatie kenmerken en kaartsymbolen, voor de binnenvaart en voor dicht voor de kust navigatie. De beschrijving van elke navigatie kenmerk levert de informatie die nodig is om hem te identificeren en over de betekenis (categorie, vorm, kleur, volgorde, referentie, enz.) ervan.\n\nOm terug te keren naar een van OsmAnd conventionele kaart stijlen, gewoon deze plug-in de-activeren, of verander de \'Kaart stijl\' onder \'Kaart instellen\'. "</string>
 	<string name="plugin_ski_name">Ski kaartweergave</string>
 	<string name="plugin_ski_descr">"Deze plug-in voor OsmAnd plaatst onder handbereik de details over skipistes, langlaufroutes, alpine ski routes, kabelbanen en skiliften wereldwijd. Routes en pistes worden getoond in een kleurcode naar moeilijkheidsgraad, en afgebeeld in een speciale \'Winter\' kaart stijl die een met sneeuw bedekt winterlandschap voorstelt.\n\nEen globale overzicht van alle skipistes en cross country ski routes voor deze weergave is beschikbaar onder Downloads als \'World ski-map\'.\n\nHet activeren van deze weergave verandert de kaart in stijl \'Winter en ski\', met alle kenmerken van het landschap onder winterse omstandigheden. Deze weergave kan worden teruggedraaid door ofwel het de-activeren van de plug-in, of door het veranderen van de \'Kaart stijl\' onder \'Kaart Instellen\'. "</string>
-	<string name="selected_tracks">Geselecteerd</string>
 	<string name="turn_off_all">Zet alles uit</string>
 	<string name="showed_on_map">Weergegeven op de kaart</string>
 	<string name="rename_failed">Hernoemen mislukt.</string>
@@ -2109,4 +2084,75 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="export">Exporteren</string>
 	<string name="route_points">Route punten</string>
 	<string name="days_behind">Achterstand</string>
+	<string name="shared_string_release">Vrijgegeven</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">OK</string>
+	<string name="shared_string_cancel">Annuleren</string>
+	<string name="shared_string_dismiss">Afwijzen</string>
+	<string name="shared_string_yes">Ja</string>
+	<string name="shared_string_no">Nee</string>
+	<string name="shared_string_on">Aan</string>
+	<string name="shared_string_off">Uit</string>
+	<string name="shared_string_previous">Vorige</string>
+	<string name="shared_string_next">Volgende</string>
+	<string name="shared_string_enable">Inschakelen</string>
+	<string name="shared_string_disable">Uitschakelen</string>
+	<string name="shared_string_enabled">Ingeschakeld</string>
+	<string name="shared_string_disabled">Uitgeschakeld</string>
+	<string name="shared_string_selected">Geselecteerd</string>
+	<string name="shared_string_selected_lowercase">geselecteerd</string>
+	<string name="shared_string_never">Nooit</string>
+	<string name="shared_string_none">Geen</string>
+	<string name="shared_string_and">en</string>
+	<string name="shared_string_or">of</string>
+	<string name="shared_string_help">Hulp</string>
+	<string name="shared_string_settings">Instellingen</string>
+	<string name="shared_string_history">Geschiedenis</string>
+	<string name="shared_string_select_on_map">Selecteer op de kaart</string>
+	<string name="shared_string_select_all">Selecteer alles</string>
+	<string name="shared_string_deselect">Deselecteren</string>
+	<string name="shared_string_deselect_all">Deselecteer alles</string>
+	<string name="shared_string_clear">Wis</string>
+	<string name="shared_string_clear_all">Wis alles</string>
+	<string name="shared_string_save">Opslaan</string>
+	<string name="shared_string_save_as_gpx">Opslaan als GPX-route</string>
+	<string name="shared_string_rename">Hernoem</string>
+	<string name="shared_string_delete">Verwijder</string>
+	<string name="shared_string_delete_all">Verwijder alles</string>
+	<string name="shared_string_share">Deel</string>
+	<string name="shared_string_add">Toevoegen</string>
+	<string name="shared_string_apply">Toepassen</string>
+	<string name="shared_string_control_start">Start</string>
+	<string name="shared_string_control_stop">Stop</string>
+	<string name="shared_string_import">Importeer</string>
+	<string name="shared_string_export">Exporteer</string>
+	<string name="shared_string_more">Meer</string>
+	<string name="shared_string_more_actions">Meer acties</string>
+	<string name="shared_string_do_not_show_again">Toon niet meer</string>
+	<string name="shared_string_remember_my_choice">Onthoud mijn keuze</string>
+	<string name="shared_string_refresh">Vernieuwen</string>
+	<string name="shared_string_download">Download</string>
+	<string name="shared_string_downloading">Aan het downloaden</string>
+	<string name="shared_string_download_successful">Download succesvol</string>
+	<string name="shared_string_io_error">I/O-fout opgetreden</string>
+	<string name="shared_string_unexpected_error">Onverwachte fout opgetreden</string>
+	<string name="shared_string_action_template">"Actie {0}"</string>
+	<string name="shared_string_close">Sluit</string>
+	<string name="shared_string_exit">Afsluiten</string>
+	<string name="shared_string_show">Toon</string>
+	<string name="shared_string_show_all">Toon alles</string>
+	<string name="shared_string_show_on_map">Toon op de kaart</string>
+	<string name="shared_string_map">Kaart</string>
+	<string name="shared_string_favorite">Favoriet</string>
+	<string name="shared_string_favorites">Favorieten</string>
+	<string name="shared_string_add_to_favorites">Voeg toe aan Favorieten</string>
+	<string name="shared_string_my_location">Mijn locatie</string>
+	<string name="shared_string_my_places">Mijn plaatsen</string>
+	<string name="shared_string_my_favorites">Mijn favorieten</string>
+	<string name="shared_string_my_tracks">Mijn routes</string>
+	<string name="shared_string_currently_recording_track">Huidige route wordt opgenomen</string>
+	<string name="shared_string_audio">Geluid</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Foto</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-nn/strings.xml b/OsmAnd/res/values-nn/strings.xml
index 0d6eebced8..58daf5c93c 100644
--- a/OsmAnd/res/values-nn/strings.xml
+++ b/OsmAnd/res/values-nn/strings.xml
@@ -45,7 +45,7 @@
     <string name="map_widget_plain_time">Gjeldande klokkeslett</string>
     <string name="gpx_wpt">Vegpunkt</string>
     <string name="selected_gpx_info_show">\n\nHald inne for å sjå på kartet</string>
-    <string name="selected">valt</string>
+    <string name="shared_string_selected_lowercase">valt</string>
     <string name="local_index_gpx_info_show">\n\nHald inne for å sjå val</string>
 	<string name="gpx_info_subtracks">Delspor: %1$s</string>
 	<string name="gpx_info_waypoints">Vegpunkt: %1$s</string>
@@ -139,8 +139,8 @@
     <string name="index_name_gb">Europa – Storbritannia</string>
     <string name="select_gpx">Vel GPX-fil …</string>
     <string name="route_descr_select_destination">Vel mål</string>
-    <string name="route_descr_select_on_map">Vel på kartet …</string>
-    <string name="route_descr_favorite">Favoritt …</string>
+    <string name="shared_string_select_on_map">Vel på kartet …</string>
+    <string name="shared_string_favorite">Favoritt …</string>
     <string name="route_info">Ruteinformasjon</string>
     <string name="routing_attr_short_way_name">Kortaste veg</string>
 	<string name="routing_attr_short_way_description">Bruk kortaste veg</string>
@@ -159,8 +159,8 @@
     <string name="app_mode_aircraft">Fly</string>
     <string name="tip_faq">Ofte spurde spørsmål</string>
     <string name="local_osm_changes_delete_all">Slett alt</string>
-    <string name="default_and">og</string>
-    <string name="default_or">eller</string>
+    <string name="shared_string_and">og</string>
+    <string name="shared_string_or">eller</string>
 	<string name="gps_status_eclipsim">GPS-status</string>
     <string name="base_world_map">Globalt grunnkart</string>
 	<string name="tip_map_styles">Kartstilar</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index c7afb904c7..1ae4c86429 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -144,7 +144,7 @@
   <string name="map_underlay">Mapa podstawowa</string>
   <string name="map_underlay_descr">Wybierz warstwę podstawową (underlay)</string>
   <string name="layer_overlay">Nakładka…</string>
-  <string name="default_none">Brak</string>
+  <string name="shared_string_none">Brak</string>
   <string name="map_overlay">Nakładka</string>
   <string name="map_overlay_descr">Wybierz nakładkę (overlay)</string>
   <string name="tile_source_already_installed">Mapa jest już zainstalowana, ustawienia zostaną zaktualizowane</string>
@@ -206,8 +206,8 @@
   <string name="tip_initial">Pomoc</string>
   <string name="tip_initial_t">"OsmAnd jest programem do nawigacji posiadającym wiele funkcji.
 \n\nPodstawowe porady, wskazówki dotyczące użytkowania i zaawansowana pomoc są dostępne po wybraniu \'Menu\' → \'Pomoc\' z ekranu mapy. "</string>
-  <string name="next_button">Następny</string>
-  <string name="previous_button">Wstecz</string>
+  <string name="shared_string_next">Następny</string>
+  <string name="shared_string_previous">Wstecz</string>
   <string name="unit_of_length_descr">Zmień jednostki długości i prędkości</string>
   <string name="unit_of_length">Jednostki długości</string>
   <string name="si_mi_foots">Mile/stopy</string>
@@ -250,7 +250,7 @@
   <string name="indexing_map">Indeksowanie map…</string>
   <string name="indexing_poi">Indeksowanie POI…</string>
   <string name="indexing_transport">Indeksowanie transportu…</string>
-  <string name="input_output_error">Wystąpił błąd wejścia/wyjścia</string>
+  <string name="shared_string_io_error">Wystąpił błąd wejścia/wyjścia</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -439,7 +439,7 @@
   <string name="transport_stops_to_pass">przystanków do przejechania</string>
   <string name="transport_route_distance">Długość trasy</string>
   <string name="transport">Transport publiczny</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Pokaż na mapie przystanki transportu publicznego</string>
   <string name="show_transport_over_map">Pokaż przystanki</string>
   <string name="hello">Program do nawigacji satelitarnej OsmAnd</string>
@@ -456,7 +456,7 @@
   <string name="search_history_building">Budynek: {0}, {1}, {2}</string>
   <string name="favorite">Ulubione</string>
   <string name="clear_all">Wyczyść wszystko</string>
-  <string name="history">Historia</string>
+  <string name="shared_string_history">Historia</string>
   <string name="uploading_data">Wysyłanie danych…</string>
   <string name="uploading">Wysyłanie…</string>
   <string name="search_nothing_found">Nic nie znaleziono</string>
@@ -539,7 +539,7 @@
   <string name="additional_settings">Dodatkowe ustawienia</string>
   <string name="settings_preset_descr">Widok mapy i ustawienia nawigacji zapamiętywane są dla każdego profilu użytkownika. Ustaw swój domyślny profil.</string>
   <string name="settings_preset">Domyślny profil</string>
-  <string name="settings">Ustawienia</string>
+  <string name="shared_string_settings">Ustawienia</string>
   <string name="save_current_track_descr">Zapisz bieżący ślad na karcie SD</string>
   <string name="save_current_track">Zapisz bieżący ślad</string>
   <string name="save_track_interval_descr">Wybierz czas pomiędzy sprawdzaniem pozycji przy nagrywaniu ścieżek podczas nawigacji</string>
@@ -622,11 +622,11 @@
   <string name="context_menu_item_update_map">Uaktualnij mapę</string>
   <string name="context_menu_item_open_bug">Zgłoś błąd do OSM</string>
   <string name="context_menu_item_create_poi">Utwórz POI</string>
-  <string name="default_buttons_yes">Tak</string>
-  <string name="default_buttons_cancel">Anuluj</string>
+  <string name="shared_string_yes">Tak</string>
+  <string name="shared_string_cancel">Anuluj</string>
   <string name="default_buttons_apply">Zastosuj</string>
   <string name="default_buttons_add">Dodaj</string>
-  <string name="default_buttons_no">Nie</string>
+  <string name="shared_string_no">Nie</string>
   <string name="add_favorite_dialog_top_text">Wprowadź nazwę</string>
   <string name="add_favorite_dialog_default_favourite_name">Ulubione</string>
   <string name="add_favorite_dialog_favourite_added_template">Punkt ulubiony \"{0}\" został pomyślnie dodany.</string>
@@ -729,14 +729,14 @@
   <string name="show_ruler_level">Wyświetl linijkę</string>
   <string name="info_button">Informacja</string>
   <string name="back_to_location">Powróć do pozycji</string>
-  <string name="help">Pomoc</string>
+  <string name="shared_string_help">Pomoc</string>
   <string name="show_details">Pokaż szczegóły</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">Włącz funkcje ułatwień dostępu</string>
-  <string name="accessibility_on">Włączone</string>
-  <string name="accessibility_off">Wyłączone</string>
+  <string name="shared_string_on">Włączone</string>
+  <string name="shared_string_off">Wyłączone</string>
   <string name="accessibility_default">Zgodnie z ustawieniami systemowymi urządzenia</string>
   <string name="backToMenu">Powrót do menu</string>
   <string name="zoomOut">Oddal</string>
@@ -1522,8 +1522,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="auto_zoom_close">Zbliżenie</string>
 	<string name="auto_zoom_far">Widok pośredni</string>
 	<string name="auto_zoom_farthest">Widok szeroki</string>
-	<string name="default_and">i</string>
-    <string name="default_or">lub</string>
+	<string name="shared_string_and">i</string>
+    <string name="shared_string_or">lub</string>
 	<string name="remember_choice">Zapamiętaj mój wybór</string>
     <string name="gps_status_eclipsim">GPS Status</string>
     <string name="animate_routing_route_not_calculated">Najpierw dokonaj przeliczenia trasy</string>
@@ -1576,8 +1576,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="routing_attr_weight_description">Określ ograniczenie masy pojazdu dozwolone na drodze</string>
     <string name="select_gpx">Wybierz GPX…</string>
     <string name="route_descr_select_destination">Wybierz cel podróży</string>
-    <string name="route_descr_select_on_map">Wybierz na mapie…</string>
-    <string name="route_descr_favorite">Ulubione…</string>
+    <string name="shared_string_select_on_map">Wybierz na mapie…</string>
+    <string name="shared_string_favorite">Ulubione…</string>
     <string name="route_preferences">Ustawienia trasy</string>
     <string name="route_info">Informacje o trasie</string>
     <string name="calculate_osmand_route_gpx">Przelicz trasę offline w OsmAnd</string>
@@ -1787,7 +1787,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="gpx_available_current_track">Zapisywanie bieżącej trasy</string>
     <string name="selected_gpx_info_show">\n\nNaciśnij i przytrzymaj, aby zobaczyć na mapie</string>
     <string name="delay_navigation_start">Rozpocznij nawigację automatycznie</string>
-    <string name="selected">wybrano</string>
+    <string name="shared_string_selected_lowercase">wybrano</string>
     <string name="gpx_split_interval">Interwał podziału</string>
     <string name="loading_smth">Wczytywanie %1$s…</string>
     <string name="map_widget_plain_time">Aktualny czas</string>
@@ -1945,7 +1945,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="rendering_attr_busRoutes_name">Trasy autobusowe</string>
     <string name="rendering_category_hide">Ukryj</string>
     <string name="lock_screen_request_explanation">%1$s potrzebuje uprawnień do wyłączenia ekranu dla funkcji oszczędzania energii.</string>
-    <string name="wake_on_voice_never">Nigdy</string>
+    <string name="shared_string_never">Nigdy</string>
     <string name="osmo_use_https_descr">Użyj bezpiecznego połączenia z serwerem</string>
     <string name="osmo_use_https">Użyj HTTPS</string>
 	<string name="advanced_settings">Zaawansowane</string>
@@ -1955,7 +1955,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="show_map">POKAŻ MAPĘ</string>
 	<string name="show_all">POKAŻ WSZYSTKIE</string>
 	<string name="coordinates">Współrzędne</string>
-	<string name="dismiss">Odrzuć</string>
+	<string name="shared_string_dismiss">Odrzuć</string>
     <string name="everything_up_to_date">Wszystkie pliki aktualne</string>
     <string name="use_opengl_render">Użyj renderowania OpenGL</string>
     <string name="use_opengl_render_descr">Użyj sprzętowego renderowania OpenGL (może nie działać na niektórych urządzeniach)</string>
@@ -1995,6 +1995,6 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="settings_privacy">Prywatność</string>
     <string name="my_location">Moja lokalizacja</string>
     <string name="osm_editing_manage">Zarządzaj</string>
-    <string name="enable_plugin">Włącz</string>
-	<string name="disable_plugin">Wyłącz</string>
+    <string name="shared_string_disabled">Włącz</string>
+	<string name="shared_string_enabled">Wyłącz</string>
 </resources>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 59a185495c..f8f8ba6ab3 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -24,7 +24,7 @@
   <string name="indexing_map">Indexando mapa…</string>
   <string name="indexing_poi">Indexando POI…</string>
   <string name="indexing_transport">Indexando transporte…</string>
-  <string name="input_output_error">Erro de entrada/saída</string>
+  <string name="shared_string_io_error">Erro de entrada/saída</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -203,7 +203,7 @@
   <string name="transport_stops_to_pass">paradas a passar</string>
   <string name="transport_route_distance">Distância da viagem</string>
   <string name="transport">Transportes</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Ver as paradas de transportes públicos no mapa</string>
   <string name="show_transport_over_map">Mostrar paradas de transportes</string>
   <string name="hello">Aplicação de navegação OsmAnd</string>
@@ -220,7 +220,7 @@
   <string name="search_history_building">Edifício : {0}, {1}, {2}</string>
   <string name="favorite">Favoritos</string>
   <string name="clear_all">Apagar tudo</string>
-  <string name="history">Histórico</string>
+  <string name="shared_string_history">Histórico</string>
   <string name="uploading_data">Enviando dados…</string>
   <string name="uploading">Enviando…</string>
   <string name="search_nothing_found">Não foi encontrado nada</string>
@@ -304,7 +304,7 @@
   <string name="additional_settings">Outras definições</string>
   <string name="settings_preset_descr">A vista de mapa e as definições de navegação são guardadas por perfil. Defina aqui o seu.</string>
   <string name="settings_preset">Perfil pré-definido</string>
-  <string name="settings">Configurações</string>
+  <string name="shared_string_settings">Configurações</string>
   <string name="save_current_track_descr">Salvar a trilha atual no cartão SD agora</string>
   <string name="save_current_track">Salvar a trilha atual</string>
   <string name="save_track_interval_descr">Escolher o intervalo entre posições nas trilhas</string>
@@ -384,11 +384,11 @@
   <string name="context_menu_item_update_map">Atualizar mapa</string>
   <string name="context_menu_item_open_bug">Reportar problema OSM</string>
   <string name="context_menu_item_create_poi">Criar ponto de interesse</string>
-  <string name="default_buttons_yes">Sim</string>
-  <string name="default_buttons_cancel">Cancelar</string>
+  <string name="shared_string_yes">Sim</string>
+  <string name="shared_string_cancel">Cancelar</string>
   <string name="default_buttons_apply">Aplicar</string>
   <string name="default_buttons_add">Adicionar</string>
-  <string name="default_buttons_no">Não</string>
+  <string name="shared_string_no">Não</string>
   <string name="add_favorite_dialog_top_text">Digite o nome do favorito</string>
   <string name="add_favorite_dialog_default_favourite_name">Favorito</string>
   <string name="add_favorite_dialog_favourite_added_template">O ponto \'\'{0}\'\' foi adicionado aos favoritos.</string>
@@ -508,14 +508,14 @@ Você pode ativar (on-line ou em cache) fontes azulejo mapa, configurações de
   <string name="show_ruler_level">Mostrar escala</string>
   <string name="info_button">Info</string>
   <string name="back_to_location">Back to location</string>
-  <string name="help">Ajuda</string>
+  <string name="shared_string_help">Ajuda</string>
   <string name="show_details">Mostrar detalhes</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="accessibility_on">Ligado</string>
-  <string name="accessibility_off">Desligado</string>
+  <string name="shared_string_on">Ligado</string>
+  <string name="shared_string_off">Desligado</string>
   <string name="accessibility_default">De acordo com a definição do sistema</string>
   <string name="backToMenu">Voltar ao menu</string>
   <string name="zoomOut">Afastar</string>
@@ -758,7 +758,7 @@ Você pode ativar (on-line ou em cache) fontes azulejo mapa, configurações de
   <string name="map_underlay">Mapa de camada inferior</string>
   <string name="map_underlay_descr">Escolha mapa da camada inferior</string>
   <string name="layer_overlay">Mapa da camada superior…</string>
-  <string name="default_none">Nenhum</string>
+  <string name="shared_string_none">Nenhum</string>
   <string name="map_overlay">Mapa da camada superior</string>
   <string name="map_overlay_descr">Escolha o mapa da camada superior</string>
   <string name="tile_source_already_installed">Mapa previamente instalado, as definições serão actualizadas</string>
@@ -823,8 +823,8 @@ Você pode ativar (on-line ou em cache) fontes azulejo mapa, configurações de
   <string name="tip_initial_t">OsmAnd é uma aplicação de navegação com muitos recursos.
  \n\n  Nas uma introdução básica , algumas dicas de uso e truques estão ligados via \'Menu \' → \' Dicas \' a partir da tela do mapa.
 	</string>
-  <string name="next_button">Próximo</string>
-  <string name="previous_button">Anterior</string>
+  <string name="shared_string_next">Próximo</string>
+  <string name="shared_string_previous">Anterior</string>
   <string name="unit_of_length_descr">Alterar unidades de medida de distância e velocidade</string>
   <string name="unit_of_length">Unidade de medida</string>
   <string name="si_mi_foots">Milhas/Pés</string>
@@ -1526,8 +1526,8 @@ Afeganistão , Albânia, Argélia , Andorra, Angola , Anguilla, Antígua e Barbu
     <string name="animate_routing_gpx">Simular usando caminho GPX</string>
     <string name="remember_choice">Memorizar escolha</string>
     <string name="gps_status_eclipsim">Estado do GPS</string>
-    <string name="default_and">e</string>
-    <string name="default_or">ou</string>
+    <string name="shared_string_and">e</string>
+    <string name="shared_string_or">ou</string>
 	<string name="route_is_too_long">A rota é, possivelmente, muito longa para ser calculada pelo router offline OsmAnd.
          → Em média, a rota off-line apenas é possível para distâncias até 200 km. Por favor adicione um ou mais pontos intermédios para calcular a rota.</string>
 	<string name="osmodroid_refresh">Atualizar canais</string>
@@ -1670,8 +1670,8 @@ Afeganistão , Albânia, Argélia , Andorra, Angola , Anguilla, Antígua e Barbu
     <string name="keep_and_add_destination_point">Adicionar como ponto de destino</string>
     <string name="select_gpx">Selecione GPX …</string>
     <string name="route_descr_select_destination">Selecionar destino</string>
-    <string name="route_descr_select_on_map">Seleccione no mapa…</string>
-    <string name="route_descr_favorite">Favorito …</string>
+    <string name="shared_string_select_on_map">Seleccione no mapa…</string>
+    <string name="shared_string_favorite">Favorito …</string>
     <string name="route_preferences">Preferências de rota</string>
     <string name="route_info">Informações de rota</string>
     <string name="routing_attr_prefer_motorway_name">Prefere auto-estradas</string>
@@ -1785,7 +1785,7 @@ Afeganistão , Albânia, Argélia , Andorra, Angola , Anguilla, Antígua e Barbu
     <string name="gpx_wpt">Ponto</string>
     <string name="selected_gpx_info_show">\n\nPressione e segure para ver no mapa</string>
     <string name="delay_navigation_start">Iniciar navegação com atraso</string>
-    <string name="selected">seleccionado</string>
+    <string name="shared_string_selected_lowercase">seleccionado</string>
     <string name="gpx_split_interval">Selecione intervalo de divisão</string>
     <string name="gpx_info_waypoints">Os pontos de passagem : %1$s </string>
 	<string name="gpx_info_distance">Distância: %1$s (%2$s pontos ) </string>
@@ -1866,7 +1866,7 @@ Afeganistão , Albânia, Argélia , Andorra, Angola , Anguilla, Antígua e Barbu
 	<string name="coordinates">Coordenadas</string>
 	<string name="rendering_attr_subwayMode_name">Rodas de metrô</string>
     <string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar a tela para economizar energia.</string>
-    <string name="wake_on_voice_never">Nunca</string>
+    <string name="shared_string_never">Nunca</string>
     <string name="select_impassable_road">Selecione o mapa…</string>
     <string name="impassable_road">Evitar estradas…</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Rota de trem</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 681de14120..1c3f999cd9 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
     <string name="tip_recent_changes_1_0_0_t">Modificări în versiunea 1.0.0 :
 \n\t* Rutare îmbunătățită, mai rapidă și mai exactă (până la 250 km)
@@ -279,14 +279,14 @@
 	<string name="show_ruler_level">Afișează scara hărții</string>	
 	<string name="info_button">Info</string>
 	<string name="back_to_location">Înapoi la poziție</string>
-	<string name="help">Ajutor</string>
+	<string name="shared_string_help">Ajutor</string>
 	<string name="show_details">Arată detaliile</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="accessibility_on">Pornit</string>
-	<string name="accessibility_off">Oprit</string>
+	<string name="shared_string_on">Pornit</string>
+	<string name="shared_string_off">Oprit</string>
 	<string name="accessibility_default">În concordanță cu setările dispozitivului</string>
 	<string name="backToMenu">Înapoi la meniu</string>
 	<string name="zoomOut">Micșorare</string>
@@ -601,7 +601,7 @@
 	<string name="map_underlay">Harta de dedesubt</string>
 	<string name="map_underlay_descr">Alegerea hărții pentru stratul inferior</string>
 	<string name="layer_overlay">Harta de deasupra…</string>
-	<string name="default_none">Niciuna</string>
+	<string name="shared_string_none">Niciuna</string>
 	<string name="map_overlay">Harta de deasupra</string>
 	<string name="map_overlay_descr">Alege harta de deasupra</string>
 	<string name="tile_source_already_installed">Harta este deja instalată, setările vor fi actualizate</string>
@@ -652,8 +652,8 @@
 	<string name="tip_initial">Ajutor</string>
 	<string name="tip_initial_t">"OsmAnd este o aplicație pentru navigare cu multe funcții.
 \n\nPentru început, găsiți câteva recomandări și instrucțiuni în pagina principala (vedeți icoana \'?\'). "</string>
-	<string name="next_button">Următorul</string>
-	<string name="previous_button">Precedentul</string>
+	<string name="shared_string_next">Următorul</string>
+	<string name="shared_string_previous">Precedentul</string>
 	<string name="unit_of_length_descr">Schimbă unitățile de măsură ale distanței și vitezei</string>
 	<string name="unit_of_length">Unități de măsură</string>
 	<string name="si_mi_foots">Mile/picioare</string>
@@ -696,7 +696,7 @@
 	<string name="indexing_map">Indexare hărți…</string>
 	<string name="indexing_poi">Indexare POI…</string>
 	<string name="indexing_transport">Indexare transport…</string>
-	<string name="input_output_error">A survenit o eroare de citire/scriere</string>
+	<string name="shared_string_io_error">A survenit o eroare de citire/scriere</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -870,7 +870,7 @@
 	<string name="transport_stops_to_pass">stații de parcurs</string>
 	<string name="transport_route_distance">Lungime itinerariu</string>
 	<string name="transport">Transport</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">Arată pe hartă stațiile mijloacelor de transport public</string>
 	<string name="show_transport_over_map">Arată stații transport public</string>
 	<string name="hello">Aplicația pentru navigare OsmAnd</string>
@@ -887,7 +887,7 @@
 	<string name="search_history_building">Număr: {0}, {1}, {2}</string>
 	<string name="favorite">Favorite</string>
 	<string name="clear_all">Șterge tot</string>
-	<string name="history">Istoric</string>
+	<string name="shared_string_history">Istoric</string>
 	<string name="uploading_data">Se încarcă date…</string>
 	<string name="uploading">Se încarcă…</string>
 	<string name="search_nothing_found">Nu s-a găsit nimic</string>
@@ -961,7 +961,7 @@
 	<string name="map_preferences_descr">Specificarea setărilor despre hartă: sursa, rotație, poziție, orientare ecran</string>
 	<string name="osm_settings">Editare OSM</string>
 	<string name="additional_settings">Setări adiționale</string>
-	<string name="settings">Setări</string>
+	<string name="shared_string_settings">Setări</string>
 	<string name="save_current_track_descr">Se salvează traseul curent pe cardul SD</string>
 	<string name="save_current_track">Salvează traseul GPX curent</string>
 	<string name="save_track_interval">Interval de salvare a poziției in timpul navigării</string>
@@ -1038,11 +1038,11 @@
 	<string name="context_menu_item_update_map">Actualizează hartă</string>
 	<string name="context_menu_item_open_bug">Deschide un Bug OSM</string>
 	<string name="context_menu_item_create_poi">Creează POI</string>
-	<string name="default_buttons_yes">Da</string>
-	<string name="default_buttons_cancel">Anulează</string>
+	<string name="shared_string_yes">Da</string>
+	<string name="shared_string_cancel">Anulează</string>
 	<string name="default_buttons_apply">Aplică</string>
 	<string name="default_buttons_add">Adaugă</string>
-	<string name="default_buttons_no">Nu</string>
+	<string name="shared_string_no">Nu</string>
 	<string name="add_favorite_dialog_top_text">Introduceți numele punctului favorit</string>
 	<string name="add_favorite_dialog_default_favourite_name">Favorite</string>
 	<string name="add_favorite_dialog_favourite_added_template">Punctul favorit \'\'{0}\'\' a fost adăugat cu succes.</string>
@@ -1218,8 +1218,8 @@
     <string name="animate_routing_gpx">Simulează folosind traseul GPX</string>
     <string name="remember_choice">Reține alegerea mea</string>
     <string name="gps_status_eclipsim">Status GPS</string>
-    <string name="default_and">și</string>
-    <string name="default_or">sau</string>
+    <string name="shared_string_and">și</string>
+    <string name="shared_string_or">sau</string>
 	<string name="auto_zoom_close">Prea apropiat</string>
 	<string name="map_magnifier">Lupă hartă</string>
 	<string name="base_world_map">Harta de bază a lumii</string>
@@ -1320,8 +1320,8 @@
     <string name="recording_context_menu_precord">Faceți o poză</string>
     <string name="use_displayed_track_for_navigation">Doriți să utilizați traseul afișat pentru navigare?</string>
     <string name="keep_and_add_destination_point">Adaugă ca și punct destinație</string>
-    <string name="route_descr_select_on_map">Selectează pe hartă…</string>
-    <string name="route_descr_favorite">Favorite…</string>
+    <string name="shared_string_select_on_map">Selectează pe hartă…</string>
+    <string name="shared_string_favorite">Favorite…</string>
     <string name="routing_attr_prefer_motorway_name">Preferă autostrăzi</string>
 	<string name="routing_attr_prefer_motorway_description">Preferă autostrăzi</string>
 	<string name="routing_attr_short_way_name">Drum scurt</string>
@@ -1433,7 +1433,8 @@
     <string name="gpx_wpt">Punct de reper</string>
     <string name="none_selected_gpx">Niciun fișier GPX selectat. Pentru a selecta țineți apăsat pe un track disponibil.</string>
     <string name="selected_gpx_info_show">\n\nȚineți apăsat pentru a vedea pe hartă</string>
-    <string name="selected">Selectat</string>
+    <string name="shared_string_selected">Selectat</string>
+    <string name="shared_string_selected_lowercase">selectat</string>
     <string name="osmo_auth_error">Eroare de autorizare OsMo aparută : %1$s.\nPoate fi o cadere temporară a serviciului sau înregistrarea dumneavoastră a expirat.\nDoriți sa începeți o nouă înregistrare?</string>
     <string name="osmo_group_by_invite">Intră pe baza invitației</string>
     <string name="delay_navigation_start">Porniți ghidarea asistată automat</string>
@@ -1523,7 +1524,7 @@
     <string name="download_tab_updates">Actualizări</string>
     <string name="download_tab_local">Local</string>
 	<string name="no_internet_connection">Descărcarea nu este posibilă, vă rugăm să verificaţi conexiunea la Internet.</string>
-    <string name="dismiss">Respinge</string>
+    <string name="shared_string_dismiss">Respinge</string>
     <string name="everything_up_to_date">Toate fişierele actualizate</string>
     <string name="use_opengl_render">Utilizaţi redare OpenGL</string>
     <string name="osmo_use_https_descr">Utilizează o conexiune securizată la server</string>
@@ -1535,7 +1536,7 @@
 	<string name="coordinates">Coordonate</string>
 	<string name="rendering_attr_tramTrainRoutes_name">Rute de tramvai și tren</string>
 	<string name="wake_on_voice">Pornește ecranul</string>
-    <string name="wake_on_voice_never">Niciodată</string>
+    <string name="shared_string_never">Niciodată</string>
     <string name="select_impassable_road">Selectează pe hartă…</string>
     <string name="impassable_road">Evită drumurile…</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Rute tren</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 5939c0df0f..33f5ca87fc 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string>
     <string name="osmo_use_https">Использовать HTTPS</string>
@@ -378,7 +378,7 @@
   <string name="map_underlay">Карта подложки</string>
   <string name="map_underlay_descr">Выберите слой подложки для основной карты</string>
   <string name="layer_overlay">Карта покрытия…</string>
-  <string name="default_none">Нет</string>
+  <string name="shared_string_none">Нет</string>
   <string name="map_overlay">Карта покрытия</string>
   <string name="map_overlay_descr">Выберите слой для покрытия основной карты</string>
   <string name="tile_source_already_installed">Карта уже установлена, настройки будут обновлены</string>
@@ -415,8 +415,8 @@
   <string name="tip_initial">Справка</string>
   <string name="tip_initial_t">"OsmAnd - навигационное приложение с большим количеством функций.
 \n\nНекоторые базовые сведения, советы по использованию и дополнительную справку можно посмотреть вызвав меню \"Справка\" на экране карты. "</string>
-  <string name="next_button">След.</string>
-  <string name="previous_button">Пред.</string>
+  <string name="shared_string_next">След.</string>
+  <string name="shared_string_previous">Предыдущий</string>
   <string name="unit_of_length_descr">Единицы измерения длины и скорости</string>
   <string name="unit_of_length">Единицы измерения</string>
   <string name="si_mi_foots">Мили/футы</string>
@@ -459,7 +459,6 @@
   <string name="indexing_map">Индексируются карты…</string>
   <string name="indexing_poi">Индексируются POI…</string>
   <string name="indexing_transport">Индексируется транспорт…</string>
-  <string name="input_output_error">Произошла ошибка ввода/вывода</string>
   <string name="km">км</string>
   <string name="km_h">км/ч</string>
   <string name="m">м</string>
@@ -646,7 +645,7 @@
   <string name="transport_stops_to_pass">остановок в пути</string>
   <string name="transport_route_distance">Длина пути</string>
   <string name="transport">Транспорт</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Показывать остановки общественного транспорта на карте</string>
   <string name="show_transport_over_map">Показать остановки транспорта</string>
   <string name="hello">Навигационное приложение OsmAnd</string>
@@ -663,7 +662,6 @@
   <string name="search_history_building">Здание: {0}, {1}, {2}</string>
   <string name="favorite">Избранное</string>
   <string name="clear_all">Очистить все</string>
-  <string name="history">История</string>
   <string name="uploading_data">Загрузка данных…</string>
   <string name="uploading">Загрузка…</string>
   <string name="search_nothing_found">По вашему запросу ничего не найдено</string>
@@ -744,7 +742,6 @@
   <string name="auto_zoom_map_descr">Автоматически изменять масштаб карты при изменении скорости</string>
   <string name="auto_zoom_map">Масштаб</string>
   <string name="additional_settings">Дополнительные настройки</string>
-  <string name="settings">Настройки</string>
   <string name="save_current_track_descr">Сохранить текущий трек на SD-карту сейчас</string>
   <string name="save_current_track">Сохранить текущий трек GPX</string>
   <string name="save_track_interval_descr">Выберите интервал для записи трека во время навигации</string>
@@ -826,11 +823,11 @@
   <string name="context_menu_item_update_map">Обновить карту</string>
   <string name="context_menu_item_open_bug">Сообщить об ошибке на карте</string>
   <string name="context_menu_item_create_poi">Добавить POI</string>
-  <string name="default_buttons_yes">Да</string>
-  <string name="default_buttons_cancel">Отмена</string>
+  <string name="shared_string_yes">Да</string>
+  <string name="shared_string_cancel">Отмена</string>
   <string name="default_buttons_apply">Применить</string>
   <string name="default_buttons_add">Добавить</string>
-  <string name="default_buttons_no">Нет</string>
+  <string name="shared_string_no">Нет</string>
   <string name="add_favorite_dialog_top_text">Введите имя точки</string>
   <string name="add_favorite_dialog_default_favourite_name">Избранная</string>
   <string name="add_favorite_dialog_favourite_added_template">Точка \"\"{0}\"\" была успешно добавлена к Избранным.</string>
@@ -882,15 +879,14 @@
   <string name="default_buttons_selectall">Выделить все</string>
   <string name="accessibility_mode">Режим специальных возможностей</string>
   <string name="accessibility_mode_descr">Включает дополнительные возможности для невизуального доступа</string>
-  <string name="accessibility_on">Включён</string>
-  <string name="accessibility_off">Выключен</string>
+  <string name="shared_string_on">Включён</string>
+  <string name="shared_string_off">Выключен</string>
   <string name="accessibility_default">Использовать системную настройку</string>
   <string name="backToMenu">Главное меню</string>
   <string name="zoomOut">Уменьшить</string>
   <string name="zoomIn">Увеличить</string>
   <string name="zoomIs">Масштаб</string>
   <string name="show_details">Подробности</string>
-  <string name="help">Справка</string>
   <string name="back_to_location">Вернуться</string>
   <string name="north">север</string>
   <string name="north_north_east">северо-северо-восток</string>
@@ -1372,8 +1368,6 @@
     <string name="base_world_map">Обзорная карта мира</string>
 	<string name="edit_tilesource_expiration_time">Время действия (в минутах)</string>
     <string name="gps_status_eclipsim">Статус GPS</string>
-    <string name="default_and">и</string>
-    <string name="default_or">или</string>
 	<string name="remember_choice">Запомнить мой выбор</string>
     <string name="route_is_too_long">Возможно, потребуется очень много времени для локального (оффлайн) расчёта маршрута более 200 км. Для расчёта, пожалуйста, добавьте одну или более промежуточных точек на маршруте.</string>
 	<string name="app_mode_aircraft">Самолёт</string>
@@ -1443,8 +1437,6 @@
     <string name="map_magnifier">Масштаб</string>
 	<string name="select_gpx">Выберите GPX…</string>
     <string name="route_descr_select_destination">Выберите пункт назначения</string>
-    <string name="route_descr_select_on_map">Выберите на карте…</string>
-    <string name="route_descr_favorite">Избранные…</string>
     <string name="route_preferences">Предпочтения маршрута</string>
     <string name="route_info">Маршрутная информация</string>
     <string name="keep_and_add_destination_point">Добавить как пункт назначения</string>
@@ -1648,7 +1640,7 @@
     <string name="select_destination_and_intermediate_points">Выбрать путевые точки</string>
     <string name="layer_amenity_label">Метки точек</string>
     <string name="selected_gpx_info_show">\n\nНажать и удерживать для просмотра на карте</string>
-    <string name="selected">выбранные</string>
+    <string name="shared_string_selected_lowercase">выбранные</string>
     <string name="gpx_info_waypoints">Путевые точки: %1$s </string>
 	<string name="gpx_selection_number_of_points"> %1$s точек</string>
     <string name="gpx_selection_point">Точка %1$s</string>
@@ -1807,7 +1799,6 @@
     <string name="rendering_category_hide">Скрыть</string>
     <string name="select_impassable_road">Выбрать на карте…</string>
     <string name="impassable_road">Избегать дороги…</string>
-    <string name="wake_on_voice_never">Никогда</string>
     <string name="lock_screen_request_explanation">%1$s необходимо это разрешение, чтобы выключить экран для экономии энергии.</string>
     <string name="wake_on_voice">Авто-включение экрана перед поворотом</string>
     <string name="wake_on_voice_descr">Включать экран устройства (если отключён) при приближении к повороту</string>
@@ -1827,7 +1818,7 @@
     <string name="download_tab_local">Локальные</string>
 	<string name="navigate_point_zone">Зона</string>
     <string name="rendering_attr_transportStops_name">Остановки транспорта</string>
-    <string name="dismiss">Не отправлять</string>
+    <string name="shared_string_dismiss">Не отправлять</string>
     <string name="dash_download_msg_none">Вы хотите загрузить оффлайн карты?</string>
     <string name="dash_download_msg">Загружено карт: %1$s</string>
     <string name="dash_download_new_one">Загрузить новую карту</string>
@@ -1872,15 +1863,13 @@
     <string name="points">Точки</string>
     <string name="parking_place">Место для парковки</string>
     <string name="remove_the_tag">УДАЛИТЬ ТЕГ</string>
-    <string name="enable_plugin">Выключено</string>
-	<string name="disable_plugin">Включено</string>
 <string name="osm_editing_manage">Управление</string>
     <string name="plugin_description_title">Описание</string>
 	<string name="plugin_settings_button_caption">Настройки</string>
 <string name="edit_group">Редактировать группу</string>
     <string name="plugin_install_needs_network">Вам необходимо интернет соединение для установки этого плагина.</string>
-<string name="enable_plugin2">Включить</string>
-	<string name="disable_plugin2">Выключить</string>
+<string name="shared_string_enable">Включить</string>
+	<string name="shared_string_disable">Выключить</string>
 	<string name="get_plugin">Получить</string>
 <string name="plugin_ski_name">Лыжные карты</string>
     <string name="plugin_nautical_name">Морские карты</string>
@@ -1899,4 +1888,44 @@
 	<string name="back_to_map">Вернуться на карту</string>
 	<string name="location_on_map">Координаты:\n Широта %1$s\n Долгота %2$s</string>
 	<string name="currently_recording_track">Текущий пишущийся трек</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_enabled">Включено</string>
+	<string name="shared_string_disabled">Отключено</string>
+	<string name="shared_string_never">Никогда</string>
+	<string name="shared_string_and">и</string>
+	<string name="shared_string_or">или</string>
+	<string name="shared_string_help">Справка</string>
+	<string name="shared_string_settings">Настройки</string>
+	<string name="shared_string_history">История</string>
+	<string name="shared_string_select_on_map">Выбрать на карте</string>
+	<string name="shared_string_select_all">Выбрать все</string>
+	<string name="shared_string_clear">Очистить</string>
+	<string name="shared_string_clear_all">Очистить все</string>
+	<string name="shared_string_save">Сохранить</string>
+	<string name="shared_string_save_as_gpx">Сохранить как GPX трек</string>
+	<string name="shared_string_rename">Переименовать</string>
+	<string name="shared_string_delete">Удалить</string>
+	<string name="shared_string_delete_all">Удалить все</string>
+	<string name="shared_string_add">Добавить</string>
+	<string name="shared_string_apply">Применить</string>
+	<string name="shared_string_control_start">Старт</string>
+	<string name="shared_string_control_stop">Стоп</string>
+	<string name="shared_string_import">Импорт</string>
+	<string name="shared_string_export">Экспорт</string>
+	<string name="shared_string_more">Дополнительно</string>
+	<string name="shared_string_more_actions">Дополнительные действия</string>
+	<string name="shared_string_do_not_show_again">Больше не показывать</string>
+	<string name="shared_string_remember_my_choice">Запомнить мой выбор</string>
+	<string name="shared_string_refresh">Обновить</string>
+	<string name="shared_string_io_error">Произошла ошибка ввода/вывода</string>
+	<string name="shared_string_unexpected_error">Произошла непредвиденная ошибка</string>
+	<string name="shared_string_action_template">"Действие {0}"</string>
+	<string name="shared_string_close">Закрыть</string>
+	<string name="shared_string_exit">Выход</string>
+	<string name="shared_string_show">Показать</string>
+	<string name="shared_string_show_all">Показать всё</string>
+	<string name="shared_string_show_on_map">Показать на карте</string>
+	<string name="shared_string_map">Карта</string>
+	<string name="shared_string_favorite">Избранное</string>
+	<string name="shared_string_favorites">Избранные</string>
 	</resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index fc554d2a69..2c7472b614 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -60,8 +60,8 @@
     <string name="keep_and_add_destination_point">Annànghe unu puntu de destinatzione</string>
     <string name="select_gpx">Issèbera GPX…</string>
     <string name="route_descr_select_destination">Issèbera sa destinatzione</string>
-    <string name="route_descr_select_on_map">Ischerta in sa mapa…</string>
-    <string name="route_descr_favorite">Prefèrridu…</string>
+    <string name="shared_string_select_on_map">Ischerta in sa mapa…</string>
+    <string name="shared_string_favorite">Prefèrridu…</string>
     <string name="route_preferences">Preferèntzias pro s’àndala</string>
     <string name="route_info">Informatziones pro s’àndala</string>
     <string name="routing_attr_prefer_motorway_name">Preferre sas autostradas</string>
@@ -122,8 +122,8 @@
     <string name="animate_routing_gpx">Dispinta impreande una caminera GPX</string>
     <string name="remember_choice">Ammenta s’issèberu meu</string>
     <string name="gps_status_eclipsim">Istadu GPS</string>
-    <string name="default_and">e</string>
-    <string name="default_or">o</string>
+    <string name="shared_string_and">e</string>
+    <string name="shared_string_or">o</string>
 	<string name="route_is_too_long">Su càlculu de s’àndala de OsmAnd sena impreare internet diat pòtere dimandare meda tempus (o a bortas non funtzionare) pro distantzias prus longas de 200 km. Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas prestatziones.</string>
 	<string name="auto_zoom_none">No zoom automàticu</string>
 	<string name="auto_zoom_close">Zoom automàticu mannu</string>
@@ -132,8 +132,8 @@
 	<string name="map_magnifier">Ismanniamentu mapa</string>
 	<string name="base_world_map">Mapa mundiale de base</string>
 	<string name="tip_map_styles">Istiles de sa mapa</string>
-	<string name="default_buttons_no">Nono</string>
-	<string name="default_buttons_yes">Eja</string>
+	<string name="shared_string_no">Nono</string>
+	<string name="shared_string_yes">Eja</string>
 	<string name="tip_map_styles_t">"OsmAnd suportada sa visualizatzione de sas mapas vettoriales in istiles diferentes pro s’adatare a sas esigentzias tuas:
 \n\nDiferentes dae sos istiles balansados preimpostados de sa mapa, los agatas suta \'Menu\' -&gt; \'Cunfigura sa mapa\' -&gt; \'Istile Mapa\' issèbera pro esempru
 \n\t* The \'Touring view\' istile: cuntènnidi sas informatziones prus minujas possìbile pro biagiare e pro visitare, incluidas sas ottimizatziones pro sos ghiadores professionales (contrastu prus distinghìbile pro sas istradas), optzione pro s’escursionismu Alpinu (iscala SAC), itineràrios tziclìsticos, sìmbolos pro s’escursionismu, etc.
@@ -573,7 +573,7 @@
     <string name="gpx_wpt">Tapa</string>
     <string name="selected_gpx_info_show">\n\nTene carcau pro lu bìere in sa mapa</string>
     <string name="delay_navigation_start">Inghitza su nàvigu passu pro passu automaticamente</string>
-    <string name="selected">ischertau</string>
+    <string name="shared_string_selected_lowercase">ischertau</string>
     <string name="local_index_gpx_info_show">\n\ntene carcau pro sas optziones</string>
 	<string name="gpx_info_subtracks">"Suta-rastas: %1$s "</string>
 	<string name="gpx_info_waypoints">"Tapas de s’àndala: %1$s "</string>
@@ -843,11 +843,11 @@
 	<string name="show_ruler_level">Ammustra s’iscala gràfica</string>	
 	<string name="info_button">Info</string>
 	<string name="back_to_location">Torra a sa positzione</string>
-	<string name="help">Agiudu</string>
+	<string name="shared_string_help">Agiudu</string>
 	<string name="accessibility_mode">Modalidade atzessìbile</string>
 	<string name="accessibility_mode_descr">Abìlita sas funtziones chi pertocant a s’atzessibilidade</string>
-	<string name="accessibility_on">Ativau</string>
-	<string name="accessibility_off">Deativau</string>
+	<string name="shared_string_on">Ativau</string>
+	<string name="shared_string_off">Deativau</string>
 	<string name="backToMenu">Torra a su Menù</string>
 	<string name="zoomIs">Su zoom est</string>
 	<string name="north">nord</string>
@@ -1206,7 +1206,7 @@
 	<string name="map_underlay">Mapa de isfundu</string>
 	<string name="map_underlay_descr">Issèbera sa mapa de isfundu</string>
 	<string name="layer_overlay">Mapa supraposta…</string>
-	<string name="default_none">Perunu</string>
+	<string name="shared_string_none">Perunu</string>
 	<string name="map_overlay">Mapa subraposta</string>
 	<string name="map_overlay_descr">Issèbera mapa de subrapositzione</string>
 	<string name="tile_source_already_installed">Sa mapa est giai installata, sas impostaduras ant a èssere agiornadas</string>
@@ -1230,8 +1230,8 @@
 	<string name="tip_search">Chirca</string>
 	<string name="tip_map_context_menu">Menù \'Imprea positzione\'</string>
 	<string name="tip_initial">Impòsitos</string>
-	<string name="next_button">Sighi</string>
-	<string name="previous_button">Pretzedente</string>
+	<string name="shared_string_next">Sighi</string>
+	<string name="shared_string_previous">Pretzedente</string>
 	<string name="unit_of_length_descr">Muda sas unidades de medida pro longària e lestresa</string>
 	<string name="unit_of_length">Unidade de medida</string>
 	<string name="si_mi_foots">Mìglios/pedes</string>
@@ -1274,7 +1274,7 @@
 	<string name="indexing_map">Inditzizatzione mapa…</string>
 	<string name="indexing_poi">Inditzizatzione PDI…</string>
 	<string name="indexing_transport">Inditzizatzione trasportos…</string>
-	<string name="input_output_error">Errore de I/O</string>
+	<string name="shared_string_io_error">Errore de I/O</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -1446,7 +1446,7 @@
 	<string name="transport_stops_to_pass">firmadas da colare</string>
 	<string name="transport_route_distance">Distàntzia àndala</string>
 	<string name="transport">Trasportu pùblicu</string>
-	<string name="default_buttons_ok">Atzeta</string>
+	<string name="shared_string_ok">Atzeta</string>
 	<string name="show_transport_over_map_description">Ammustra sas firmadas de su trasportu pùblicu in sa mapa</string>
 	<string name="show_transport_over_map">Ammustra sas firmadas de su trasportu pùblicu</string>
 	<string name="hello">Aplicu de nàvigu OsmAnd</string>
@@ -1461,7 +1461,7 @@
 	<string name="search_history_building">Edifìtzios: {0}, {1}, {2}</string>
 	<string name="favorite">Prefèrridu</string>
 	<string name="clear_all">Burra totu</string>
-	<string name="history">Istòria</string>
+	<string name="shared_string_history">Istòria</string>
 	<string name="uploading_data">Imbiu datos…</string>
 	<string name="uploading">Imbiu…</string>
 	<string name="search_nothing_found">Nudda agatau</string>
@@ -1530,7 +1530,7 @@
 	<string name="map_preferences_descr">Dislinda impostaduras mapa: mitza, rotatzione, sinnadore de positzione, orientatzione ischermu</string>
 	<string name="osm_settings">Modìficas OSM</string>
 	<string name="additional_settings">Impostaduras annativas</string>
-	<string name="settings">Impostaduras</string>
+	<string name="shared_string_settings">Impostaduras</string>
 	<string name="save_current_track_descr">Sarba como sa rasta currente in s’ischeda SD</string>
 	<string name="save_current_track">Sarba sa rasta currente</string>
 	<string name="save_track_interval">Intervallu de sarbamentu durante su nàvigu</string>
@@ -1604,7 +1604,7 @@
 	<string name="context_menu_item_update_map">Agiorna sa mapa</string>
 	<string name="context_menu_item_open_bug">Sinnala un\'errore OSM</string>
 	<string name="context_menu_item_create_poi">Crea PDI</string>
-	<string name="default_buttons_cancel">Burra</string>
+	<string name="shared_string_cancel">Burra</string>
 	<string name="default_buttons_apply">Aplica</string>
 	<string name="default_buttons_add">Annanghe</string>
 	<string name="add_favorite_dialog_top_text">Inserta su nùmene de su prefèrridu</string>
@@ -1770,7 +1770,7 @@
     <string name="select_impassable_road">Ischerta in sa mapa…</string>
     <string name="impassable_road">Istransi istradas…</string>
     <string name="rendering_category_hide">Cua</string>
-    <string name="wake_on_voice_never">Mai</string>
+    <string name="shared_string_never">Mai</string>
     <string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s’ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
     <string name="advanced_settings">Avantzadas</string>
 	<string name="osmo_use_https_descr">Imprea una cunnessione segura cun su server</string>
@@ -1785,7 +1785,7 @@
     <string name="everything_up_to_date">Totu agiornadu</string>
     <string name="use_opengl_render">Imprea sa renderizatzione OpengL</string>
     <string name="use_opengl_render_descr">Imprea sa renderizatzione OpengL tràmite hardware (diat pòdere non funtzionare in carchi dispositivu)</string>
-    <string name="dismiss">Abbandona</string>
+    <string name="shared_string_dismiss">Abbandona</string>
     <string name="no_internet_connection">Impossìbile iscarrigare. Pro piaghere còmpida sa cunnessione tua pro sighire.</string>
     <string name="download_tab_downloads">Iscarrigàbiles</string>
     <string name="download_tab_updates">Agiornamentos</string>
@@ -1836,13 +1836,13 @@
     <string name="gps_status">Istadu GPS</string>
     <string name="parking_place">Parchègiu</string>
     <string name="remove_the_tag">BOGA SU TAG</string>
-    <string name="enable_plugin">Disabilitadu</string>
-	<string name="disable_plugin">Abilitadu</string>
+    <string name="shared_string_disabled">Disabilitadu</string>
+	<string name="shared_string_enabled">Abilitadu</string>
 <string name="plugin_description_title">Descritzione</string>
 	<string name="plugin_settings_button_caption">Impostaduras</string>
 <string name="edit_group">Modìfica su grupu</string>
-    <string name="enable_plugin2">Abìlita</string>
-	<string name="disable_plugin2">Disabìlita</string>
+    <string name="shared_string_enable">Abìlita</string>
+	<string name="shared_string_disable">Disabìlita</string>
 	<string name="plugin_install_needs_network">Est netzessària sa cunnessione a ìnternet pro installare custu cumponente annuntilu (plugin).</string>
 	<string name="get_plugin">Iscàrriga</string>
 <string name="plugin_nautical_name">Vista mapa nàutica</string>
@@ -1885,7 +1885,7 @@
 
 	<string name="location_on_map">Assètiu/Collocassione:\n Lat %1$s\n Lon %2$s</string>
 	<string name="rename_failed">Renumenatzione faddida.</string>
-<string name="selected_tracks">Ischertadu</string>
+<string name="shared_string_selected">Ischertadu</string>
 	<string name="track_segments">Segmentos de sa rasta</string>
 	<string name="track_points">Puntos de sa rasta</string>
 	</resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index ccbb99c2a1..3533822994 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="recording_context_menu_show">Zobraziť</string>
   <string name="recording_photo_description">Fotografia %1$s %2$s</string>
   <string name="av_def_action_picture">Zachytiť fotografiu</string>
@@ -95,7 +95,7 @@
   <string name="online_map_settings_descr">Konfigurácia online mapových zdrojov</string>
   <string name="map_settings">- Nastavenia mapy</string>
   <string name="map_settings_descr">Konfigurácia mapového zobrazenia</string>
-  <string name="osmand_rastermaps_plugin_description">Zobrazí nastavenia pre použitie rozličných online alebo ukladaných máp ako hlavnú mapu alebo ako prekrývaciu / podkladovú mapu. Tieto mapy môžu byť tiež pripravené offline a skopírované do dátového priečinka OsmAnd.</string>
+  <string name="osmand_rastermaps_plugin_description">"S týmto modulom môžete použiť rozličné online (tiež nazývané dlaždicové alebo rastrové) mapy, od preddefinovaných OSM dlaždíc (ako Mapnik) po satelitné snímky a špeciálne vrstvy ako mapy počasia, klimatické, geologické, tieňované svahy a pod.\n\nVšetky tieto mapy môžu byť použité ako hlavná (základná) mapa na obrazovke OsmAnd alebo ako prekrývacia / podkladová mapa k inej základnej mape (napr. bežné offline mapy z OsmAnd). Pre lepšie zviditeľnenie podkladových máp je možné vypnúť niektoré objekty z vektorových máp OsmAnd, cez menu \"Nastaviť mapu\".\n\nDlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich môžete pripraviť na použitie offline (skopírovať ručne do dátového priečinka OsmAnd) ako sqlite databázu, ktorú vedia vytvoriť viaceré programy na prípravu máp. "</string>
   <string name="osmand_background_plugin_description">Zobrazí nastavenia na povolenie stopovania a navigácie v režime spánku (vypnutá obrazovka) pravidelným prebúdzaním GPS zariadenia.</string>
   <string name="osmand_accessibility_description">Zobrazí nastavenia pre špeciálne funkcie uľahčenia prístupu.</string>
   <string name="extra_settings">Pokročilé nastavenia</string>
@@ -140,14 +140,11 @@
   <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="help">Pomocník</string>
   <string name="show_details">Zobraziť podrobnosti</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_on">Zapnutý</string>
-  <string name="accessibility_off">Vypnutý</string>
   <string name="accessibility_default">Podľa globálnych nastavení systému</string>
   <string name="backToMenu">Späť na ponuku</string>
   <string name="zoomOut">Oddialiť</string>
@@ -350,7 +347,7 @@
   <string name="show_more_map_detail_descr">Zobrazí viac detailov offline vektorovej mapy (cesty, atď.) už pri nižších priblíženiach</string>
   <string name="favourites_delete_multiple_succesful">Obľúbené miesta boli úspešne odstránené.</string>
   <string name="favorite_delete_multiple">Idete zmazať %1$d obľúbených bodov a %2$d skupín obľúbených. Ste si istý?</string>
-  <string name="favorite_home_category">Domov</string>
+  <string name="favorite_home_category">Doma</string>
   <string name="favorite_friends_category">Priatelia</string>
   <string name="favorite_places_category">Miesta</string>
   <string name="favorite_default_category">Iné</string>
@@ -361,7 +358,7 @@
   
   
   
-  <string name="local_index_installed">Vydanie</string>
+  <string name="local_index_installed">Lokálna verzia</string>
   <string name="local_index_items_backuped">%1$d položiek z %2$d úspešne zálohovaných.</string>
   <string name="local_index_items_deleted">%1$d položiek z %2$d úspešne vymazaných.</string>
   <string name="local_index_items_restored">%1$d položiek z %2$d úspešne obnovených.</string>
@@ -432,7 +429,6 @@
   <string name="map_underlay">Podkladová mapa</string>
   <string name="map_underlay_descr">Výber podkladovej mapy</string>
   <string name="layer_overlay">Prekrývacia mapa…</string>
-  <string name="default_none">Žiadna</string>
   <string name="map_overlay">Prekrývacia mapa</string>
   <string name="map_overlay_descr">Výber mapy na prekrytie</string>
   <string name="tile_source_already_installed">Mapa je už nainštalovaná, nastavenia budú zaktualizované</string>
@@ -495,8 +491,6 @@
   <string name="tip_initial">Pomoc</string>
   <string name="tip_initial_t">"OsmAnd je navigačná aplikácia s rozmanitými funkciami.
 \n\nAko základný úvod môžete použiť tipy a triky dostupné z mapy cez Menu → Pomoc. "</string>
-  <string name="next_button">Ďalší</string>
-  <string name="previous_button">Predošlý</string>
   <string name="unit_of_length_descr">Zmena jednotiek dĺžky a rýchlosti</string>
   <string name="unit_of_length">Jednotky dĺžky</string>
   <string name="si_mi_foots">Míle/stopy</string>
@@ -539,7 +533,6 @@
   <string name="indexing_map">Indexovanie mapy…</string>
   <string name="indexing_poi">Indexovanie POI…</string>
   <string name="indexing_transport">Indexovanie dopravy…</string>
-  <string name="input_output_error">Vyskytla sa vstupno/výstupná chyba</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
   <string name="m">m</string>
@@ -564,7 +557,7 @@
   <string name="loading_builds">Načítavajú sa zostavy OsmAndu…</string>
   <string name="select_build_to_install">Vyberte jednu zo zostáv OsmAndu na nainštalovanie</string>
   <string name="contribution_activity">Špeciálna aktivita pre kontribútorskú verziu</string>
-  <string name="gps_status_app_not_found">Aplikácia pre stav GPS nie je nainštalovaná. Nájsť ju na Markete?</string>
+  <string name="gps_status_app_not_found">Aplikácia pre stav GPS nie je nainštalovaná. Nájsť ju v Obchode?</string>
   <string name="voice_is_not_available_msg">"Hlasové navigovanie nie je dostupné, prosím choďte do Nastavenia → \'Všeobecné\' → \'Hlasové povely\'  a zvoľte alebo stiahnite balík hlasových povelov."</string>
   <string name="voice_is_not_available_title">Hlasové údaje nie sú určené</string>
   <string name="daynight_mode_day">Denný režim</string>
@@ -723,7 +716,6 @@
   <string name="transport_stops_to_pass">zastávky na prejdenie</string>
   <string name="transport_route_distance">Vzdialenosť trasy</string>
   <string name="transport">Hromadná doprava</string>
-  <string name="default_buttons_ok">OK</string>
   <string name="show_transport_over_map_description">Zobrazenie zastávok hromadnej dopravy na mape</string>
   <string name="show_transport_over_map">Zobraziť zastávky hrom.dopravy</string>
   <string name="hello">Navigačná aplikácia OsmAnd</string>
@@ -740,7 +732,6 @@
   <string name="search_history_building">Budova: {0}, {1}, {2}</string>
   <string name="favorite">Obľúbené miesto</string>
   <string name="clear_all">Zmazať všetko</string>
-  <string name="history">História</string>
   <string name="uploading_data">Odosielajú sa údaje…</string>
   <string name="uploading">Odosielanie…</string>
   <string name="search_nothing_found">Nič sa nenašlo</string>
@@ -823,7 +814,6 @@
   <string name="additional_settings">Ďalšie nastavenia</string>
   <string name="settings_preset_descr">Výber profilu užívateľa s prispôsobenými nastaveniami mapy a navigácie.</string>
   <string name="settings_preset">Užívateľský profil</string>
-  <string name="settings">Nastavenia</string>
   <string name="save_current_track_descr">Uloženie aktuálnej stopy na SD kartu</string>
   <string name="save_current_track">Uložiť aktuálnu stopu</string>
   <string name="save_track_interval_descr">Zvoť interval zaznamenávania stopy počas navigácie</string>
@@ -903,11 +893,8 @@
   <string name="context_menu_item_update_map">Aktualizovať mapu</string>
   <string name="context_menu_item_open_bug">Otvoriť OSM chybu</string>
   <string name="context_menu_item_create_poi">Vytvoriť POI</string>
-  <string name="default_buttons_yes">Áno</string>
-  <string name="default_buttons_cancel">Zrušiť</string>
   <string name="default_buttons_apply">Použiť</string>
   <string name="default_buttons_add">Pridať</string>
-  <string name="default_buttons_no">Nie</string>
   <string name="add_favorite_dialog_top_text">Zadajte meno obľúbeného bodu</string>
   <string name="add_favorite_dialog_default_favourite_name">Obľúbený bod</string>
   <string name="add_favorite_dialog_favourite_added_template">Obľúbený bod "{0}" bol úspešne pridaný.</string>
@@ -1391,8 +1378,6 @@
 	<string name="auto_zoom_close">Veľké priblíženie</string>
 	<string name="auto_zoom_far">Stredné priblíženie</string>
 	<string name="auto_zoom_farthest">Malé priblíženie</string>
-	<string name="default_and">a</string>
-    <string name="default_or">alebo</string>
 	<string name="remember_choice">Zapamätať moju voľbu</string>
     <string name="gps_status_eclipsim">Stav GPS</string>
     <string name="tip_map_styles_t">OsmAnd umožňuje zobrazenie vektorových máp v rôznych štýloch podľa vašich potrieb:
@@ -1612,8 +1597,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="routing_attr_weight_description">Zadajte hmotnosť vozidla, ktorá musí byť povolená na cestách</string>
     <string name="select_gpx">Vybrať GPX…</string>
     <string name="route_descr_select_destination">Vybrať cieľ</string>
-    <string name="route_descr_select_on_map">Vybrať na mape…</string>
-    <string name="route_descr_favorite">Obľúbené…</string>
     <string name="route_preferences">Predvoľby trasy</string>
     <string name="route_info">Informácie trasy</string>
     <string name="keep_and_add_destination_point">Pridať ako cieľový bod</string>
@@ -1805,7 +1788,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="gpx_wpt">Prechodný bod</string>
     <string name="selected_gpx_info_show">\n\nStlačte a podržte pre zobrazenie na mape</string>
     <string name="delay_navigation_start">Spustiť navigačné povely automaticky</string>
-    <string name="selected">vybrané</string>
     <string name="gpx_split_interval">Interval rozdelenia</string>
     <string name="gpx_info_subtracks">Podstopy: %1$s </string>
 	<string name="gpx_info_waypoints">Prechodné body: %1$s </string>
@@ -1923,7 +1905,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="speak_poi">Oznamovať blízke body záujmu</string>
     <string name="flat_list_waypoints">Všetky</string>
     <string name="index_tours">Výlety</string>
-    <string name="record_plugin_description">Zapne možnosť uloženia vašich stôp jedným stlačením tlačidla na mape. Taktiež zobrazí nastavenia pre zaznamenanie výletov do lokálneho GPX súboru alebo na online webovú službu.</string>
+    <string name="record_plugin_description">"Tento modul zapne funkciu nahratia a uloženia vašich stôp stlačením tlačidla nahrávania GPX na mape. Taktiež umožňuje nastaviť automatické zaznamenávanie navigačných trás do GPX súboru.\n\nZaznamenané stopy môžete zdieľať s priateľmi alebo odoslať ako príspevok do OSM. Atléti môžu použiť záznamy na sledovanie svojich tréningov. Základná analýza môže byť vykonaná už priamo v OsmAnd, napr. trvanie stopy, priemerná rýchlosť. Stopy môžu následne skúmať ďalšie špecializované programy. "</string>
     <string name="record_plugin_name">Zaznamenávanie výletov</string>
     <string name="int_hour">hod</string>
     <string name="duration">Trvanie</string>
@@ -1982,7 +1964,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_attr_tramTrainRoutes_name">Linky električiek a vlakov</string>
     <string name="rendering_category_hide">Skryť</string>
     <string name="lock_screen_request_explanation">%1$s potrebuje toto oprávnenie na vypnutie obrazovky pre šetrenie energiou.</string>
-    <string name="wake_on_voice_never">Nikdy</string>
     <string name="advanced_settings">Pokročilé</string>
 	<string name="osmo_use_https_descr">Použiť zabezpečené spojenie na server</string>
     <string name="osmo_use_https">Použiť HTTPS</string>
@@ -1993,7 +1974,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="coordinates">Súradnice</string>
 	<string name="map_update">Aktualizácie pre %1$s máp</string>
 	<string name="error_avoid_specific_road">Nenašla sa blízka cesta</string>
-    <string name="dismiss">Odmietnuť</string>
     <string name="everything_up_to_date">Všetky súbory sú aktuálne</string>
     <string name="use_opengl_render">Použiť vykresľovanie OpenGL</string>
     <string name="use_opengl_render_descr">Použiť hardvérovo urýchľované vykresľovanie pomocou OpenGL (nemusí na niektorých zariadeniach fungovať)</string>
@@ -2047,14 +2027,10 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="parking_place">Parkovacie miesto</string>
     <string name="remove_the_tag">ODSTRÁNIŤ ZNAČKU</string>
     <string name="gps_status">Stav GPS</string>
-    <string name="enable_plugin">Vypnutý</string>
-	<string name="disable_plugin">Zapnutý</string>
 <string name="edit_group">Upraviť skupinu</string>
     <string name="plugin_description_title">Popis</string>
 	<string name="plugin_settings_button_caption">Nastavenia</string>
 <string name="plugin_install_needs_network">Pre nainštalovanie tohto zásuvného modulu potrebujete pripojenie na Internet.</string>
-<string name="enable_plugin2">Zapnúť</string>
-	<string name="disable_plugin2">Vypnúť</string>
 	<string name="get_plugin">Získať</string>
 <string name="plugin_ski_name">Lyžiarsky mapový pohľad</string>
     <string name="plugin_nautical_name">Námorný mapový pohľad</string>
@@ -2092,10 +2068,81 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="days_behind">dní pozadu</string>
 	<string name="rename_failed">Premenovanie zlyhalo.</string>
 	<string name="back_to_map">Späť na mapu</string>
-<string name="selected_tracks">Vybrané</string>
 	<string name="track_segments">Úseky stopy</string>
 	<string name="track_points">Body stopy</string>
 	<string name="turn_off_all">Vypnúť všetky</string>
 	<string name="showed_on_map">Zobrazené na mape</string>
 	<string name="currently_recording_track">Nahráva sa stopa</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">OK</string>
+	<string name="shared_string_cancel">Zrušiť</string>
+	<string name="shared_string_dismiss">Zamietnuť</string>
+	<string name="shared_string_yes">Áno</string>
+	<string name="shared_string_no">Nie</string>
+	<string name="shared_string_on">Zapnuté</string>
+	<string name="shared_string_off">Vypnuté</string>
+	<string name="shared_string_previous">Predchádzajúci</string>
+	<string name="shared_string_next">Nasledujúci</string>
+	<string name="shared_string_enable">Povoliť</string>
+	<string name="shared_string_disable">Zakázať</string>
+	<string name="shared_string_enabled">Povolené</string>
+	<string name="shared_string_disabled">Zakázané</string>
+	<string name="shared_string_selected">Vybrané</string>
+	<string name="shared_string_selected_lowercase">vybrané</string>
+	<string name="shared_string_never">Nikdy</string>
+	<string name="shared_string_none">Žiadne</string>
+	<string name="shared_string_and">a</string>
+	<string name="shared_string_or">alebo</string>
+	<string name="shared_string_help">Pomoc</string>
+	<string name="shared_string_settings">Nastavenia</string>
+	<string name="shared_string_history">História</string>
+	<string name="shared_string_select_on_map">Vybrať na mape</string>
+	<string name="shared_string_select_all">Vybrať všetko</string>
+	<string name="shared_string_deselect">Zrušiť výber</string>
+	<string name="shared_string_deselect_all">Zrušiť výber všetkých</string>
+	<string name="shared_string_clear">Vymazať</string>
+	<string name="shared_string_clear_all">Vymazať všetko</string>
+	<string name="shared_string_save">Uložiť</string>
+	<string name="shared_string_save_as_gpx">Uložiť ako GPX stopu</string>
+	<string name="shared_string_rename">Premenovať</string>
+	<string name="shared_string_delete">Odstrániť</string>
+	<string name="shared_string_delete_all">Odstrániť všetko</string>
+	<string name="shared_string_share">Zdieľať</string>
+	<string name="shared_string_add">Pridať</string>
+	<string name="shared_string_apply">Aplikovať</string>
+	<string name="shared_string_control_start">Spustiť</string>
+	<string name="shared_string_control_stop">Zastaviť</string>
+	<string name="shared_string_import">Import</string>
+	<string name="shared_string_export">Export</string>
+	<string name="shared_string_more">Viac</string>
+	<string name="shared_string_more_actions">Viac činností</string>
+	<string name="shared_string_do_not_show_again">Už viac nezobrazovať</string>
+	<string name="shared_string_remember_my_choice">Zapamätať moju voľbu</string>
+	<string name="shared_string_refresh">Obnoviť</string>
+	<string name="shared_string_download">Stiahnuť</string>
+	<string name="shared_string_downloading">Sťahovanie</string>
+	<string name="shared_string_download_successful">Sťahovanie úspešné</string>
+	<string name="shared_string_io_error">Nastala chyba čítania/zápisu</string>
+	<string name="shared_string_unexpected_error">Nastala neočakávaná chyba</string>
+	<string name="shared_string_action_template">"Činnosť {0}"</string>
+	<string name="shared_string_close">Zavrieť</string>
+	<string name="shared_string_exit">Ukončiť</string>
+	<string name="shared_string_show">Zobraziť</string>
+	<string name="shared_string_show_all">Zobraziť všetko</string>
+	<string name="shared_string_show_on_map">Zobraziť na mape</string>
+	<string name="shared_string_map">Mapa</string>
+	<string name="shared_string_favorite">Obľúbené</string>
+	<string name="shared_string_favorites">Obľúbené</string>
+	<string name="shared_string_add_to_favorites">Pridať k obľúbeným</string>
+	<string name="shared_string_my_location">Moja poloha</string>
+	<string name="shared_string_my_places">Moje miesta</string>
+	<string name="shared_string_my_favorites">Moje obľúbené</string>
+	<string name="shared_string_my_tracks">Moje stopy</string>
+	<string name="shared_string_currently_recording_track">Nahráva sa stopa</string>
+	<string name="shared_string_audio">Zvuk</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Foto</string>
+
+	<string name="route_points">Body trasy</string>
+	<string name="shared_string_release">Vydaná</string>
 	</resources>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 0aeff51c73..7faa3abfa4 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -34,9 +34,9 @@
 	<string name="search_address_building_option">Hiša</string>
 	<string name="search_address_street_option">Sekajoča cesta</string>
 	<string name="context_menu_item_add_favorite">Dodaj med priljubljene</string>
-	<string name="default_buttons_yes">Da</string>
-	<string name="default_buttons_no">Ne</string>
-	<string name="default_buttons_cancel">Prekliči</string>
+	<string name="shared_string_yes">Da</string>
+	<string name="shared_string_no">Ne</string>
+	<string name="shared_string_cancel">Prekliči</string>
 	<string name="default_buttons_add">Dodaj</string>
 	<string name="default_buttons_apply">Uporabi</string>
 	<string name="context_menu_item_create_poi">Ustvari POI</string>
@@ -264,7 +264,7 @@
 	<string name="indexing_map">Indeksiranje karte …</string>
 	<string name="indexing_poi">Indeksiranje POI …</string>
 	<string name="indexing_transport">Indeksiranje javnih prevozov …</string>
-	<string name="input_output_error">I/O napaka</string>
+	<string name="shared_string_io_error">I/O napaka</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -570,8 +570,8 @@
 	<string name="send_location_sms_pattern">Mesto: %1$s\n%2$s</string>
 	<string name="tip_initial_t">"OsmAnd je navigacijska aplikacija s številnimi funkcijami.
 \n\nOsnovni uvod, nekaj uporabnih namigov in trikov je na voljo na povezavi z \'Meni\' → \'Pomoč\' na zaslonu zemljevida. "</string>
-	<string name="next_button">Naprej</string>
-	<string name="previous_button">Nazaj</string>
+	<string name="shared_string_next">Naprej</string>
+	<string name="shared_string_previous">Nazaj</string>
 	<string name="tip_initial">Pomoč</string>
 	<string name="tip_search">Iskanje</string>
 	<string name="tip_rotation_switching">Usmerjenost zemljevida</string>
@@ -626,14 +626,14 @@
 	<string name="show_ruler_level">Prikaži ravnilo</string>	
 	<string name="info_button">Info</string>
 	<string name="back_to_location">Nazaj na mesto</string>
-	<string name="help">Pomoč</string>
+	<string name="shared_string_help">Pomoč</string>
 	<string name="show_details">Pokaži podrobnosti</string>
 	<string name="accessibility_extensions_descr">Razširitve dostopnosti za stare različice Android</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="accessibility_on">Vklopljeno</string>
-	<string name="accessibility_off">Izklopljeno</string>
+	<string name="shared_string_on">Vklopljeno</string>
+	<string name="shared_string_off">Izklopljeno</string>
 	<string name="accessibility_default">Glede na splošne sistemske nastavitve</string>
 	<string name="backToMenu">Nazaj v meni</string>
 	<string name="auto_announce_on">Začni s samodejnimi najavami</string>
@@ -803,7 +803,7 @@
 	<string name="map_underlay">Spodaj ležeči zemljevid</string>
 	<string name="map_underlay_descr">Izberi spodaj ležeči zemljevid</string>
 	<string name="layer_overlay">Prekrivni zemljevid …</string>
-	<string name="default_none">Brez</string>
+	<string name="shared_string_none">Brez</string>
 	<string name="map_overlay">Prekrivni zemljevid</string>
 	<string name="map_overlay_descr">Izberi prekrivni zemljevid</string>
 	<string name="tile_source_already_installed">Zemljevid je že nameščen, nastavitve bodo posodobljene</string>
@@ -829,7 +829,7 @@
 \n\nZa prikaz vseh priljubljenih točk direktno na zemljevidu, omogočite sloj \'Priljubljene\' v \'Meni\' → \'Nastavitve zemljevida\'. "</string>
 	<string name="transport">Prevoz</string>
 	<string name="additional_settings">Dodatne nastavitve</string>
-	<string name="settings">Nastavitve</string>
+	<string name="shared_string_settings">Nastavitve</string>
 	<string name="save_current_track">Shrani trenutno sled GPX</string>
 	<string name="save_current_track_descr">Shrani trenutno GPX pot na SD kartico</string>
 	<string name="save_track_interval">Interval beleženja med navigacijo</string>
@@ -961,7 +961,7 @@
 	<string name="transport_to_go_before">naslednja razdalja</string>
 	<string name="transport_stops_to_pass">postaje do izstopa</string>
 	<string name="transport_route_distance">Razdalja poti</string>
-	<string name="default_buttons_ok">V redu</string>
+	<string name="shared_string_ok">V redu</string>
 	<string name="show_transport_over_map_description">Prikaz postaj javnega prevoza na zemljevidu</string>
 	<string name="show_transport_over_map">Prikaz postaj prevoza</string>
 	<string name="update_poi_success">POI podatki so bili uspešno posodobljeni ({0} naloženih)</string>
@@ -976,7 +976,7 @@
 	<string name="search_history_int_streets">Križišče: {0} z {1} v {2}</string>
 	<string name="search_history_building">Zgradba: {0}, {1}, {2}</string>
 	<string name="clear_all">Počisti vse</string>
-	<string name="history">Zgodovina</string>
+	<string name="shared_string_history">Zgodovina</string>
 	<string name="uploading_data">Nalaganje podatkov …</string>
 	<string name="uploading">Nalaganje …</string>
 	<string name="search_nothing_found">Ničesar najdeno</string>
@@ -1505,8 +1505,8 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 \n\nRazen \'privzetega\' sloga zemljevida, lahko v \'Meni\' → \'Nastavitve zemljevida\' → \'Slog zemljevida\' zberete npr.:
 \n\t* The \'Touring view\' style, which contains the most detailed information feasable for traveling and touring, including optimization for professional drivers (higher contrast, distinguishable roads), options for Alpine hiking (SAC scale), cycle routes, hiking symbol support, etc. ↵\n\t* \'High contrast roads\' shows roads in very accentuated colors for bright ambient lighting situations ↵\n\t* \'Winter and ski\' creates a (snow covered) winter landscape view, and shows global ski slopes and lifts (in connection with the \'World ski\' map download) "</string>
     <string name="base_world_map">Osnovni zemljevid sveta</string>
-	<string name="default_and">in</string>
-    <string name="default_or">ali</string>
+	<string name="shared_string_and">in</string>
+    <string name="shared_string_or">ali</string>
 	<string name="route_is_too_long">OsmAnd usmerjanje brez povezave lahko traja zelo dolgo (ali včasih ne deluje) za točke, ki so med sabo oddaljene več kot 200 km. Za boljše delovanje boste morda želeli dodati kakšno vmesno točko na poti.</string>
 	<string name="auto_zoom_none">Ne samodejna povečava</string>
 	<string name="auto_zoom_farthest">Na dolge razdalje</string>
@@ -1611,8 +1611,8 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="keep_and_add_destination_point">Dodaj kot ciljno točko</string>
     <string name="select_gpx">Izberite GPX …</string>
     <string name="route_descr_select_destination">Izberite cilj</string>
-    <string name="route_descr_select_on_map">Izberite na zemljevidu …</string>
-    <string name="route_descr_favorite">Priljubljene …</string>
+    <string name="shared_string_select_on_map">Izberite na zemljevidu …</string>
+    <string name="shared_string_favorite">Priljubljene …</string>
     <string name="android_19_location_disabled">Od Android verzije 4.4 (KitKat) naprej, prenos posodobitev zemljevidov ni mogoč na prejšnjo mesto hrambe (%s). Ali želite to spremeniti na takšno mesto, kjer bo to mogoče in skopirati vse OsmAnd podatke tja?
 \n Opomba 1: stare datoteke ne bodo spremenjene (vendar jih lahko ročno izbrišete).
 \n Opomba 2: v novem mestu shrambe si aplikaciji OsmAnd and OsmAnd+ ne bosta mogli deliti podatkov.</string>
@@ -1715,7 +1715,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="gpx_info_avg_altitude">Povprečna višina: %1$s</string>
 	<string name="loading_smth">Nalaganje %1$s …</string>
     <string name="map_widget_plain_time">Trenutni čas</string>
-    <string name="selected">izbrano</string>
+    <string name="shared_string_selected_lowercase">izbrano</string>
     <string name="gpx_timespan">Časovni razpon: %1$s</string>
 	<string name="gpx_selection_number_of_points"> %1$s točk</string>
     <string name="gpx_selection_point">Točka %1$s</string>
@@ -1902,7 +1902,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="rendering_attr_trainLightrailRoutes_name">Proge vlakov</string>
     <string name="wake_on_voice">Vklopiti zaslon</string>
     <string name="wake_on_voice_descr">Vklopi zaslon naprave (če izklopljen), ko se približujete obratu</string>
-    <string name="wake_on_voice_never">Nikoli</string>
+    <string name="shared_string_never">Nikoli</string>
     <string name="rendering_category_transport">Prevoz</string>
     <string name="rendering_category_others">Druge lastnosti zemljevida</string>
     <string name="map_widget_appearance_rem">Preostali elementi</string>
@@ -1947,7 +1947,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="download_tab_updates">Posodobitve</string>
     <string name="download_tab_local">Krajevno</string>
 	<string name="no_internet_connection">Prenos ni mogoč. Prosim, preverite vašo internetno povezavo.</string>
-    <string name="dismiss">Zapri</string>
+    <string name="shared_string_dismiss">Zapri</string>
     <string name="everything_up_to_date">Vse datoteke posodobljene</string>
     <string name="osmo_use_https">Uporabi HTTPS</string>
 	<string name="advanced_settings">Napredno</string>
@@ -1991,15 +1991,15 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="proxy_host_descr">Nastavitev imena gostitelja vašega proxy-ja (npr. 127.0.0.1)</string>
 	<string name="proxy_port_title">Vrata proxy-ja</string>
 	<string name="proxy_port_descr">Nastavitev številko vrat vašega proxy-ja (npr. 8118)</string>
-	<string name="enable_plugin">Onemogočeno</string>
-	<string name="disable_plugin">Omogočeno</string>
+	<string name="shared_string_disabled">Onemogočeno</string>
+	<string name="shared_string_enabled">Omogočeno</string>
 <string name="plugin_ski_name">Smučarske karte</string>
     <string name="plugin_nautical_name">Pomorska karta</string>
     <string name="world_ski_missing">Če želite prikazati smučarske karte, morate prenesti posebne zemljevide za delovanje brez povezave</string>
     <string name="nautical_maps_missing">Če želite prikazati pomorske karte, morate prenesti posebne zemljevide za delovanje brez povezave</string>
 	<string name="edit_group">Urejanje skupine</string>
-    <string name="enable_plugin2">Omogoči</string>
-	<string name="disable_plugin2">Onemogoči</string>
+    <string name="shared_string_enable">Omogoči</string>
+	<string name="shared_string_disable">Onemogoči</string>
 	<string name="plugin_description_title">Opis</string>
 	<string name="plugin_settings_button_caption">Nastavitve</string>
 	<string name="plugin_install_needs_network">Za namestitev tega vtičnika potrebujete internetno povezavo.</string>
diff --git a/OsmAnd/res/values-sq/strings.xml b/OsmAnd/res/values-sq/strings.xml
index f820c79dd1..9a3cecfb63 100644
--- a/OsmAnd/res/values-sq/strings.xml
+++ b/OsmAnd/res/values-sq/strings.xml
@@ -11,11 +11,11 @@
     <string name="animate_routing_route_not_calculated">Ju lutem, fillimisht llogaritni rrugen</string>
     <string name="remember_choice">Mos harroni zgjedhjen time</string>
     <string name="gps_status_eclipsim">Statusi i GPS-it</string>
-    <string name="default_and">dhe</string>
-    <string name="default_or">ose</string>
+    <string name="shared_string_and">dhe</string>
+    <string name="shared_string_or">ose</string>
 	<string name="auto_zoom_none">Nuk ka afrim automatik</string>
-	<string name="default_buttons_no">Jo</string>
-	<string name="default_buttons_yes">Po</string>
+	<string name="shared_string_no">Jo</string>
+	<string name="shared_string_yes">Po</string>
 	<string name="tip_map_styles">Stili Hartës</string>
 	<string name="about_version">Versioni:</string>
     <string name="about_settings">Rreth</string>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 2309a1f05a..8247a3b354 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -13,8 +13,8 @@
     <string name="animate_routing_route">Симулација помоћу израчунате путање </string>
     <string name="animate_routing_gpx">Симулација помоћу GPX путање</string>
     <string name="remember_choice">Запамти мој избор</string>
-    <string name="default_and">и</string>
-    <string name="default_or">или</string>
+    <string name="shared_string_and">и</string>
+    <string name="shared_string_or">или</string>
 	<string name="auto_zoom_none">Без ауто-зума</string>
 	<string name="base_world_map">Основна карта света</string>
 	<string name="tip_map_styles">Стилови мапа</string>
@@ -238,7 +238,7 @@
     <string name="download_tab_updates">Надоградње</string>
     <string name="download_tab_local">Месно</string>
 	<string name="no_internet_connection">Преузимање је немогуће, проверите везу са Интернетом.</string>
-    <string name="dismiss">Откажи</string>
+    <string name="shared_string_dismiss">Откажи</string>
     <string name="everything_up_to_date">Све датотеке су свеже</string>
     <string name="use_opengl_render">Користи ОпенГЛ за приказ</string>
     <string name="use_opengl_render_descr">Користи хардверско убрзање ОпенГЛ-а за приказ (можда не ради на неким уређајима)</string>
@@ -250,7 +250,7 @@
 	<string name="show_map">ПРИКАЖИ КАРТУ</string>
 	<string name="show_all">ПРИКАЖИ СВЕ</string>
 	<string name="coordinates">Координате</string>
-	<string name="wake_on_voice_never">Никад</string>
+	<string name="shared_string_never">Никад</string>
     <string name="select_impassable_road">Означи на карти…</string>
     <string name="rendering_category_hide">Сакриј</string>
     <string name="rendering_category_details">Појединости</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 06feecf565..b4cb8cf645 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -71,9 +71,9 @@
 <string name="default_buttons_reset">Töm</string>
 <string name="filter_current_poiButton">Filter</string>
 <string name="add_favorite_dialog_default_favourite_name">Favorit</string>
-<string name="default_buttons_no">Nej</string>
-<string name="default_buttons_yes">Ja</string>
-<string name="default_buttons_cancel">Avbryt</string>
+<string name="shared_string_no">Nej</string>
+<string name="shared_string_yes">Ja</string>
+<string name="shared_string_cancel">Avbryt</string>
 <string name="default_buttons_apply">Verkställ</string>
 <string name="default_buttons_add">Lägg till</string>
 <string name="add_favorite_dialog_top_text">Ange namn på favorit</string>
@@ -160,14 +160,14 @@
 <string name="gpx_tags_txt">Taggar</string>
 <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="help">Hjälp</string>
+<string name="shared_string_help">Hjälp</string>
 <string name="show_details">Visa detaljer</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="accessibility_on">På</string>
-<string name="accessibility_off">Av</string>
+<string name="shared_string_on">På</string>
+<string name="shared_string_off">Av</string>
 <string name="accessibility_default">Enligt de globala systeminställningarna</string>
 <string name="backToMenu">Tillbaka till menyn</string>
 <string name="zoomOut">Zooma ut</string>
@@ -515,7 +515,7 @@
 <string name="map_underlay">Underläggskarta</string>
 <string name="map_underlay_descr">Välj underläggskarta</string>
 <string name="layer_overlay">Överläggskarta …</string>
-<string name="default_none">Inga</string>
+<string name="shared_string_none">Inga</string>
 <string name="map_overlay">Överläggskarta</string>
 <string name="map_overlay_descr">Välj överläggskarta</string>
 <string name="tile_source_already_installed">Kartan är redan installerad; inställningarna kommer att uppdateras</string>
@@ -551,8 +551,8 @@
 \n\nFör alla träffar erbjuds alternativ som \'Vägvisning\' eller \'Visa på kartan\' etc. "</string>
 <string name="tip_map_context_menu">Snabbmeny för karta</string>
 <string name="tip_initial">Hjälp</string>
-<string name="next_button">Nästa</string>
-<string name="previous_button">Föregående</string>
+<string name="shared_string_next">Nästa</string>
+<string name="shared_string_previous">Föregående</string>
 <string name="unit_of_length_descr">Ändra enheter för avstånd och hastighet</string>
 <string name="unit_of_length">Måttenhet</string>
 <string name="si_mi_foots">Eng. mil/fot</string>
@@ -592,7 +592,7 @@
 <string name="indexing_map">Indexerar kartan …</string>
 <string name="indexing_poi">Indexerar Intressepunkter …</string>
 <string name="indexing_transport">Indexerar transport …</string>
-<string name="input_output_error">Ett I/O-fel har inträffat</string>
+<string name="shared_string_io_error">Ett I/O-fel har inträffat</string>
 <string name="km">km</string>
 <string name="km_h">km/h</string>
 <string name="m">m</string>
@@ -808,7 +808,7 @@
 	<string name="transport_stops_to_pass">hållplatser att passera</string>
 	<string name="transport_route_distance">Resvägssträcka</string>
 	<string name="transport">Transporter</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">Visa hållplatser för kollektivtrafik på kartan</string>
 	<string name="show_transport_over_map">Visa hållplatser</string>
 	<string name="hello">Navigationsappen OsmAnd</string>
@@ -824,7 +824,7 @@
 	<string name="search_history_building">Byggnad: {0},{1},{2}</string>
 	<string name="favorite">Favorit</string>
 	<string name="clear_all">Ta bort alla</string>
-	<string name="history">Historik</string>
+	<string name="shared_string_history">Historik</string>
 	<string name="uploading_data">Laddar upp data …</string>
 	<string name="uploading">Laddar upp …</string>
 	<string name="search_nothing_found">Hittar ingenting</string>
@@ -1041,7 +1041,7 @@
 	<string name="map_preferences_descr">Ange kartinställningar: kartkälla, rotation, markörposition, skärmorientering</string>
 	<string name="osm_settings">Redigera OSM</string>
 	<string name="additional_settings">Ytterligare inställningar</string>
-	<string name="settings">Inställningar</string>
+	<string name="shared_string_settings">Inställningar</string>
 	<string name="save_current_track_descr">Spara aktuellt spår till SD-kortet nu</string>
 	<string name="save_current_track">Spara aktuellt GPX-spår</string>
 	<string name="save_track_interval">Loggningsintervall under navigering</string>
@@ -1302,8 +1302,8 @@
 	<string name="auto_zoom_close">Nära</string>
 	<string name="auto_zoom_far">Medelavstånd</string>
 	<string name="auto_zoom_farthest">Långt avstånd</string>
-	<string name="default_and">och</string>
-    <string name="default_or">eller</string>
+	<string name="shared_string_and">och</string>
+    <string name="shared_string_or">eller</string>
 	<string name="remember_choice">Kom ihåg mitt val</string>
     <string name="gps_status_eclipsim">GPS-status</string>
     <string name="animate_routing_route_not_calculated">Beräkna rutten först</string>
@@ -1356,8 +1356,8 @@
 	<string name="routing_attr_short_way_description">Använd kortaste väg</string>
 	<string name="select_gpx">Välj GPX …</string>
     <string name="route_descr_select_destination">Välj destination</string>
-    <string name="route_descr_select_on_map">Välj på karta …</string>
-    <string name="route_descr_favorite">Favorit …</string>
+    <string name="shared_string_select_on_map">Välj på karta …</string>
+    <string name="shared_string_favorite">Favorit …</string>
     <string name="route_preferences">Ruttinställningar</string>
     <string name="route_info">Ruttinformation</string>
     <string name="keep_and_add_destination_point">Lägg till som destinationspunkt</string>
@@ -1533,7 +1533,7 @@
     <string name="gpx_wpt">Waypoint</string>
     <string name="selected_gpx_info_show">\n\nTryck och håll för att se på karta</string>
     <string name="delay_navigation_start">Starta steg-för-steg-navigering automatiskt</string>
-    <string name="selected">valda</string>
+    <string name="shared_string_selected_lowercase">valda</string>
     <string name="gpx_split_interval">Split-intervall</string>
     <string name="gpx_info_subtracks">Underspår: %1$s </string>
 	<string name="gpx_info_waypoints">Waypoints: %1$s </string>
@@ -1723,7 +1723,7 @@
     <string name="wake_on_voice">Slå på skärmen</string>
     <string name="wake_on_voice_descr">Slå på skärmen (om den är av) när jag närmar mig en sväng</string>
     <string name="lock_screen_request_explanation">%1$s behöver denna tillåtelse för att stänga av skärmen för strömsparningsfunktionen.</string>
-    <string name="wake_on_voice_never">Aldrig</string>
+    <string name="shared_string_never">Aldrig</string>
     <string name="advanced_settings">Avancerat</string>
 	<string name="osmo_use_https">Använd HTTPS</string>
 	<string name="osmo_use_https_descr">Använd säker anslutning till servern</string>
@@ -1734,7 +1734,7 @@
 	<string name="coordinates">Koordinater</string>
 	<string name="map_update">Det finns %1$s uppdatering(ar)</string>
 	<string name="error_avoid_specific_road">Hittar ingen förbifart</string>
-    <string name="dismiss">Avböj</string>
+    <string name="shared_string_dismiss">Avböj</string>
     <string name="everything_up_to_date">Alla filer är uppdaterade</string>
     <string name="use_opengl_render">Använd OpenGL-rendering</string>
     <string name="use_opengl_render_descr">Använd hårdvaruaccelererad OpenGL-rendering (fungerar kanske inte på vissa enheter)</string>
@@ -1789,14 +1789,14 @@
     <string name="tracks">Spår</string>
     <string name="my_location">Min plats</string>
     <string name="osm_editing_manage">Hantera</string>
-    <string name="enable_plugin">Inaktiverad</string>
-	<string name="disable_plugin">Aktiverad</string>
+    <string name="shared_string_disabled">Inaktiverad</string>
+	<string name="shared_string_enabled">Aktiverad</string>
 <string name="plugin_settings_button_caption">Inställningar</string>
 <string name="plugin_description_title">Beskrivning</string>
 	<string name="edit_group">Redigera grupp</string>
     <string name="plugin_install_needs_network">En Internetuppkoppling krävs för att installera denna modul.</string>
-<string name="enable_plugin2">Aktivera</string>
-	<string name="disable_plugin2">Inaktivera</string>
+<string name="shared_string_enable">Aktivera</string>
+	<string name="shared_string_disable">Inaktivera</string>
 	<string name="get_plugin">Hämta</string>
 <string name="plugin_ski_name">Skidkartsvy</string>
     <string name="plugin_nautical_name">Sjökortsvy</string>
@@ -1837,7 +1837,8 @@
 	<string name="back_to_map">Tillbaka till kartan</string>
 	<string name="turn_off_all">Stäng av alla</string>
 	<string name="showed_on_map">Visade på kartan</string>
-	<string name="selected_tracks">Markerade</string>
+	<string name="shared_string_selected">Markerade</string>
 	<string name="track_segments">Spårsegment</string>
 	<string name="track_points">Spårpunkter</string>
+	<string name="route_points">Ruttpunkter</string>
 	</resources>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 67b56c744b..af6e9042d9 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -307,10 +307,10 @@
 	<string name="map_settings">Harita Ayarları</string>
 	<string name="extra_settings">Gelişmiş Ayarlar</string>
 	<string name="default_buttons_support">Destek</string>
-	<string name="help">Yardım</string>
+	<string name="shared_string_help">Yardım</string>
 	<string name="show_details">Ayrıntıları göster</string>
-	<string name="accessibility_on">Açık</string>
-	<string name="accessibility_off">Kapalı</string>
+	<string name="shared_string_on">Açık</string>
+	<string name="shared_string_off">Kapalı</string>
 	<string name="backToMenu">Menüye Geri Dön</string>
 	<string name="zoomOut">Uzaklaştır</string>
 	<string name="zoomIn">Yaklaştır</string>
@@ -375,8 +375,8 @@
 	<string name="tip_navigation">Gezinti</string>
 	<string name="tip_search">Aranıyor</string>
 	<string name="tip_initial">İpuçları ve püf noktaları</string>
-	<string name="next_button">Sonraki</string>
-	<string name="previous_button">Önceki</string>
+	<string name="shared_string_next">Sonraki</string>
+	<string name="shared_string_previous">Önceki</string>
 	<string name="unit_of_length_descr">Uzunluk ve hız birimlerini değiştir</string>
 	<string name="si_km_m">Kilometre/metre</string>
 	<string name="amenity_type_education">Eğitim</string>
@@ -432,7 +432,7 @@
 	<string name="first_time_continue">Sonra</string>
 	<string name="search_poi_location">Sinyal aranıyor…</string>
 	<string name="transport_Routes">Rotalar</string>
-	<string name="default_buttons_ok">Tamam</string>
+	<string name="shared_string_ok">Tamam</string>
 	<string name="clear_all">Hepsini temizle</string>
 	<string name="searching">Aranıyor…</string>
 	<string name="searching_address">Adres aranıyor…</string>
@@ -463,7 +463,7 @@
 	<string name="use_online_routing">İnternete bağlı navigasyonu kullanın</string>
 	<string name="data_settings">Veriler</string>
 	<string name="additional_settings">İlave ayarlar</string>
-	<string name="settings">Ayarlar</string>
+	<string name="shared_string_settings">Ayarlar</string>
 	<string name="update_tile">Haritayı güncelle</string>
 	<string name="mark_point">"Hedef "</string>
 	<string name="favourites_activity">Favoriler</string>
@@ -496,11 +496,11 @@
 	<string name="context_menu_item_add_favorite">Favorilere ekle</string>
 	<string name="context_menu_item_update_map">Haritayı güncelle</string>
 	<string name="context_menu_item_create_poi">POI oluştur</string>
-	<string name="default_buttons_yes">Evet</string>
-	<string name="default_buttons_cancel">İptal et</string>
+	<string name="shared_string_yes">Evet</string>
+	<string name="shared_string_cancel">İptal et</string>
 	<string name="default_buttons_apply">Uygula</string>
 	<string name="default_buttons_add">Ekle</string>
-	<string name="default_buttons_no">Hayır</string>
+	<string name="shared_string_no">Hayır</string>
 	<string name="add_favorite_dialog_default_favourite_name">Favori</string>
 	<string name="favourites_context_menu_delete">Favoriyi sil</string>
 	<string name="osb_add_dialog_error">İstisnai durum oluştu: Hata oluşturulamadı</string>
@@ -968,7 +968,7 @@
 	<string name="context_menu_item_share_location">Konum paylaş</string>
 	<string name="amenity_type_landuse">Arazi</string>
 	<string name="amenity_type_transportation">Taşıma</string>
-	<string name="input_output_error">G/Ç hatası oluştu</string>
+	<string name="shared_string_io_error">G/Ç hatası oluştu</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -1060,7 +1060,7 @@
 	<string name="search_history_city">Şehir: {0}</string>
 	<string name="search_history_street">Sokak: {0}, {1}</string>
 	<string name="search_history_building">Bina: {0}, {1}, {2}</string>
-	<string name="history">Geçmiş</string>
+	<string name="shared_string_history">Geçmiş</string>
 	<string name="uploading_data">Veri yükleniyor…</string>
 	<string name="uploading">Yükleniyor…</string>
 	<string name="search_nothing_found">Sonuç bulunamadı</string>
@@ -1131,7 +1131,7 @@
 	<string name="voice_stream_voice_call">Sesli çağrı sesi</string>
 	<string name="map_transparency_descr">Temel harita saydamlığını değiştirin</string>
 	<string name="map_transparency">Temel harita saydamlığı</string>
-	<string name="default_none">Hiçbiri</string>
+	<string name="shared_string_none">Hiçbiri</string>
 	<string name="map_underlay">Alt katman harita</string>
 	<string name="map_underlay_descr">Alt katman harita seç</string>
 	<string name="layer_overlay">Üst katman harita…</string>
@@ -1187,8 +1187,8 @@
     <string name="animate_routing_gpx">GPX Rota kullanarak simülasyonlar</string>
     <string name="remember_choice">Seçmeyi unutmayın</string>
     <string name="gps_status_eclipsim">GPS Durumu</string>
-    <string name="default_and">ve</string>
-    <string name="default_or">veya</string>
+    <string name="shared_string_and">ve</string>
+    <string name="shared_string_or">veya</string>
 	<string name="route_is_too_long">OsmAnd isimli yönlendirme fazla 200km ayrı noktalarda için çok uzun ( ya da bazen çalışmıyor ) alabilir .Daha iyi performans için ara rota noktası eklemek isteyebilirsiniz .</string>
 	<string name="auto_zoom_none">Otomatik odaklama Kapalı</string>
 	<string name="auto_zoom_close">yakın</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 1d5ec3dd8c..845770cf61 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -100,14 +100,14 @@
   <string name="show_ruler_level">Відображати масштаб</string>
   <string name="info_button">Інформація</string>
   <string name="back_to_location">Повернутись</string>
-  <string name="help">Допомога</string>
+  <string name="shared_string_help">Допомога</string>
   <string name="show_details">Показати деталі</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_on">Увімкнено</string>
-  <string name="accessibility_off">Вимкнено</string>
+  <string name="shared_string_on">Увімкнено</string>
+  <string name="shared_string_off">Вимкнено</string>
   <string name="accessibility_default">Використовувати системні налаштування</string>
   <string name="backToMenu">Головне меню</string>
   <string name="zoomOut">Зменшити</string>
@@ -380,7 +380,7 @@
   <string name="map_underlay">Фонова мапа</string>
   <string name="map_underlay_descr">Виберіть фоновий шар для основної мапи</string>
   <string name="layer_overlay">Верхній шар…</string>
-  <string name="default_none">Нема</string>
+  <string name="shared_string_none">Нема</string>
   <string name="map_overlay">Верхній шар</string>
   <string name="map_overlay_descr">Виберіть верхній шар для основної мапи</string>
   <string name="tile_source_already_installed">Мапа вже встановлена, налаштування будуть оновлені</string>
@@ -431,8 +431,8 @@
   <string name="tip_initial">Допомога</string>
   <string name="tip_initial_t">"OsmAnd — навігаційна програма з великими можливостями.
 \n\nПочаткові відомості, як і деякі поради щодо використання знаходяться в \'Меню\'→\'Допомога\' на екрані з мапою. "</string>
-  <string name="next_button">Наступний</string>
-  <string name="previous_button">Попередній</string>
+  <string name="shared_string_next">Наступний</string>
+  <string name="shared_string_previous">Попередній</string>
   <string name="unit_of_length_descr">Змінити одиниці вимірювання довжини і швидкості</string>
   <string name="unit_of_length">Одиниці вимірювання</string>
   <string name="si_mi_foots">Милі/фути</string>
@@ -475,7 +475,7 @@
   <string name="indexing_map">Індексуються мапи…</string>
   <string name="indexing_poi">Індексуються POI…</string>
   <string name="indexing_transport">Індексується транспорт…</string>
-  <string name="input_output_error">Помилка вводу/виводу</string>
+  <string name="shared_string_io_error">Помилка вводу/виводу</string>
   <string name="km">км</string>
   <string name="km_h">км/г</string>
   <string name="m">м</string>
@@ -652,7 +652,7 @@
   <string name="transport_stops_to_pass">зупинок в дорозі</string>
   <string name="transport_route_distance">Довжина маршруту</string>
   <string name="transport">Транспорт</string>
-  <string name="default_buttons_ok">OK</string>
+  <string name="shared_string_ok">OK</string>
   <string name="show_transport_over_map_description">Показувати зупинки громадського транспорту</string>
   <string name="show_transport_over_map">Показувати зупинки траспорта</string>
   <string name="hello">Навігаційна програма OsmAnd</string>
@@ -669,7 +669,7 @@
   <string name="search_history_building">Будівля: {0}, {1}, {2}</string>
   <string name="favorite">Закладки</string>
   <string name="clear_all">Очистити все</string>
-  <string name="history">Історія</string>
+  <string name="shared_string_history">Історія</string>
   <string name="uploading_data">Завантаження даних…</string>
   <string name="uploading">Завантаження…</string>
   <string name="search_nothing_found">Нічого не знайдено</string>
@@ -746,7 +746,7 @@
   <string name="auto_zoom_map_descr">Автомасштабування мапи відповідно до вашої швидкості (доки мапу синхронізовано із поточним місцезнаходженням)</string>
   <string name="auto_zoom_map">Автомасштабування</string>
   <string name="additional_settings">Додаткові налаштування</string>
-  <string name="settings">Налаштування</string>
+  <string name="shared_string_settings">Налаштування</string>
   <string name="save_current_track_descr">Зберегти активний трек на SD</string>
   <string name="save_current_track">Зберегти активний GPX трек</string>
   <string name="save_track_interval">Інтервал збереження під час навіґації</string>
@@ -826,11 +826,11 @@
   <string name="context_menu_item_update_map">Оновити мапу</string>
   <string name="context_menu_item_open_bug">Повідомити про помилку на мапі</string>
   <string name="context_menu_item_create_poi">Додати POI</string>
-  <string name="default_buttons_yes">Так</string>
-  <string name="default_buttons_cancel">Скасувати</string>
+  <string name="shared_string_yes">Так</string>
+  <string name="shared_string_cancel">Скасувати</string>
   <string name="default_buttons_apply">Застосувати</string>
   <string name="default_buttons_add">Додати</string>
-  <string name="default_buttons_no">Ні</string>
+  <string name="shared_string_no">Ні</string>
   <string name="add_favorite_dialog_top_text">Введіть ім’я точки</string>
   <string name="add_favorite_dialog_default_favourite_name">Закладка</string>
   <string name="add_favorite_dialog_favourite_added_template">Точка \'\'{0}\'\' успішно додана в Закладки.</string>
@@ -1661,7 +1661,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="gpx_wpt">Маршрутна точка</string>
     <string name="selected_gpx_info_show">\n\nНатиснути і утримувати для перегляду на мапі</string>
     <string name="delay_navigation_start">Запускати навігацію автоматично</string>
-    <string name="selected">виділені</string>
+    <string name="shared_string_selected_lowercase">виділені</string>
     <string name="gpx_info_subtracks">"Субтреки: %1$s "</string>
 	<string name="gpx_info_waypoints">"Шляхові точки: %1$s "</string>
 	<string name="gpx_info_distance">"Відстань: %1$s (%2$s точок) "</string>
@@ -1785,8 +1785,8 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="keep_and_add_destination_point">Додати як пункт призначення</string>
     <string name="select_gpx">Обрати GPX…</string>
     <string name="route_descr_select_destination">Обрати місце призначення</string>
-    <string name="route_descr_select_on_map">Вибрати на мапі…</string>
-    <string name="route_descr_favorite">Закладки…</string>
+    <string name="shared_string_select_on_map">Вибрати на мапі…</string>
+    <string name="shared_string_favorite">Закладки…</string>
     <string name="route_preferences">Уподобання маршруту</string>
     <string name="route_info">Інформація про маршрут</string>
     <string name="routing_attr_prefer_motorway_name">Надавати перевагу автомагістралям</string>
@@ -1846,8 +1846,8 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="animate_routing_gpx">Симуляуція використання треку GPX</string>
     <string name="remember_choice">Запам’ятати мій вибір</string>
     <string name="gps_status_eclipsim">Стан GPS</string>
-    <string name="default_and">і</string>
-    <string name="default_or">або</string>
+    <string name="shared_string_and">і</string>
+    <string name="shared_string_or">або</string>
 	<string name="route_is_too_long">Можливо, буде потрібно дуже багато часу для локального (оффлайн) розрахунку маршруту понад 200 км. Для розрахунку, будь ласка, додайте одну або більше проміжних точок на маршруті.</string>
 	<string name="auto_zoom_none">Без автомасштабування</string>
 	<string name="auto_zoom_close">До крупного плану</string>
@@ -1931,7 +1931,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="lock_screen_request_explanation">%1$s потрібен цей дозвіл, щоб вимкнути екран для економії енергії.</string>
     <string name="wake_on_voice">Увімкнути екран перед поворотом</string>
     <string name="wake_on_voice_descr">Вмикати екран телефону (якщо він вимкнутий) під час наближення до повороту</string>
-    <string name="wake_on_voice_never">Ніколи</string>
+    <string name="shared_string_never">Ніколи</string>
     <string name="select_impassable_road">Вибрати на мапі…</string>
     <string name="impassable_road">Уникати дороги…</string>
     <string name="tip_recent_changes_1_9_t">"Зміни в 1.9: * Оновлені стилі мап із зазначенням типу покриття доріг, маршрутів громадського транспорту та символів для пішого туризму * Пошук POI вздовж маршруту * Позначення доріг як непроїзних, в сеансі * Прості завантаження та оновлення мап * Візуальні та звукові сповіщення під час наближення до точки маршрути * Друк маршруту та інформації про повороти * Підтримка смуг рушу * Робота з Android Wear * Багато змін в інтерфейсі * Окреме збільшення для тексту на мапі * Спеціальні звукові повідомлення, якщо ви зійшли з маршруту * Авторизація на OsMo * Виправлення несумісностей з версією OsMo "</string>
@@ -1982,7 +1982,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="rendering_attr_pisteGrooming_name">Тип лижні</string>
     <string name="routing_attr_no_new_routing_name">Не використовувати маршрутизацію версії 1.9</string>
     <string name="navigate_point_northing">Північної широти</string>
-    <string name="dismiss">Не надсилати</string>
+    <string name="shared_string_dismiss">Не надсилати</string>
     <string name="audio">Аудіо</string>
 	<string name="video">Відео</string>
 	<string name="photo">Фото</string>
@@ -2051,10 +2051,10 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="proxy_port_descr">Налаштуйте номер порту вашого проксі-сервера (наприклад, 8118)</string>
 	<string name="voices">Голосові повідомлення</string>
 	<string name="export">Експорт</string>
-	<string name="enable_plugin">Вимкнено</string>
-	<string name="disable_plugin">Увікненно</string>
-	<string name="enable_plugin2">Ввімкнути</string>
-	<string name="disable_plugin2">Вимкнути</string>
+	<string name="shared_string_disabled">Вимкнено</string>
+	<string name="shared_string_enabled">Увікненно</string>
+	<string name="shared_string_enable">Ввімкнути</string>
+	<string name="shared_string_disable">Вимкнути</string>
 	<string name="plugin_description_title">Опис</string>
 	<string name="plugin_settings_button_caption">Налаштування</string>
 	<string name="plugin_install_needs_network">Для встановлення цього втулку вам потрібне з’єднання з Інтерент.</string>
diff --git a/OsmAnd/res/values-vi/strings.xml b/OsmAnd/res/values-vi/strings.xml
index de553e797e..9fc90803ae 100644
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@@ -142,7 +142,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="map_underlay">Bản đồ nền</string>
 	<string name="map_underlay_descr">Chọn bản đồ nền</string>
 	<string name="layer_overlay">Chồng phủ bản đồ…</string>
-	<string name="default_none">Không</string>
+	<string name="shared_string_none">Không</string>
 	<string name="map_overlay">Chồng phủ bản đồ</string>
 	<string name="map_overlay_descr">Chọn bản đồ cần chồng phủ</string>
 	<string name="tile_source_already_installed">Bản đồ đã được cài, các thiết lập sẽ được cập nhật</string>
@@ -196,8 +196,8 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="tip_initial">Thủ thuật</string>
 	<string name="tip_initial_t">\tOsmAnd là ứng dụng định vị trên Android với nhiều tính năng. 
 \n\tĐMột số thủ thuật và mẹo sử dụng được liên kết với màn hình menu chính.</string>
-	<string name="next_button">Tiếp</string>
-	<string name="previous_button">Quay lại</string>
+	<string name="shared_string_next">Tiếp</string>
+	<string name="shared_string_previous">Quay lại</string>
 
 	<string name="unit_of_length_descr">Đổi đơn vị độ dài và tốc độ</string>
 	<string name="unit_of_length">Đơn vị độ dài</string>
@@ -234,7 +234,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="indexing_map">Đang tạo chỉ mục bản đồ…</string>
 	<string name="indexing_poi">Đang tạo chỉ mục POI…</string>
 	<string name="indexing_transport">Đang tạo chỉ mục giao thông…</string>
-	<string name="input_output_error">Có lỗi xảy ra với I/O</string>
+	<string name="shared_string_io_error">Có lỗi xảy ra với I/O</string>
 	<string name="old_map_index_is_not_supported">Định dạng dữ liệu \'\'{0}\'\' không được hỗ trợ</string>
 	<string name="poi_filter_car_aid">Sửa Xe</string>
 	<string name="poi_filter_closest_poi">POI gần nhất</string>
@@ -424,7 +424,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="transport_stops_to_pass">stops to pass</string>
 	<string name="transport_route_distance">Khoảng cách đường đi</string>
 	<string name="transport">Giao thông</string>
-	<string name="default_buttons_ok">OK</string>
+	<string name="shared_string_ok">OK</string>
 	<string name="show_transport_over_map_description">Hiện các điểm dừng giao thông công cộng trên bản đồ</string>
 	<string name="show_transport_over_map">Hiện các điểm dừng giao thông</string>
 	<string name="hello">Ứng dụng tìm đường OsmAnd</string>
@@ -441,7 +441,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="search_history_building">Tòa nhà: {0}, {1}, {2}</string>
 	<string name="favorite">Ưa thích</string>
 	<string name="clear_all">Xóa hết</string>
-	<string name="history">Lịch sử</string>
+	<string name="shared_string_history">Lịch sử</string>
 	<string name="uploading_data">Đang tải dữ liệu lên…</string>
 	<string name="uploading">Đang tải lên…</string>
 	<string name="search_nothing_found">Không tìm thấy</string>
@@ -522,7 +522,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
     <string name="additional_settings">Thiết lập thêm</string>
     <string name="settings_preset_descr">Select a use profile. (Each profile\'s settings can be customized below.)</string>
     <string name="settings_preset">Chế độ Ứng dụng</string>
-    <string name="settings">Thiết lập</string>
+    <string name="shared_string_settings">Thiết lập</string>
     <string name="save_current_track_descr">Lưu track hiện tại vào thẻ nhớ SD</string>
     <string name="save_current_track">Lưu track hiện tại</string>
     <string name="save_track_interval_descr">Chọn khoảng thời gian lưu vị trí cho track</string>
@@ -607,11 +607,11 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 <string name="context_menu_item_open_bug">Mở OSM bug</string>
 <string name="context_menu_item_create_poi">Tạo POI</string>
 
-<string name="default_buttons_yes">OK</string>
-<string name="default_buttons_cancel">Hủy</string>
+<string name="shared_string_yes">OK</string>
+<string name="shared_string_cancel">Hủy</string>
 <string name="default_buttons_apply">Áp dụng</string>
 <string name="default_buttons_add">Thêm</string>
-<string name="default_buttons_no">Không</string>
+<string name="shared_string_no">Không</string>
 <string name="add_favorite_dialog_top_text">Nhập tên Ưa thích</string>
 <string name="add_favorite_dialog_default_favourite_name">Ưa thích</string>
 <string name="add_favorite_dialog_favourite_added_template">Điểm ưa thích \'\'{0}\'\' đã được thêm thành công.</string>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index 4520da6e7e..391d01f038 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -133,14 +133,14 @@
 	<string name="support_new_features">支持新功能</string>
 	<string name="support_new_features_descr">捐赠实现的新功能中的应用</string>
 	<string name="info_button">信息</string>
-	<string name="help">帮助</string>
+	<string name="shared_string_help">帮助</string>
 	<string name="show_details">显示细节</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_on">上</string>
-	<string name="accessibility_off">离</string>
+	<string name="shared_string_on">上</string>
+	<string name="shared_string_off">离</string>
 	<string name="accessibility_default">根据全球系统设置</string>
 	<string name="backToMenu">返回目录</string>
 	<string name="zoomOut">缩小</string>
@@ -239,8 +239,8 @@
 	<string name="internet_not_available">操作所需的互联网连接不可用</string>
 	<string name="tip_navigation">导航</string>
 	<string name="tip_initial">技巧和诀窍</string>
-	<string name="next_button">下</string>
-	<string name="previous_button">前</string>
+	<string name="shared_string_next">下</string>
+	<string name="shared_string_previous">前</string>
 	<string name="unit_of_length_descr">变更单位的长度和速度</string>
 	<string name="unit_of_length">度量单位</string>
 	<string name="si_mi_foots">万里/英尺</string>
@@ -275,7 +275,7 @@
 	<string name="amenity_type_sustenance">营养</string>
 	<string name="amenity_type_tourism">旅游</string>
 	<string name="amenity_type_transportation">运输</string>
-	<string name="input_output_error">I / O错误发生</string>
+	<string name="shared_string_io_error">I / O错误发生</string>
 	<string name="km">千米</string>
 	<string name="km_h">公里/小时</string>
 	<string name="m">米</string>
@@ -329,7 +329,7 @@
 	<string name="transport_search_after">后续路由</string>	
 	<string name="transport_search_before">此前路线</string>
 	<string name="transport_finish_search">完成搜索</string>
-	<string name="default_buttons_ok">行</string>
+	<string name="shared_string_ok">行</string>
 	<string name="favorite">最喜爱</string>
 	<string name="clear_all">清除所有</string>
 	<string name="download_index_success">下载成功</string>
@@ -386,11 +386,11 @@
 	<string name="search_address_building_option">大厦</string>
 	<string name="search_address_street_option">相交的街道</string>
 	<string name="search_tabs_location">位置</string>
-	<string name="default_buttons_yes">是</string>
-	<string name="default_buttons_cancel">取消</string>
+	<string name="shared_string_yes">是</string>
+	<string name="shared_string_cancel">取消</string>
 	<string name="default_buttons_apply">申请</string>
 	<string name="default_buttons_add">加</string>
-	<string name="default_buttons_no">没有</string>
+	<string name="shared_string_no">没有</string>
 	<string name="default_buttons_delete">删除</string>
 	
 	<string name="layer_hillshade">山体阴影层</string>
@@ -726,7 +726,7 @@
 	<string name="map_underlay">背景层地图</string>
 	<string name="map_underlay_descr">选择背景层地图</string>
 	<string name="layer_overlay">叠加层地图…</string>
-	<string name="default_none">无</string>
+	<string name="shared_string_none">无</string>
 	<string name="map_overlay">叠加层地图</string>
 	<string name="map_overlay_descr">选择叠加层地图</string>
 	<string name="tile_source_already_installed">地图已经安装，设置将被更新</string>
@@ -818,7 +818,7 @@
 	<string name="search_history_street">街道：{0}，{1}</string>
 	<string name="search_history_int_streets">交叉路口：{0} x {1} 在 {2}</string>
 	<string name="search_history_building">建筑物：{0}, {1}, {2}</string>
-	<string name="history">历史</string>
+	<string name="shared_string_history">历史</string>
 	<string name="uploading_data">正在上传数据…</string>
 	<string name="uploading">正在上传…</string>
 	<string name="search_nothing_found">什么也没找到</string>
@@ -867,7 +867,7 @@
 	<string name="data_settings_descr">指定语言，下载/重新载入数据</string>
 	<string name="map_preferences_descr">指定地图设置：地图来源，旋转，标记位置，屏幕朝向</string>
 	<string name="additional_settings">附加设置</string>
-	<string name="settings">设置</string>
+	<string name="shared_string_settings">设置</string>
 	<string name="save_current_track_descr">立即保存当前轨迹到SD卡</string>
 	<string name="save_track_interval">日志记录时间间隔</string>
 	<string name="save_track_interval_descr">选择轨迹记录的位置间隔</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 3d1368b3cc..b146b3d53e 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -229,14 +229,14 @@
 	<string name="show_ruler_level">顯示比例尺</string>	
 	<string name="info_button">資訊</string>
 	<string name="back_to_location">回到目前位置</string>
-	<string name="help">幫助</string>
+	<string name="shared_string_help">幫助</string>
 	<string name="show_details">顯示細節</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_on">開啟</string>
-	<string name="accessibility_off">關閉</string>
+	<string name="shared_string_on">開啟</string>
+	<string name="shared_string_off">關閉</string>
 	<string name="accessibility_default">配合全系統設定</string>
 	<string name="backToMenu">回主選單</string>
 	<string name="zoomOut">縮小</string>
@@ -444,7 +444,7 @@
 	
 	
 	
-	<string name="local_index_installed">版本</string>
+	<string name="local_index_installed">本機版本</string>
 	<string name="local_index_items_backuped">%2$d 項中的 %1$d 項已順利停用。</string>
 	<string name="local_index_items_deleted">%2$d 項中的 %1$d 項已順利刪除。</string>
 	<string name="local_index_items_restored">%2$d 項中的 %1$d 項已順利啟動。</string>
@@ -498,7 +498,7 @@
 	<string name="map_underlay">下層地圖</string>
 	<string name="map_underlay_descr">選擇下層地圖</string>
 	<string name="layer_overlay">上層地圖…</string>
-	<string name="default_none">無</string>
+	<string name="shared_string_none">無</string>
 	<string name="map_overlay">上層地圖</string>
 	<string name="map_overlay_descr">選擇上層地圖</string>
 	<string name="tile_source_already_installed">地圖已安裝，設定將被更新</string>
@@ -552,8 +552,8 @@
 	<string name="tip_initial">幫助</string>
 	<string name="tip_initial_t">"OsmAnd 是一個導航應用程式，含有很多的功能。
 \n\n一些基本功能介紹、使用提示以及進階的幫助，從地圖畫面可透過\'選單\' → \'幫助\'連結。 "</string>
-	<string name="next_button">下一頁</string>
-	<string name="previous_button">上一頁</string>
+	<string name="shared_string_next">下一頁</string>
+	<string name="shared_string_previous">上一頁</string>
 	<string name="unit_of_length_descr">更改長度與速度單位</string>
 	<string name="unit_of_length">量測單位</string>
 	<string name="si_mi_foots">英哩/英呎</string>
@@ -596,7 +596,7 @@
 	<string name="indexing_map">地圖索引…</string>
 	<string name="indexing_poi">興趣點索引…</string>
 	<string name="indexing_transport">交通索引…</string>
-	<string name="input_output_error">存取發生錯誤</string>
+	<string name="shared_string_io_error">存取發生錯誤</string>
 	<string name="km">公里</string>
 	<string name="km_h">公里/小時</string>
 	<string name="m">公尺</string>
@@ -621,7 +621,7 @@
 	<string name="loading_builds">正在載入 OsmAnd 編譯…</string>
 	<string name="select_build_to_install">選擇 OsmAnd 編譯安裝</string>
 	<string name="contribution_activity">安裝的版本</string>
-	<string name="gps_status_app_not_found">GPS 狀態工具未安裝，到 Play 商場找嗎？</string>
+	<string name="gps_status_app_not_found">沒安裝 GPS 狀態應用程式，到 Play 商場找嗎？</string>
 	<string name="voice_is_not_available_msg">語音導航無法使用時。請到\'設定\'→ \'一般設定\' → \'語音導航\'，選取或下載提示語音包。</string>
 	<string name="voice_is_not_available_title">未選定語音導航</string>
 	<string name="daynight_mode_day">日間</string>
@@ -770,7 +770,7 @@
 	<string name="transport_stops_to_pass">中途站</string>
 	<string name="transport_route_distance">路線距離</string>
 	<string name="transport">交通工具</string>
-	<string name="default_buttons_ok">確定</string>
+	<string name="shared_string_ok">確定</string>
 	<string name="show_transport_over_map_description">在地圖上顯示公車站牌</string>
 	<string name="show_transport_over_map">顯示公車站牌</string>
 	<string name="hello">OsmAnd 導航軟體</string>
@@ -787,7 +787,7 @@
 	<string name="search_history_building">建物：{0}, {1}, {2}</string>
 	<string name="favorite">我的最愛</string>
 	<string name="clear_all">全部清除</string>
-	<string name="history">歷史記錄</string>
+	<string name="shared_string_history">歷史記錄</string>
 	<string name="uploading_data">上傳資料中…</string>
 	<string name="uploading">上傳中…</string>
 	<string name="search_nothing_found">找不到</string>
@@ -861,7 +861,7 @@
 	<string name="map_preferences_descr">設定地圖：地圖來源、旋轉方式、標示位置、畫面方向</string>
 	<string name="osm_settings">OSM 編輯</string>
 	<string name="additional_settings">額外設定</string>
-	<string name="settings">設定</string>
+	<string name="shared_string_settings">設定</string>
 	<string name="save_current_track_descr">現在就將目前的軌跡存到 SD 卡</string>
 	<string name="save_current_track">儲存目前的 GPX 軌跡</string>
 	<string name="save_track_interval">在導航期間的記錄間隔</string>
@@ -938,11 +938,11 @@
 	<string name="context_menu_item_update_map">更新地圖</string>
 	<string name="context_menu_item_open_bug">開啟 OSM 錯誤</string>
 	<string name="context_menu_item_create_poi">建立興趣點</string>
-	<string name="default_buttons_yes">是</string>
-	<string name="default_buttons_cancel">取消</string>
+	<string name="shared_string_yes">是</string>
+	<string name="shared_string_cancel">取消</string>
 	<string name="default_buttons_apply">套用</string>
 	<string name="default_buttons_add">加入</string>
-	<string name="default_buttons_no">否</string>
+	<string name="shared_string_no">否</string>
 	<string name="add_favorite_dialog_top_text">輸入我的最愛名稱</string>
 	<string name="add_favorite_dialog_default_favourite_name">我的最愛</string>
 	<string name="add_favorite_dialog_favourite_added_template">我的最愛標點 \'\'{0}\'\' 新增成功。</string>
@@ -1411,8 +1411,8 @@
     <string name="auto_zoom_far">中距</string>
     <string name="auto_zoom_farthest">遠距</string>
     <string name="route_is_too_long">在兩點間距離超過 200 公里以外時，OsmAnd 的離線路線可能要花很長的時間(或有時無動作)。為了有更好的效能，您或許需要增加中途點。</string>
-    <string name="default_and">和</string>
-    <string name="default_or">或</string>
+    <string name="shared_string_and">和</string>
+    <string name="shared_string_or">或</string>
 	<string name="remember_choice">記住我的選擇</string>
     <string name="gps_status_eclipsim">GPS 狀態</string>
     <string name="animate_routing_route_not_calculated">請先計劃行車路線</string>
@@ -1466,8 +1466,8 @@
 	<string name="routing_attr_weight_description">指定許可在路線行駛的車輛重量</string>
     <string name="select_gpx">選擇 GPX …</string>
     <string name="route_descr_select_destination">選擇目的地</string>
-    <string name="route_descr_select_on_map">在地圖上選取 …</string>
-    <string name="route_descr_favorite">我的最愛 …</string>
+    <string name="shared_string_select_on_map">在地圖上選取 …</string>
+    <string name="shared_string_favorite">我的最愛 …</string>
     <string name="route_preferences">優先路線</string>
     <string name="route_info">路線資訊</string>
     <string name="keep_and_add_destination_point">加為目的地標點</string>
@@ -1663,7 +1663,7 @@
     <string name="map_widget_plain_time">目前時間</string>
     <string name="selected_gpx_info_show">\n\n長按在地圖上查看</string>
     <string name="delay_navigation_start">自動啟動轉向建議指引</string>
-    <string name="selected">已選擇</string>
+    <string name="shared_string_selected_lowercase">已選擇</string>
     <string name="gpx_split_interval">分割的間隔</string>
     <string name="gpx_info_subtracks">子軌跡：%1$s </string>
 	<string name="gpx_info_maximum_speed">"最高速度：%1$s "</string>
@@ -1828,7 +1828,7 @@
     <string name="wake_on_voice">將螢幕開啟</string>
     <string name="wake_on_voice_descr">當接近轉彎時，開啟裝置螢幕 (螢幕關閉時)</string>
     <string name="lock_screen_request_explanation">為了節電作用 %1$s 需要此許可權才能關閉螢幕。</string>
-    <string name="wake_on_voice_never">永不</string>
+    <string name="shared_string_never">永不</string>
     <string name="advanced_settings">進階</string>
 	<string name="osmo_use_https_descr">使用安全協定連線到伺服器</string>
     <string name="osmo_use_https">使用 HTTPS</string>
@@ -1842,7 +1842,7 @@
     <string name="everything_up_to_date">全部都是最新的檔案</string>
     <string name="use_opengl_render">使用 OpenGL 繪製</string>
     <string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製（可能在某些裝置上無法工作）</string>
-    <string name="dismiss">排除</string>
+    <string name="shared_string_dismiss">排除</string>
     <string name="no_internet_connection">不能下載，請檢查您的網路連線。</string>
     <string name="download_tab_downloads">全部下載</string>
     <string name="download_tab_updates">更新</string>
@@ -1893,13 +1893,13 @@
     <string name="gps_status">GPS 狀態</string>
     <string name="parking_place">停車地點</string>
     <string name="remove_the_tag">移除標記</string>
-    <string name="enable_plugin">已停用</string>
-	<string name="disable_plugin">已啟用</string>
+    <string name="shared_string_disabled">已停用</string>
+	<string name="shared_string_enabled">已啟用</string>
 <string name="plugin_description_title">描述</string>
 	<string name="plugin_settings_button_caption">設定</string>
 <string name="edit_group">編輯群組</string>
-    <string name="enable_plugin2">啟用</string>
-	<string name="disable_plugin2">停用</string>
+    <string name="shared_string_enable">啟用</string>
+	<string name="shared_string_disable">停用</string>
 	<string name="plugin_install_needs_network">您需要連接網際網路來安裝這個外掛程式。</string>
 	<string name="get_plugin">接收</string>
 <string name="plugin_ski_name">檢視滑雪地圖</string>
@@ -1941,7 +1941,9 @@
 	<string name="back_to_map">返回地圖</string>
 	<string name="turn_off_all">全部關閉</string>
 	<string name="showed_on_map">在地圖上顯示</string>
-	<string name="selected_tracks">已選取</string>
+	<string name="shared_string_selected">已選取</string>
 	<string name="track_segments">航跡區段</string>
 	<string name="track_points">航跡標點</string>
+	<string name="route_points">路線標點</string>
+	<string name="shared_string_release">已發行</string>
 	</resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index ba39cf3e48..50cc68eaa4 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -14,17 +14,86 @@
     <string name="tips_and_tricks_descr">Frequently asked questions, recent changes and others</string>
     <string name="routing_settings_2">Navigation settings</string>
     <string name="general_settings_2">General settings</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">OK</string>
+	<string name="shared_string_cancel">Cancel</string>
+	<string name="shared_string_dismiss">Dismiss</string>
+	<string name="shared_string_yes">Yes</string>
+	<string name="shared_string_no">No</string>
+	<string name="shared_string_on">On</string>
+	<string name="shared_string_off">Off</string>
+	<string name="shared_string_previous">Previous</string>
+	<string name="shared_string_next">Next</string>
+	<string name="shared_string_enable">Enable</string>
+	<string name="shared_string_disable">Disable</string>
+	<string name="shared_string_enabled">Enabled</string>
+	<string name="shared_string_disabled">Disabled</string>
+	<string name="shared_string_selected">Selected</string>
+	<string name="shared_string_selected_lowercase">selected</string>
+	<string name="shared_string_never">Never</string>
+	<string name="shared_string_none">None</string>
+	<string name="shared_string_and">and</string>
+	<string name="shared_string_or">or</string>
+	<string name="shared_string_help">Help</string>
+	<string name="shared_string_settings">Settings</string>
+	<string name="shared_string_history">History</string>
+	<string name="shared_string_select_on_map">Select on map</string>
+	<string name="shared_string_select_all">Select all</string>
+	<string name="shared_string_deselect">Deselect</string>
+	<string name="shared_string_deselect_all">Deselect all</string>
+	<string name="shared_string_clear">Clear</string>
+	<string name="shared_string_clear_all">Clear all</string>
+	<string name="shared_string_save">Save</string>
+	<string name="shared_string_save_as_gpx">Save as GPX track</string>
+	<string name="shared_string_rename">Rename</string>
+	<string name="shared_string_delete">Delete</string>
+	<string name="shared_string_delete_all">Delete all</string>
+	<string name="shared_string_share">Share</string>
+	<string name="shared_string_add">Add</string>
+	<string name="shared_string_apply">Apply</string>
+	<string name="shared_string_control_start">Start</string>
+	<string name="shared_string_control_stop">Stop</string>
+	<string name="shared_string_import">Import</string>
+	<string name="shared_string_export">Export</string>
+	<string name="shared_string_more">More</string>
+	<string name="shared_string_more_actions">More actions</string>
+	<string name="shared_string_do_not_show_again">Do not show again</string>
+	<string name="shared_string_remember_my_choice">Remember my choice</string>
+	<string name="shared_string_refresh">Refresh</string>
+	<string name="shared_string_download">Download</string>
+	<string name="shared_string_downloading">Downloading</string>
+	<string name="shared_string_download_successful">Download successful</string>
+	<string name="shared_string_io_error">I/O error occurred</string>
+	<string name="shared_string_unexpected_error">Unexpected error occurred</string>
+	<string name="shared_string_action_template">Action {0}</string>
+	<string name="shared_string_close">Close</string>
+	<string name="shared_string_exit">Exit</string>
+	<string name="shared_string_show">Show</string>
+	<string name="shared_string_show_all">Show all</string>
+	<string name="shared_string_show_on_map">Show on map</string>
+	<string name="shared_string_map">Map</string>
+	<string name="shared_string_favorite">Favorite</string>
+	<string name="shared_string_favorites">Favorites</string>
+	<string name="shared_string_add_to_favorites">Add to Favorites</string>
+	<string name="shared_string_my_location">My Location</string>
+	<string name="shared_string_my_places">My Places</string>
+	<string name="shared_string_my_favorites">My Favorites</string>
+	<string name="shared_string_my_tracks">My Tracks</string>
+	<string name="shared_string_currently_recording_track">Currently recording track</string>
+	<string name="shared_string_audio">Audio</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Photo</string>
 	<string name="route_points">Route points</string>
 	<string name="track_segments">Track segments</string>
 	<string name="track_points">Track points</string>
 	<string name="online_map_settings">Online maps</string>
 	<string name="osmand_rastermaps_plugin_description">With this plugin you can access many types of online (so called tile or raster) maps, from predefined Openstreetmap tiles (like Mapnik) to satellite images and special purpose layers like weather maps, climate maps, geological maps, hillshade layers, etc.
-		\n\nAny of these maps can either be used as the main (base) map to be displayed on the OsmAnd map screen, or as an overlay or underlay to another base map (like OsmAnd\'s regular offline maps). In order to make any underlay map more visible, certain elements of the OsmAnd vector maps can easily be hidden via the \'Configue map\' menu as desired.
+		\n\nAny of these maps can either be used as the main (base) map to be displayed on the OsmAnd map screen, or as an overlay or underlay to another base map (like OsmAnd\'s regular offline maps). In order to make any underlay map more visible, certain elements of the OsmAnd vector maps can easily be hidden via the \'Configure map\' menu as desired.
 		\n\nTile maps can be obtained directly via online sources, or can be prepared for offline use (and manually copied to OsmAnd\'s data folder) as an sqlite database which can be produced by a variety of 3rd party map preparation tools.
 	</string>
 	<string name="record_plugin_name">Trip recording</string>
 	<string name="record_plugin_description">This plugin activates the functionality to record and save your tracks by manually touching the GPX recording widget on the map screen, or also to automatically log all of your navigation routes to a GPX file.
-		\n\nRecorded tracks can be shared with your friends or be used for OSM contributions. Athletes can use recorded tracks to monitior their trainings. Some basic track analysis can be performed directly in OsmAnd, like lap times, average speed etc., and tracks can of course also later be anaylized in special 3rd party analysis tools.
+		\n\nRecorded tracks can be shared with your friends or be used for OSM contributions. Athletes can use recorded tracks to monitor their trainings. Some basic track analysis can be performed directly in OsmAnd, like lap times, average speed etc., and tracks can of course also later be analyzed in special 3rd party analysis tools.
 	</string>
 	<string name="osmo_plugin_name">OsMo monitoring</string>
 	<string name="osmo_plugin_description">Shows the settings to use OsMo advanced live monitoring, see http://osmo.mobi. Track other devices and be tracked. 
@@ -71,7 +140,6 @@
 	<string name="debugging_and_development">OsmAnd development</string>
 
     <string name="recents">RECENTS</string>
-    <string name="selected_tracks">Selected</string>
 	<string name="turn_off_all">Turn off all</string>
 	<string name="showed_on_map">Shown on map</string>
 	<string name="rename_failed">Rename failed.</string>
@@ -97,7 +165,7 @@
 	<string name="edit_group">Edit group</string>
     <string name="parking_place">Parking place</string>
     <string name="remove_the_tag">REMOVE THE TAG</string>
-    <string name="gps_status">GPS Status</string>
+    <string name="gps_status">GPS status</string>
     <string name="version_settings_descr">Download nightly builds</string>
     <string name="version_settings">Builds</string>
     <string name="rendering_attr_streetLighting_name">Street lighting</string>
@@ -110,7 +178,6 @@
     <string name="osm_editing_manage">Manage</string>
 	<string name="navigation_over_track">Start navigation over track?</string>
 	<string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string>
-    <string name="rendering_value__name">Default</string>
 	<string name="speak_pedestrian">Announce pedestrian crosswalks</string>
     <string name="rendering_attr_roadStyle_name">Road style</string>
     <string name="rendering_value_default_name">Default</string>
@@ -137,7 +204,6 @@
     <string name="download_tab_updates">Updates</string>
     <string name="download_tab_local">Local</string>
 	<string name="no_internet_connection">Downloading not possible, please check your Internet connection.</string>
-    <string name="dismiss">Dismiss</string>
     <string name="everything_up_to_date">All files up to date</string>
     <string name="use_opengl_render">Use OpenGL rendering</string>
     <string name="use_opengl_render_descr">Use hardware accelerated OpenGL rendering (may not work on some devices)</string>
@@ -145,10 +211,8 @@
     <string name="home_button">Home</string>
     <string name="osmo_use_https_descr">Use secure connection to server</string>
     <string name="osmo_use_https">Use HTTPS</string>
-	<string name="advanced_settings">Advanced</string>
 	<string name="map_update">Updates available for %1$s maps</string>
 	<string name="search_for">Search for</string>
-	<string name="show_map">SHOW MAP</string>
 	<string name="show_all">SHOW ALL</string>
 	<string name="coordinates">Coordinates</string>
 	<string name="rendering_attr_publicTransportMode_name">Bus, trolleybus, shuttle routes</string>
@@ -157,8 +221,6 @@
     <string name="lock_screen_request_explanation">%1$s needs this permission to turn off the screen for the power saving feature.</string>
     <string name="wake_on_voice">Turn screen on</string>
     <string name="wake_on_voice_descr">Turn on device screen (if off) when approaching a turn</string>
-    <string name="wake_on_voice_never">Never</string>
-    <string name="select_impassable_road">Select on map…</string>
     <string name="impassable_road">Avoid roads…</string>
     <string name="tip_recent_changes_1_9_t">Changes in 1.9:
         * Updated maps styles with road surface rendering, transport layers and hiking symbols
@@ -260,8 +322,6 @@
 	<string name="proxy_host_descr">Configure your proxy\'s hostname (e.g. 127.0.0.1)</string>
 	<string name="proxy_port_title">Proxy Port</string>
 	<string name="proxy_port_descr">Configure your proxy\'s port number (e.g. 8118)</string>
-	<string name="tips_and_tricks">Help</string>
-	<string name="tip_initial">Help</string>
 	<string name="tip_initial_t">OsmAnd is a navigation application with many features. 
 		\n\nAs a basic introduction, some usage tips and tricks are linked via \'Menu\' → \'Help\' from the map screen.
 	</string>
@@ -352,7 +412,6 @@
     <string name="gpx_wpt">Waypoint</string>
     <string name="selected_gpx_info_show">\n\nPress and hold to see on map</string>
     <string name="delay_navigation_start">Start turn-by-turn guidance automatically</string>
-    <string name="selected">selected</string>
     <string name="local_index_gpx_info_show">\n\nPress and hold for options</string>
 	<string name="gpx_info_subtracks">Subtracks: %1$s </string>
 	<string name="gpx_info_waypoints">Waypoints: %1$s </string>
@@ -375,7 +434,6 @@
     <string name="gpx_selection_track">%1$s \nTrack %2$s</string>
     <string name="gpx_available_current_track">Current recording track</string>
     <string name="gpx_file_is_empty">Gpx track is empty</string>
-    <string name="selected_track">Selected tracks</string>
     <string name="my_tracks">All tracks</string>
     <string name="my_favorites">My Favorites</string>
     <string name="my_data_Button">My Places</string>
@@ -534,8 +592,6 @@
     <string name="keep_and_add_destination_point">Add as destination point</string>
     <string name="select_gpx">Select GPX…</string>
     <string name="route_descr_select_destination">Select Destination</string>
-    <string name="route_descr_select_on_map">Select on map…</string>
-    <string name="route_descr_favorite">Favorite…</string>
     <string name="route_preferences">Route preferences</string>
     <string name="route_info">Route information</string>
     <string name="routing_attr_prefer_motorway_name">Prefer motorways</string>
@@ -594,9 +650,6 @@
     <string name="animate_routing_route">Simulate using calculated route </string>
     <string name="animate_routing_gpx">Simulate using GPX track</string>
     <string name="remember_choice">Remember my choice</string>
-    <string name="gps_status_eclipsim">GPS status</string>
-    <string name="default_and">and</string>
-    <string name="default_or">or</string>
 	<string name="route_is_too_long">OsmAnd offline routing may take very long (or sometimes not work) for points more than 200km apart. You may want to add intermediate waypoints for better performance.</string>
 	<string name="auto_zoom_none">No auto zoom</string>
 	<string name="auto_zoom_close">To close-up</string>
@@ -1273,7 +1326,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="navpoint_search_desc">Coordinates</string>
 	<string name="transport_search_desc">Public transport search</string>
 	<string name="favourites_search_desc">Favorites search</string>
-	<string name="history_search_desc">Search history</string>
 	<string name="offline_navigation_not_available">OsmAnd offline navigation is temporarily not available.</string>
 	<string name="left_side_navigation">Left-hand driving</string>
 	<string name="left_side_navigation_descr">Select for countries with left-hand traffic</string>
@@ -1291,11 +1343,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="map_online_data">Online and tile maps</string>
 	<string name="map_online_data_descr">Use online maps (download and cache tiles on SD card)</string>
 	<string name="online_map_settings_descr">Configure online or cached tile map sources</string>
-	<string name="map_settings">Map Settings</string>
-	<string name="map_settings_descr">Configure the map display</string>
-	<string name="extra_settings">Advanced settings</string>
-	<string name="osmand_monitoring_description">Shows the button and settings facilitating to record your trips to a local GPX file or to an online web service.</string>
-	<string name="osmand_extra_settings_description">Display settings for advanced map configuration (like increase map details) and some device-specifics.</string>
 	<string name="plugins_screen">Plugins</string>
 	<string name="prefs_plugins_descr">Plugins activate advanced settings and additional functionality</string>
 	<string name="prefs_plugins">Plugins</string>
@@ -1333,14 +1380,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="show_ruler_level">Display ruler</string>	
 	<string name="info_button">Info</string>
 	<string name="back_to_location">Back to position</string>
-	<string name="help">Help</string>
 	<string name="show_details">Show details</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_on">On</string>
-	<string name="accessibility_off">Off</string>
 	<string name="accessibility_default">According to the global system setting</string>
 	<string name="backToMenu">Back To Menu</string>
 	<string name="zoomOut">Zoom out</string>
@@ -1473,9 +1517,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 		\n\t* \'To direction of movement\': Map will continuously be aligned with your heading
 		\n\t* \'To compass\': Map will continuously be aligned with the device\'s compass reading
 	</string>
-	<string name="binary_map_download_success">Download successful.
-		\n\t\n\tTo use activate \'Menu\' → \'Configure map\' → \'Map source…\' → \'Offline vector maps\'.
-	</string>
 	<string name="tip_day_night_mode">Day/Night Mode</string>
 	<string name="tip_day_night_mode_t_v2">The map appearance can for offline vector maps be changed between day (brighter) and night (darker). Night colors are safer and more comfortable for night driving.
 		\n\nYou can set a policy for day/night switching in \'Menu\' → \'Configure map\' → \'Day/night map\'.
@@ -1576,7 +1617,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="filename_input">File name: </string>
 	<string name="file_with_name_already_exist">File with same name already exists.</string>
 	<string name="default_buttons_save">Save</string>
-	<string name="menu_save_directions">Save directions</string>
 	<string name="local_index_upload_gpx_description">Upload GPX files to OSM community. They will be used to improve maps.</string>
 	<string name="local_index_items_uploaded">%1$d of %2$d item(s) successfully uploaded.</string>
 	<string name="local_index_mi_upload_gpx">Send to OSM</string>
@@ -1593,7 +1633,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="vector_map_not_needed">No, thanks</string>
 	<string name="basemap_missing">Base world map (covering the whole world at small zooms) is missing. Please consider downloading World_basemap_x.obf for a complete environment.</string>
 	<string name="vector_data_missing">On board (\'offline\') data is missing on SD card. Please consider to download it in order to use maps offline.</string>
-	<string name="local_index_installed">Edition</string>
+	<string name="shared_string_release">Released</string>
+	<string name="local_index_installed">Local version</string>
 	<string name="local_index_items_backuped">%1$d of %2$d item(s) successfully deactivated.</string>
 	<string name="local_index_items_deleted">%1$d of %2$d item(s) successfully deleted.</string>
 	<string name="local_index_items_restored">%1$d of %2$d item(s) successfully activated.</string>
@@ -1603,7 +1644,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="local_index_mi_restore">Activate</string>
 	<string name="local_index_mi_backup">Deactivate</string>
 	<string name="local_index_mi_delete">Delete</string>
-	<string name="local_index_mi_export">Export</string>
 	<string name="local_index_mi_reload">Reload from sdcard</string>
 	<string name="local_index_download">Download</string>
 	<string name="local_index_poi_data">POI data</string>
@@ -1631,7 +1671,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 		\n\t- UI update and large bug fixing
 	</string>
 	<string name="voice_not_use">Do not use</string>
-	<string name="voice_not_specified">None</string>
 	<string name="installing_new_resources">Unpacking new data…</string>
 	<string name="internet_connection_required_for_online_route">An online navigation service is selected but no Internet connection is available.</string>
 	<string name="tts_language_not_supported_title">Language not supported</string>
@@ -1656,7 +1695,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="map_underlay">Underlay map</string>
 	<string name="map_underlay_descr">Choose underlay map</string>
 	<string name="layer_overlay">Overlay map…</string>
-	<string name="default_none">None</string>
 	<string name="map_overlay">Overlay map</string>
 	<string name="map_overlay_descr">Choose overlay map</string>
 	<string name="tile_source_already_installed">Map is already installed, settings will be updated</string>
@@ -1697,8 +1735,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 		\n\nIt is available by long-pressing any point on the map (then tapping its marker), or by pressing the trackball button, or by selecting \'Menu\' → \'Use location\' (the last two ways take the map center as reference).
 		\n\nA marker box can be hidden again by long-clicking on it.
 	</string>
-	<string name="next_button">Next</string>
-	<string name="previous_button">Previous</string>
 	<string name="unit_of_length_descr">Change units of length and speed</string>
 	<string name="unit_of_length">Unit of measure</string>
 	<string name="si_mi_foots">Miles/feet</string>
@@ -1741,7 +1777,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="indexing_map">Indexing map…</string>
 	<string name="indexing_poi">Indexing POI…</string>
 	<string name="indexing_transport">Indexing transport…</string>
-	<string name="input_output_error">I/O error occurred</string>
 	<string name="km">km</string>
 	<string name="km_h">km/h</string>
 	<string name="m">m</string>
@@ -1765,7 +1800,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="loading_builds_failed">Retrieving the list of OsmAnd builds failed</string>
 	<string name="loading_builds">Loading OsmAnd builds…</string>
 	<string name="select_build_to_install">Select an OsmAnd build to install</string>
-	<string name="gps_status_app_not_found">GPS Status application not installed. Search in Market?</string>
+	<string name="gps_status_app_not_found">GPS status application not installed. Search in Market?</string>
 	<string name="voice_is_not_available_msg">No voice guidance available, please go to \'Settings\' → \'General\' → \'Voice guidance\' and select or download a voice prompt package.</string>
 	<string name="voice_is_not_available_title">No voice guidance selected</string>
 	<string name="daynight_mode_day">Day</string>
@@ -1803,7 +1838,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="context_menu_item_search_transport">Search public transport</string>
 	<string name="transport_searching_transport">Transport results (no destination):</string>
 	<string name="transport_searching_route">Transport results ({0} to destination):</string>
-	<string name="transport_search_none">none</string>
 	<string name="transport_search_again">Reset transport search</string>
 	<string name="map_index">Map</string>
 	<string name="voice">Recorded voice</string>
@@ -1911,7 +1945,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="transport_stops_to_pass">stops to pass</string>
 	<string name="transport_route_distance">Itinerary distance</string>
 	<string name="transport">Transport</string>
-	<string name="default_buttons_ok">OK</string>
 	<string name="show_transport_over_map_description">Show public transport stops on map</string>
 	<string name="show_transport_over_map">Show transport stops</string>
 	<string name="hello">Navigation application OsmAnd</string>
@@ -1928,7 +1961,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="search_history_building">Building: {0}, {1}, {2}</string>
 	<string name="favorite">Favorite</string>
 	<string name="clear_all">Clear all</string>
-	<string name="history">History</string>
 	<string name="uploading_data">Uploading data…</string>
 	<string name="uploading">Uploading…</string>
 	<string name="search_nothing_found">Nothing found</string>
@@ -1948,7 +1980,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="download_question_exist">Offline data for {0} already exists ({1}). Do you want to update it ({2}) ?</string>
 	<string name="address">Address</string>
 	<string name="download_index_success">Download successful</string>
-	<string name="error_io_error">I/O error occurred</string>
 	<string name="downloading_file_new">Downloading …</string>
 	<string name="downloading">Downloading…</string>
 	<string name="downloading_list_indexes">Downloading list of available regions…</string>
@@ -1961,7 +1992,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="follow">Start navigation</string>
 	<string name="mark_final_location_first">Please select destination first</string>
 	<string name="get_directions">Directions</string>
-	<string name="show_gps_status">Show GPS Status</string>
 	<string name="opening_hours">Opening hours</string>
 	<string name="opening_changeset">Opening changeset…</string>
 	<string name="closing_changeset">Closing changeset…</string>
@@ -1989,10 +2019,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="previous_run_crashed">Last OsmAnd run crashed. Log file is at {0}. Please report the issue and attach the log file.</string>
 	<string name="saving_gpx_tracks">Saving GPX tracks to SD…</string>
 	<string name="finished_task">Finished</string>
-	<string name="reload_indexes_descr">Re-read offline vector maps and data from SD card</string>
-	<string name="reload_indexes">Re-read offline data</string>
-	<string name="download_indexes_descr">Download or update data for offline use from the Internet</string>
-	<string name="download_indexes">Download offline data</string>
 	<string name="use_online_routing_descr">Use Internet to calculate route</string>
 	<string name="use_online_routing">Use online navigation</string>
 	<string name="osm_settings_descr">Specify Openstreetmap.org (OSM) settings needed for OSM submissions</string>
@@ -2000,7 +2026,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="data_settings">Data</string>
 	<string name="map_preferences_descr">Specify map settings: map source, rotation, marker position, screen orientation</string>
 	<string name="additional_settings">Additional settings</string>
-	<string name="settings">Settings</string>
 	<string name="update_tile">Update map</string>
 	<string name="reload_tile">Reload tile</string>
 	<string name="mark_point">Target</string>
@@ -2027,13 +2052,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="use_internet">Use Internet</string>
 	<string name="show_location">Show location</string>
 	<string name="map_preferences">Map</string>
-	<string name="settings_activity">Settings</string>
 	<string name="show_gps_coordinates_text">Show GPS coordinates on map</string>
 	<string name="use_internet_to_download_tile">Use Internet to download missing map tiles</string>
 	<string name="app_description">Navigation application</string>
 	<string name="exit_Button">Exit</string>
 	<string name="map_Button">Map</string>
-	<string name="settings_Button">Settings</string>
 	<string name="favorites_Button">My Places</string>
 	<string name="search_button">Search</string>
 	<string name="search_activity">Search</string>
@@ -2056,7 +2079,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="navigate_point_format_DM">DDD MM.MM</string>
 	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
 	<string name="search_shown_on_map">Show on map</string>
-	<string name="navigate_point_cancel">Cancel</string>
 	<string name="search_address_top_text">Select address</string>
 	<string name="search_address_region">Region</string>
 	<string name="search_address_city">City</string>
@@ -2069,11 +2091,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="context_menu_item_update_map">Update map</string>
 	<string name="context_menu_item_open_bug">Open OSM bug</string>
 	<string name="context_menu_item_create_poi">Create POI</string>
-	<string name="default_buttons_yes">Yes</string>
-	<string name="default_buttons_cancel">Cancel</string>
 	<string name="default_buttons_apply">Apply</string>
 	<string name="default_buttons_add">Add</string>
-	<string name="default_buttons_no">No</string>
 	<string name="add_favorite_dialog_top_text">Enter favorite name</string>
 	<string name="add_favorite_dialog_default_favourite_name">Favorite</string>
 	<string name="add_favorite_dialog_favourite_added_template">Favorite point \'\'{0}\'\' was added successfully.</string>
@@ -2139,12 +2158,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="av_camera_pic_size_descr">Select internal camera Picture Size</string>
     <string name="navigation_intent_invalid">Invalid format: %s</string>
     <string name="hide_all_waypoints">Remove all</string>
-	<string name="enable_plugin">Disabled</string>
-	<string name="disable_plugin">Enabled</string>
-	<string name="enable_plugin2">Enable</string>
-	<string name="disable_plugin2">Disable</string>
 	<string name="plugin_description_title">Description</string>
-	<string name="plugin_settings_button_caption">Settings</string>
 	<string name="plugin_install_needs_network">You need an Internet connection to install this plugin.</string>
 	<string name="get_plugin">Get</string>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index 92454711c9..5f2027fd9b 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -212,7 +212,7 @@ public class AppInitializer implements IProgress {
 		if (netOsmandWasInstalled) {
 //			Builder builder = new AccessibleAlertBuilder(this);
 //			builder.setMessage(R.string.osmand_net_previously_installed);
-//			builder.setPositiveButton(R.string.default_buttons_ok, null);
+//			builder.setPositiveButton(R.string.shared_string_ok, null);
 //			builder.show();
 		} else {
 			AlertDialog.Builder builder = new AccessibleAlertBuilder(ctx);
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index 783f3c2a93..4f6342da9c 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -218,7 +218,7 @@ public class FavouritesDbHelper {
 			} else {
 				builder.setMessage(uiContext.getString(R.string.fav_point_dublicate_message, name));
 			}
-			builder.setPositiveButton(R.string.default_buttons_ok, null);
+			builder.setPositiveButton(R.string.shared_string_ok, null);
 			p.setName(name);
 			return builder;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java
index 25c5b00b2d..0cb7ad9a48 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationSimulation.java
@@ -73,7 +73,7 @@ public class OsmAndLocationSimulation {
 			final SeekBar speedup = (SeekBar) view.findViewById(R.id.Speedup);
 			speedup.setMax(3);
 			builder.setView(view);
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
@@ -100,7 +100,7 @@ public class OsmAndLocationSimulation {
 
 				}
 			});
-			builder.setNegativeButton(R.string.default_buttons_no, null);
+			builder.setNegativeButton(R.string.shared_string_no, null);
 			builder.show();
 		} else {
 			stop();
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 555b996942..71e8ee62ae 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -342,7 +342,7 @@ public class OsmandApplication extends Application {
 				ll.addView(cb);
 				
 				builder.setCancelable(true);
-				builder.setNegativeButton(R.string.default_buttons_cancel, new DialogInterface.OnClickListener() {
+				builder.setNegativeButton(R.string.shared_string_cancel, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						if(cb.isChecked()) {
@@ -350,7 +350,7 @@ public class OsmandApplication extends Application {
 						}
 					}
 				});
-				builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(uiContext, SettingsActivity.class);
@@ -393,13 +393,13 @@ public class OsmandApplication extends Application {
 		if (getNavigationService() != null) {
 			Builder bld = new AlertDialog.Builder(activity);
 			bld.setMessage(R.string.background_service_is_enabled_question);
-			bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					closeApplicationAnyway(activity, true);
 				}
 			});
-			bld.setNegativeButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
+			bld.setNegativeButton(R.string.shared_string_no, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					closeApplicationAnyway(activity, false);
diff --git a/OsmAnd/src/net/osmand/plus/access/AccessibilityMode.java b/OsmAnd/src/net/osmand/plus/access/AccessibilityMode.java
index c6bb62c2c6..28b3b1ec92 100644
--- a/OsmAnd/src/net/osmand/plus/access/AccessibilityMode.java
+++ b/OsmAnd/src/net/osmand/plus/access/AccessibilityMode.java
@@ -5,8 +5,8 @@ import android.content.Context;
 
 public enum AccessibilityMode {
 
-    ON(R.string.accessibility_on),
-    OFF(R.string.accessibility_off),
+    ON(R.string.shared_string_on),
+    OFF(R.string.shared_string_off),
     DEFAULT(R.string.accessibility_default);
 
     private final int key;
diff --git a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
index 9b6a275392..654b4f822e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java
@@ -213,7 +213,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
 		Builder builder = new AlertDialog.Builder(this);
 		builder.setMessage(MessageFormat.format(getString(R.string.install_selected_build), item.tag,
 				AndroidUtils.formatDateTime(getMyApplication(), item.date.getTime()), item.size));
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -223,7 +223,7 @@ public class ContributionVersionActivity extends OsmandListActivity {
 			}
 		});
 
-		builder.setNegativeButton(R.string.default_buttons_no, null);
+		builder.setNegativeButton(R.string.shared_string_no, null);
 		builder.show();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java
index 3b5a8e89ea..41940a9c22 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java
@@ -107,7 +107,7 @@ public class DownloadTilesDialog {
 				run(zoom, seekBar.getProgress(), rb.getLatLonBounds(), mapSource);
 			}
 		});
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setView(view);
 		builder.show();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
index d86f44485d..625f09c0f0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
@@ -163,8 +163,8 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 		ll.setPadding(5, 3, 5, 0);
 		ll.addView(editText, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
 		builder.setView(ll);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				PoiLegacyFilter nFilter = new PoiLegacyFilter(editText.getText().toString(), null, filter.getAcceptedTypes(), (OsmandApplication) getApplication());
@@ -186,8 +186,8 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 	private void removePoiFilter() {
 		Builder builder = new AlertDialog.Builder(this);
 		builder.setMessage(R.string.edit_filter_delete_dialog_title);
-		builder.setNegativeButton(R.string.default_buttons_no, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setNegativeButton(R.string.shared_string_no, null);
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				if (helper.removePoiFilter(filter)) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 18ed71ff3f..e81e32abbc 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -165,7 +165,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	
 	private void updateSelectionMode(ActionMode m) {
 		if(favoritesSelected.size() > 0) {
-			m.setTitle(favoritesSelected.size() + " " + getMyApplication().getString(R.string.selected));
+			m.setTitle(favoritesSelected.size() + " " + getMyApplication().getString(R.string.shared_string_selected_lowercase));
 		} else{
 			m.setTitle("");
 		}
@@ -242,7 +242,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			list[i] =gs.get(i).name;
 		}
 		cat.setAdapter(new ArrayAdapter<String>(getActivity(), R.layout.list_textview, list));
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -263,8 +263,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		final Resources resources = this.getResources();
 		Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setMessage(getString(R.string.favourites_remove_dialog_msg, point.getName()));
-		builder.setNegativeButton(R.string.default_buttons_no, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setNegativeButton(R.string.shared_string_no, null);
+		builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				boolean deleted = helper.deleteFavourite(point);
@@ -515,8 +515,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		checkBox.setChecked(group.visible);
 		bld.setTitle(R.string.edit_group);
 		bld.setView(favEdit);
-		bld.setNegativeButton(R.string.default_buttons_cancel, null);
-		bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		bld.setNegativeButton(R.string.shared_string_cancel, null);
+		bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -546,7 +546,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 					deleteFavorites();
 				}
 			});
-			b.setNegativeButton(R.string.default_buttons_cancel, null);
+			b.setNegativeButton(R.string.shared_string_cancel, null);
 			b.show();
 		}
 	}
@@ -619,13 +619,13 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 
 			if (tosave.exists()) {
 				Builder bld = new AlertDialog.Builder(getActivity());
-				bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						exportTask.execute();
 					}
 				});
-				bld.setNegativeButton(R.string.default_buttons_no, null);
+				bld.setNegativeButton(R.string.shared_string_no, null);
 				bld.setMessage(R.string.fav_export_confirmation);
 				bld.show();
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index 0f6be0994b..914311dd5b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -39,7 +39,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 		}
 		super.onCreate(savedInstanceState);
 
-		String title = getString(R.string.help);
+		String title = getString(R.string.shared_string_help);
 		String url = "index.html";
 		if(getIntent() != null) {
 			String tl = getIntent().getStringExtra(TITLE);
@@ -113,10 +113,10 @@ public class HelpActivity extends OsmandActionBarActivity {
 		createMenuItem(menu, HOME, R.string.home, 
 				R.drawable.ic_action_home_dark, R.drawable.ic_action_home_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-		createMenuItem(menu, BACK, R.string.previous_button,
+		createMenuItem(menu, BACK, R.string.shared_string_previous,
 				R.drawable.ic_action_undo_dark, R.drawable.ic_action_undo_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
-		createMenuItem(menu, FORWARD, R.string.next_button,
+		createMenuItem(menu, FORWARD, R.string.shared_string_next,
 				R.drawable.ic_action_redo_dark, R.drawable.ic_action_redo_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		createMenuItem(menu, CLOSE, R.string.close, 
diff --git a/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java b/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java
index cfb1bf6930..2ed3996621 100644
--- a/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java
@@ -89,7 +89,7 @@ public class IntermediatePointsDialog {
 		builder.setView(contentView);
 		builder.setInverseBackgroundForced(true);
 		lv.setBackgroundColor(Color.WHITE);
-		builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				if(changeOrder) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 2f6f89f108..52c8f83dd3 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -235,9 +235,9 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuItem menuItem = menu.add(0, HELP_ID, 0, R.string.tips_and_tricks).setIcon(R.drawable.ic_ac_help);
+		MenuItem menuItem = menu.add(0, HELP_ID, 0, R.string.shared_string_help).setIcon(R.drawable.ic_ac_help);
 		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-		menuItem = menu.add(0, SETTINGS_ID, 0, R.string.settings).setIcon(R.drawable.ic_ac_settings);
+		menuItem = menu.add(0, SETTINGS_ID, 0, R.string.shared_string_settings).setIcon(R.drawable.ic_ac_settings);
 		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		menuItem = menu.add(0, EXIT_ID, 0, R.string.exit_Button).setIcon(R.drawable.ic_ac_close);
 		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 024ac02c1e..101a28e88a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -136,7 +136,7 @@ public class MapActivityActions implements DialogProvider {
 		View view = mapActivity.getLayoutInflater().inflate(R.layout.add_gpx_point_dialog, null);
 		final EditText editText = (EditText) view.findViewById(android.R.id.edit);
 		builder.setView(view);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_add, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -407,7 +407,7 @@ public class MapActivityActions implements DialogProvider {
 			Builder bld = new AlertDialog.Builder(mapActivity);
 			if (gpxFiles.size() == 1){
 				bld.setMessage(R.string.use_displayed_track_for_navigation);
-				bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						enterRoutePlanningModeImpl(gpxFiles.get(0), from, fromName);
@@ -437,7 +437,7 @@ public class MapActivityActions implements DialogProvider {
 				});
 			}
 
-			bld.setNegativeButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
+			bld.setNegativeButton(R.string.shared_string_no, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					enterRoutePlanningModeImpl(null, from, fromName);
@@ -490,7 +490,7 @@ public class MapActivityActions implements DialogProvider {
 	private Dialog createReloadTitleDialog(final Bundle args) {
     	Builder builder = new AccessibleAlertBuilder(mapActivity);
     	builder.setMessage(R.string.context_menu_item_update_map_confirm);
-    	builder.setNegativeButton(R.string.default_buttons_cancel, null);
+    	builder.setNegativeButton(R.string.shared_string_cancel, null);
     	final OsmandMapTileView mapView = mapActivity.getMapView();
     	builder.setPositiveButton(R.string.context_menu_item_update_map, new DialogInterface.OnClickListener(){
 			@Override
@@ -882,7 +882,7 @@ public class MapActivityActions implements DialogProvider {
 				}
 			}).reg();
 
-		optionsMenuHelper.item(R.string.settings_activity)
+		optionsMenuHelper.item(R.string.shared_string_settings)
 		.icons(R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_light)
 		.listen(new OnContextMenuClick() {
 			@Override
@@ -988,7 +988,7 @@ public class MapActivityActions implements DialogProvider {
 			// Stop the navigation
 			builder.setTitle(getString(R.string.cancel_route));
 			builder.setMessage(getString(R.string.stop_routing_confirm));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					stopNavigationWithoutConfirm();
@@ -1000,7 +1000,7 @@ public class MapActivityActions implements DialogProvider {
 			// Clear the destination point
 			builder.setTitle(getString(R.string.cancel_navigation));
 			builder.setMessage(getString(R.string.clear_dest_confirm));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					getTargets().clearPointToNavigate(true);
@@ -1009,7 +1009,7 @@ public class MapActivityActions implements DialogProvider {
 			});
 		}
 
-		builder.setNegativeButton(R.string.default_buttons_no, null);
+		builder.setNegativeButton(R.string.shared_string_no, null);
 		builder.show();
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 65556e20c6..02cf4d58ca 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -326,7 +326,7 @@ public class MapActivityLayers {
 			}
 			
 		});
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		return builder.show();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
index a3f3f2b41d..919187a8dc 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
@@ -199,7 +199,7 @@ public class OpeningHoursView {
 
 				});
 
-		b.setNegativeButton(ctx.getString(R.string.default_buttons_cancel), null);
+		b.setNegativeButton(ctx.getString(R.string.shared_string_cancel), null);
 
 		b.show();
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index f1098b0932..2151a5424c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -140,8 +140,8 @@ public class PluginsActivity extends OsmandListActivity {
 		final PopupMenu optionsMenu = new PopupMenu(this, v);
 		if (plugin.isActive() || !plugin.needsInstallation()) {
 			MenuItem enableDisableItem = optionsMenu.getMenu().add(
-					plugin.isActive() ? R.string.disable_plugin2
-							: R.string.enable_plugin2);
+					plugin.isActive() ? R.string.shared_string_disable
+							: R.string.shared_string_enable);
 			enableDisableItem
 					.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 						@Override
@@ -154,7 +154,7 @@ public class PluginsActivity extends OsmandListActivity {
 		}
 
 		if (settingsActivity != null) {
-			MenuItem settingsItem = optionsMenu.getMenu().add(R.string.settings);
+			MenuItem settingsItem = optionsMenu.getMenu().add(R.string.shared_string_settings);
 			settingsItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 				@Override
 				public boolean onMenuItemClick(MenuItem item) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index 32551cac52..155fc8368e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -176,7 +176,7 @@ public class SettingsActivity extends SettingsBaseActivity {
 		String vt = this.getString(R.string.about_version) + "\t";
 		String edition = "";
 		if (!this.getString(R.string.app_edition).equals("")) {
-			edition = this.getString(R.string.local_index_installed) + " : \t" + this.getString(R.string.app_edition);
+			edition = this.getString(R.string.shared_string_release) + " : \t" + this.getString(R.string.app_edition);
 		}
 		tv.setText(vt + version + "\n" +
 				edition + "\n\n" +
@@ -197,7 +197,7 @@ public class SettingsActivity extends SettingsBaseActivity {
 		ll.addView(sv);
 		dialog.setContentView(ll);
 		dialog.show();
-//		bld.setPositiveButton(R.string.default_buttons_ok, null);
+//		bld.setPositiveButton(R.string.shared_string_ok, null);
 	}
 
 	
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index 46e70fae08..96881b4ec2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -308,7 +308,7 @@ public abstract class SettingsBaseActivity extends ActionBarPreferenceActivity
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		settings = getMyApplication().getSettings();
-		getToolbar().setTitle(R.string.settings_activity);
+		getToolbar().setTitle(R.string.shared_string_settings);
 
 		
 		if (profileSettings) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index db6093840f..4db73a9067 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -333,8 +333,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 					input.setLayoutParams(lp);
 					settings.getExternalStorageDirectory().getAbsolutePath();
 					editalert.setView(input);
-					editalert.setNegativeButton(R.string.default_buttons_cancel, null);
-					editalert.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+					editalert.setNegativeButton(R.string.shared_string_cancel, null);
+					editalert.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 					    public void onClick(DialogInterface dialog, int whichButton) {
 					    	warnAboutChangingStorage(input.getText().toString());
 					    }
@@ -485,7 +485,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				if (result.booleanValue() && runOnSuccess != null) {
 					runOnSuccess.run();
 				} else if (!result.booleanValue()) {
-					Toast.makeText(ctx, R.string.input_output_error, Toast.LENGTH_LONG).show();
+					Toast.makeText(ctx, R.string.shared_string_io_error, Toast.LENGTH_LONG).show();
 				}
 			}
 			if(progress.getDialog().isShowing()) {
@@ -557,7 +557,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		}
 		Builder builder = new AlertDialog.Builder(this);
 		builder.setMessage(getString(R.string.application_dir_change_warning2));
-		builder.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_yes, new OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				MoveFilesToDifferentDirectory task =
@@ -573,14 +573,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				task.execute();
 			}
 		});
-		builder.setNeutralButton(R.string.default_buttons_no, new OnClickListener() {
+		builder.setNeutralButton(R.string.shared_string_no, new OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				updateSettingsToNewDir(newDir);								
 			}
 		});
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.show();
 	}
 	
@@ -673,7 +673,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		entries = new String[voiceFiles.size() + 2];
 		entrieValues = new String[voiceFiles.size() + 2];
 		int k = 0;
-		// entries[k++] = getString(R.string.voice_not_specified);
+		// entries[k++] = getString(R.string.shared_string_none);
 		entrieValues[k] = OsmandSettings.VOICE_PROVIDER_NOT_USE;
 		entries[k++] = getString(R.string.voice_not_use);
 		for (String s : voiceFiles) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index fdb27c133d..f0e5706f9e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -133,7 +133,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		// screen power save option:
 		Integer[] screenPowerSaveValues = new Integer[] { 0, 5, 10, 15, 20, 30, 45, 60 };
 		String[] screenPowerSaveNames = new String[screenPowerSaveValues.length];
-		screenPowerSaveNames[0] = getString(R.string.wake_on_voice_never);
+		screenPowerSaveNames[0] = getString(R.string.shared_string_never);
 		for (int i = 1; i < screenPowerSaveValues.length; i++) {
 			screenPowerSaveNames[i] = screenPowerSaveValues[i] + " "
 					+ getString(R.string.int_seconds);
@@ -368,9 +368,9 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		
 		bld.setTitle(title);
 		
-		bld.setNegativeButton(R.string.default_buttons_cancel, null);
+		bld.setNegativeButton(R.string.shared_string_cancel, null);
 		
-		bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 		    public void onClick(DialogInterface dialog, int whichButton) {
 				for (int i = 0; i < prefs.length; i++) {
 					prefs[i].set(tempPrefs[i]);
diff --git a/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java b/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
index ae84dc468b..8120b93df1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
@@ -124,7 +124,7 @@ public class TipsAndTricksActivity {
 		final TIntArrayList toShow = new TIntArrayList();
 		final int[] historyInd = new int[1];
 		if(showFirst){
-			dlg.setTitle(R.string.tip_initial);
+			dlg.setTitle(R.string.shared_string_help);
 			tipDescription.setText(R.string.tip_initial_t);
 			historyInd[0] = -1;
 		} else if(!random){
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
index ce8c41ec1e..6cf4b558bf 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
@@ -144,7 +144,7 @@ public class ShareDialog {
 				try {
 					type.execute(a, title);
 				} catch (RuntimeException e) {
-					Toast.makeText(a, R.string.input_output_error, Toast.LENGTH_SHORT).show();
+					Toast.makeText(a, R.string.shared_string_io_error, Toast.LENGTH_SHORT).show();
 				}				
 			}
 		});
@@ -188,7 +188,7 @@ public class ShareDialog {
 			if (Version.isMarketEnabled((OsmandApplication) activity.getApplication())) {
 				AlertDialog.Builder builder = new AccessibleAlertBuilder(activity);
 				builder.setMessage(activity.getString(R.string.zxing_barcode_scanner_not_found));
-				builder.setPositiveButton(activity.getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(activity.getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Version.marketPrefix((OsmandApplication) activity.getApplication()) 
@@ -199,7 +199,7 @@ public class ShareDialog {
 						}
 					}
 				});
-				builder.setNegativeButton(activity.getString(R.string.default_buttons_no), null);
+				builder.setNegativeButton(activity.getString(R.string.shared_string_no), null);
 				builder.show();
 			} else {
 				Toast.makeText(activity, R.string.zxing_barcode_scanner_not_found, Toast.LENGTH_LONG).show();
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/ShareLocation.java b/OsmAnd/src/net/osmand/plus/activities/actions/ShareLocation.java
index 303d589eb7..17a1b6a488 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/ShareLocation.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/ShareLocation.java
@@ -59,7 +59,7 @@ public class ShareLocation extends OsmAndAction {
 						sendQRCode(latitude, longitude);
 					}
 				} catch (RuntimeException e) {
-					Toast.makeText(mapActivity, R.string.input_output_error, Toast.LENGTH_SHORT).show();
+					Toast.makeText(mapActivity, R.string.shared_string_io_error, Toast.LENGTH_SHORT).show();
 				}				
 			}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
index ca61fc51f9..d410268375 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
@@ -175,7 +175,7 @@ public class StartGPSStatus extends OsmAndAction {
 			if (Version.isMarketEnabled(getMyApplication())) {
 				AlertDialog.Builder builder = new AccessibleAlertBuilder(mapActivity);
 				builder.setMessage(mapActivity. getString(R.string.gps_status_app_not_found));
-				builder.setPositiveButton(mapActivity.getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(mapActivity.getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Version.marketPrefix(getMyApplication()) + g.appName));
@@ -185,7 +185,7 @@ public class StartGPSStatus extends OsmAndAction {
 						}
 					}
 				});
-				builder.setNegativeButton(mapActivity.getString(R.string.default_buttons_no), null);
+				builder.setNegativeButton(mapActivity.getString(R.string.shared_string_no), null);
 				builder.show();
 			} else {
 				Toast.makeText(mapActivity, R.string.gps_status_app_not_found, Toast.LENGTH_LONG).show();
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index 85c2dd1e13..c80d5f3041 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -95,7 +95,7 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
 			mTabs.add(getTabIndicator(R.string.address, getFragment(ADDRESS_TAB_INDEX)));
 			mTabs.add(getTabIndicator(R.string.search_tabs_location, getFragment(LOCATION_TAB_INDEX)));
 			mTabs.add(getTabIndicator(R.string.favorite, getFragment(FAVORITES_TAB_INDEX)));
-			mTabs.add(getTabIndicator(R.string.history, getFragment(HISTORY_TAB_INDEX)));
+			mTabs.add(getTabIndicator(R.string.shared_string_history, getFragment(HISTORY_TAB_INDEX)));
 
 			
 			setViewPagerAdapter(mViewPager, mTabs);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java
index c54c708654..74c4358fcd 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java
@@ -211,7 +211,7 @@ public class SearchAddressOnlineFragment extends Fragment implements SearchActiv
 					}
 				} catch(Exception e){
 					log.error("Error searching address", e); //$NON-NLS-1$
-					warning = getString(R.string.error_io_error) + " : " + e.getMessage();
+					warning = getString(R.string.shared_string_io_error) + " : " + e.getMessage();
 				}
 				return null;
 			}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
index a54d942f41..3866757615 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
@@ -570,7 +570,7 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
 				}
 			});
 		} else {
-			createMenuItem(menu, 1, R.string.default_buttons_ok, R.drawable.ic_action_ok_light,
+			createMenuItem(menu, 1, R.string.shared_string_ok, R.drawable.ic_action_ok_light,
 					R.drawable.ic_action_ok_dark, MenuItem.SHOW_AS_ACTION_ALWAYS);
 		}
 		return super.onCreateOptionsMenu(menu);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index 6a1dc36c1f..ef563c2bbe 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -899,7 +899,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 	private void showPOIDetails(final Amenity amenity, boolean en) {
 		AlertDialog.Builder b = new AlertDialog.Builder(SearchPOIActivity.this);
 		b.setTitle(OsmAndFormatter.getPoiSimpleFormat(amenity, getMyApplication(), en));
-		b.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		b.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int id) {
 				dialog.cancel();
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
index cfe02df729..3bcf1d7936 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
@@ -384,7 +384,7 @@ public class SearchTransportFragment extends Fragment implements SearchActivityC
 		}
 		
 		b.setMessage(txt.toString());
-		b.setPositiveButton(getString(R.string.default_buttons_ok), null);
+		b.setPositiveButton(getString(R.string.shared_string_ok), null);
 		b.setNeutralButton(getString(R.string.transport_search_before), new DialogInterface.OnClickListener(){
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -500,7 +500,7 @@ public class SearchTransportFragment extends Fragment implements SearchActivityC
 			if (locationToGo != null) {
 				labelW.append(OsmAndFormatter.getFormattedDistance(stop.getDistToLocation(), getApplication()));
 			} else {
-				labelW.append(getString(R.string.transport_search_none));
+				labelW.append(getString(R.string.shared_string_none));
 			}
 			labelW.append("]\n").append(route.getName(settings.usingEnglishNames())); //$NON-NLS-1$
 			if (locationToGo != null && stop.getDistToLocation() < 400) {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
index 4e5ca7d5d0..4bd6f3c9dd 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
@@ -147,14 +147,14 @@ public class AudioNotesLayer extends OsmandMapLayer implements IContextMenuProvi
 	private void deleteRecording(final Recording r) {
 		AccessibleAlertBuilder bld = new AccessibleAlertBuilder(activity);
 		bld.setMessage(R.string.recording_delete_confirm);
-		bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_yes, new OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				plugin.deleteRecording(r);				
 			}
 		});
-		bld.setNegativeButton(R.string.default_buttons_no, null);
+		bld.setNegativeButton(R.string.shared_string_no, null);
 		bld.show();
 		
 	}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index b705c18295..59422d23c3 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -1158,7 +1158,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 				}
 			}
 		});
-		dlg.setNegativeButton(R.string.default_buttons_cancel, new OnClickListener() {
+		dlg.setNegativeButton(R.string.shared_string_cancel, new OnClickListener() {
 
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index d6c1511923..7455933bdc 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -202,14 +202,14 @@ public class NotesFragment extends ListFragment {
 			public boolean onMenuItemClick(MenuItem item) {
 				AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 				builder.setMessage(R.string.recording_delete_confirm);
-				builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						plugin.deleteRecording(recording);
 						listAdapter.remove(recording);
 					}
 				});
-				builder.setNegativeButton(R.string.default_buttons_cancel, null);
+				builder.setNegativeButton(R.string.shared_string_cancel, null);
 				builder.show();
 				return true;
 			}
@@ -227,7 +227,7 @@ public class NotesFragment extends ListFragment {
 		editText.setText(recording.getName(getActivity()));
 		InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
 		imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
index a6e36bbcdc..8b79cc5181 100644
--- a/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
+++ b/OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
@@ -54,7 +54,7 @@ public class FailSafeFuntions {
 					tv.setText(ma.getString(R.string.continue_follow_previous_route_auto, delay + ""));
 					tv.setPadding(7, 5, 7, 5);
 					builder.setView(tv);
-					builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+					builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
 							quitRouteRestoreDialog = true;
@@ -62,7 +62,7 @@ public class FailSafeFuntions {
 
 						}
 					});
-					builder.setNegativeButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
+					builder.setNegativeButton(R.string.shared_string_no, new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
 							quitRouteRestoreDialog = true;
diff --git a/OsmAnd/src/net/osmand/plus/base/SuggestExternalDirectoryDialog.java b/OsmAnd/src/net/osmand/plus/base/SuggestExternalDirectoryDialog.java
index 01d3926a44..2d71f43f9e 100644
--- a/OsmAnd/src/net/osmand/plus/base/SuggestExternalDirectoryDialog.java
+++ b/OsmAnd/src/net/osmand/plus/base/SuggestExternalDirectoryDialog.java
@@ -63,7 +63,7 @@ public class SuggestExternalDirectoryDialog {
 					}
 				}
 			});
-			bld.setPositiveButton(R.string.default_buttons_ok, null);
+			bld.setPositiveButton(R.string.shared_string_ok, null);
 			bld.show();
 			return true;
 		} 
diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
index a2c3e4cd07..f08357c565 100644
--- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
@@ -137,7 +137,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 					}
 				});
 		b.setTitle(R.string.profile_settings);
-		b.setPositiveButton(R.string.default_buttons_ok, null);
+		b.setPositiveButton(R.string.shared_string_ok, null);
 		b.setView(v);
 		b.show();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index e518230efc..0f3b86ec62 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -438,9 +438,9 @@ public class ConfigureMapMenu {
 		
 		bld.setTitle(category);
 		
-		bld.setNegativeButton(R.string.default_buttons_cancel, null);
+		bld.setNegativeButton(R.string.shared_string_cancel, null);
 		
-		bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 		    public void onClick(DialogInterface dialog, int whichButton) {
 				for (int i = 0; i < prefs.size(); i++) {
 					prefs.get(i).set(tempPrefs[i]);
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
index 146c93d0d5..124a74f790 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
@@ -188,7 +188,7 @@ public class FavoriteDialogs {
 		}
 		cat.setAdapter(new ArrayAdapter<String>(activity, R.layout.list_textview, list));
 		
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setNeutralButton(R.string.update_existing, new DialogInterface.OnClickListener(){
 
 			@Override
@@ -215,7 +215,7 @@ public class FavoriteDialogs {
 				point.setCategory(categoryStr);
 				Builder bld = FavouritesDbHelper.checkDublicates(point, helper, activity);
 				if(bld != null) {
-					bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+					bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
 							addFavorite(activity, point, helper);							
diff --git a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
index 3af9211755..69a4977473 100644
--- a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
@@ -280,7 +280,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 				saveGpx(activity, newName);
 			}
 		});
-		b.setNegativeButton(R.string.default_buttons_cancel, null);
+		b.setNegativeButton(R.string.shared_string_cancel, null);
 		b.show();
 	}
 	
@@ -364,7 +364,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 					pref.set(false);
 				}
 			});
-			builder.setPositiveButton(R.string.default_buttons_ok, null);
+			builder.setPositiveButton(R.string.shared_string_ok, null);
 			
 			builder.show();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index bcb9b066c8..95c54fdb31 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -147,13 +147,13 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 		if (asz != -1 && asz > 0 && sz / asz > 0.4) {
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setMessage(MessageFormat.format(getString(R.string.download_files_question_space), list.size(), sz, asz));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					downloadListIndexThread.runDownloadFiles();
 				}
 			});
-			builder.setNegativeButton(R.string.default_buttons_no, null);
+			builder.setNegativeButton(R.string.shared_string_no, null);
 			builder.show();
 		} else {
 			downloadListIndexThread.runDownloadFiles();
@@ -177,7 +177,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 				AlertDialog.Builder msg = new AlertDialog.Builder(this);
 				msg.setTitle(R.string.free_version_title);
 				msg.setMessage(msgTx);
-				msg.setPositiveButton(R.string.default_buttons_ok, null);
+				msg.setPositiveButton(R.string.shared_string_ok, null);
 				msg.show();
 			} else {
 				downloadFilesCheckInternet();
@@ -192,13 +192,13 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 			if (getMyApplication().getSettings().isInternetConnectionAvailable()) {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.download_using_mobile_internet));
-				builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						downloadFilesPreCheckSpace();
 					}
 				});
-				builder.setNegativeButton(R.string.default_buttons_no, null);
+				builder.setNegativeButton(R.string.shared_string_no, null);
 				builder.show();
 			} else {
 				AccessibleToast.makeText(this, R.string.no_internet_connection, Toast.LENGTH_LONG).show();
@@ -215,16 +215,16 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 
 	public void makeSureUserCancelDownload() {
 		AlertDialog.Builder bld = new AlertDialog.Builder(this);
-		bld.setTitle(getString(R.string.default_buttons_cancel));
+		bld.setTitle(getString(R.string.shared_string_cancel));
 		bld.setMessage(R.string.confirm_interrupt_download);
-		bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				dialog.dismiss();
 				cancelDownload();
 			}
 		});
-		bld.setNegativeButton(R.string.default_buttons_no, null);
+		bld.setNegativeButton(R.string.shared_string_no, null);
 		bld.show();
 	}
 
@@ -274,13 +274,13 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 						AccessibleAlertBuilder ab = new AccessibleAlertBuilder(this);
 						ab.setMessage(getString(R.string.android_19_location_disabled,
 								settings.getExternalStorageDirectory()));
-						ab.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+						ab.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 							@Override
 							public void onClick(DialogInterface dialog, int which) {
 								copyFilesForAndroid19(newLoc);
 							}
 						});
-						ab.setNegativeButton(R.string.default_buttons_cancel, null);
+						ab.setNegativeButton(R.string.shared_string_cancel, null);
 						ab.show();
 					}
 				}
@@ -307,7 +307,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 					}
 				});
 			}
-			msg.setPositiveButton(R.string.default_buttons_ok, null);
+			msg.setPositiveButton(R.string.shared_string_ok, null);
 			msg.show();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index fb7a0c6f91..a69d89f9be 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -383,13 +383,13 @@ public class DownloadActivity extends BaseDownloadActivity {
 		if(count > 0){
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setMessage(getString(R.string.download_additional_maps, s, sz));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					downloadFilesCheckInternet();
 				}
 			});
-			builder.setNegativeButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
+			builder.setNegativeButton(R.string.shared_string_no, new DialogInterface.OnClickListener() {
 
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java b/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java
index 23d8127333..c80f01c55f 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java
@@ -214,7 +214,7 @@ public class DownloadFileHelper {
 				Algorithms.removeAllFiles(de.targetFile);
 				boolean renamed = de.fileToDownload.renameTo(de.targetFile);
 				if(!renamed) {
-					showWarningCallback.showWarning(ctx.getString(R.string.error_io_error) + " : old file can't be deleted");
+					showWarningCallback.showWarning(ctx.getString(R.string.shared_string_io_error) + " : old file can't be deleted");
 					return false;
 				}
 			}
@@ -226,7 +226,7 @@ public class DownloadFileHelper {
 			return true;
 		} catch (IOException e) {
 			log.error("Exception ocurred", e); //$NON-NLS-1$
-			showWarningCallback.showWarning(ctx.getString(R.string.error_io_error) + " : " + e.getMessage());
+			showWarningCallback.showWarning(ctx.getString(R.string.shared_string_io_error) + " : " + e.getMessage());
 			// Possibly file is corrupted
 			Algorithms.removeAllFiles(de.fileToDownload);
 			return false;
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 67412c7cec..20237297b4 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -450,7 +450,7 @@ public class DownloadIndexesThread {
 						}
 					}
 				});
-				builder.setNegativeButton(R.string.default_buttons_cancel, new DialogInterface.OnClickListener() {
+				builder.setNegativeButton(R.string.shared_string_cancel, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						dialog.dismiss();
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index e5d1c95fbc..86026ab920 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -218,13 +218,13 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			new LocalIndexOperationTask(RESTORE_OPERATION).execute(info);
 		} else if (resId == R.string.local_index_mi_delete) {
 			Builder confirm = new Builder(getActivity());
-			confirm.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			confirm.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					new LocalIndexOperationTask(DELETE_OPERATION).execute(info);
 				}
 			});
-			confirm.setNegativeButton(R.string.default_buttons_no, null);
+			confirm.setNegativeButton(R.string.shared_string_no, null);
 			confirm.setMessage(getString(R.string.delete_confirmation_msg, info.getFileName()));
 			confirm.show();
 		} else if (resId == R.string.local_index_mi_backup) {
@@ -264,7 +264,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 					
 				}
 			});
-			b.setNegativeButton(R.string.default_buttons_cancel, null);
+			b.setNegativeButton(R.string.shared_string_cancel, null);
 			b.show();
 		}
 	}
@@ -630,7 +630,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 				Builder builder = new AlertDialog.Builder(getDownloadActivity());
 				builder.setMessage(getString(R.string.local_index_action_do, actionButton.toLowerCase(), selectedItems.size()));
 				builder.setPositiveButton(actionButton, listener);
-				builder.setNegativeButton(R.string.default_buttons_cancel, null);
+				builder.setNegativeButton(R.string.shared_string_cancel, null);
 				builder.show();
 				return true;
 			}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
index 8cf515ea4f..c711847214 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
@@ -111,7 +111,7 @@ public class AvoidSpecificRoads {
 			});
 		}
 
-		bld.setPositiveButton(R.string.select_impassable_road, new DialogInterface.OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_select_on_map, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialogInterface, int i) {
 				selectFromMap(mapActivity);
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index 3d8ac0b1f5..35da2fba72 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -305,7 +305,7 @@ public class GpxUiHelper {
 		};
 		b.setAdapter(listAdapter, onClickListener);
 		if (multipleChoice) {
-			b.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+			b.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index bea1d00f5c..e1b45496ea 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -589,7 +589,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 						}
 					}
 				}).setTitle(app.getString(R.string.search_radius_proximity))
-				.setNegativeButton(R.string.default_buttons_cancel, null)
+				.setNegativeButton(R.string.shared_string_cancel, null)
 				.show();
 	}
 
@@ -769,7 +769,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 			});
 			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
 			builder.setView(listView);
-			builder.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
 
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
@@ -777,7 +777,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 				}
 			});
 			if (edit) {
-				builder.setNegativeButton(ctx.getString(R.string.default_buttons_cancel), null);
+				builder.setNegativeButton(ctx.getString(R.string.shared_string_cancel), null);
 			}
 			AlertDialog dlg = builder.create();
 			srcDialog[0] = dlg;
@@ -812,7 +812,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 			});
 			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
 			builder.setView(listView);
-			builder.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
+			builder.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
 
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
@@ -820,7 +820,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 				}
 			});
 			if (edit) {
-				builder.setNegativeButton(ctx.getString(R.string.default_buttons_cancel), null);
+				builder.setNegativeButton(ctx.getString(R.string.shared_string_cancel), null);
 			}
 			AlertDialog dlg = builder.create();
 			srcDialog[0] = dlg;
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 78ddd96160..d6ff47ccda 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -374,8 +374,8 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 		LinearLayout ll = createIntervalChooseLayout(uiCtx, patternMsg, seconds, minutes,
 				choice, v, dm);
 		dlg.setView(ll);
-		dlg.setPositiveButton(R.string.default_buttons_ok, onclick);
-		dlg.setNegativeButton(R.string.default_buttons_cancel, null);
+		dlg.setPositiveButton(R.string.shared_string_ok, onclick);
+		dlg.setNegativeButton(R.string.shared_string_cancel, null);
 		dlg.show();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index aa8bba8af2..5feb207b8b 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -407,7 +407,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 	private void updateSelectionMode(ActionMode m) {
 		if (selectedItems.size() > 0) {
-			m.setTitle(selectedItems.size() + " " + app.getString(R.string.selected));
+			m.setTitle(selectedItems.size() + " " + app.getString(R.string.shared_string_selected_lowercase));
 		} else {
 			m.setTitle("");
 		}
@@ -522,7 +522,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 				builder.setMessage(getString(R.string.local_index_action_do, actionButton.toLowerCase(),
 						selectedItems.size()));
 				builder.setPositiveButton(actionButton, listener);
-				builder.setNegativeButton(R.string.default_buttons_cancel, null);
+				builder.setNegativeButton(R.string.shared_string_cancel, null);
 				builder.show();
 				return true;
 			}
@@ -570,7 +570,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 				}
 			});
-			b.setNegativeButton(R.string.default_buttons_cancel, null);
+			b.setNegativeButton(R.string.shared_string_cancel, null);
 			b.show();
 		}
 	}
@@ -919,8 +919,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 		@Override
 		public String getGroup(int groupPosition) {
-			if (isSelectedGroup(groupPosition)) {
-				return app.getString(R.string.selected_tracks);
+			if(isSelectedGroup(groupPosition)) {
+				return app.getString(R.string.shared_string_selected);
 			}
 			return category.get(getGroupPosition(groupPosition));
 		}
@@ -1048,14 +1048,14 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			public boolean onMenuItemClick(MenuItem item) {
 				AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 				builder.setMessage(R.string.recording_delete_confirm);
-				builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						operationTask = new DeleteGpxTask();
 						operationTask.execute(gpxInfo);
 					}
 				});
-				builder.setNegativeButton(R.string.default_buttons_cancel, null);
+				builder.setNegativeButton(R.string.shared_string_cancel, null);
 				builder.show();
 				return true;
 			}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
index 0a87ec6d80..6ece1ba996 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
@@ -217,7 +217,7 @@ public class SelectedGPXFragment extends ListFragment {
 
 			}
 		});
-		b.setNegativeButton(R.string.default_buttons_cancel, null);
+		b.setNegativeButton(R.string.shared_string_cancel, null);
 		b.show();
 	}
 
@@ -302,8 +302,8 @@ public class SelectedGPXFragment extends ListFragment {
 		}
 		
 		bld.setView(view);
-		bld.setNegativeButton(R.string.default_buttons_cancel, null); 
-		bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		bld.setNegativeButton(R.string.shared_string_cancel, null);
+		bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java
index 5ef10698b4..37e387ceb3 100644
--- a/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java
@@ -56,7 +56,7 @@ public class NauticalMapsPlugin extends OsmandPlugin {
 					 IndexConstants.BINARY_MAP_INDEX_EXT)){
 				Builder dlg = new AlertDialog.Builder(activity);
 				dlg.setMessage(net.osmand.plus.R.string.nautical_maps_missing);
-				dlg.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
+				dlg.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
 					
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
@@ -66,7 +66,7 @@ public class NauticalMapsPlugin extends OsmandPlugin {
 						activity.startActivity(intent);
 					}
 				});
-				dlg.setNegativeButton(R.string.default_buttons_cancel, new OnClickListener() {
+				dlg.setNegativeButton(R.string.shared_string_cancel, new OnClickListener() {
 					
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
index c83a282793..d0e7a00270 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
@@ -181,7 +181,7 @@ public class EditingPOIActivity implements DialogProvider {
 		closeChangeset.setText(R.string.close_changeset);
 		ll.addView(closeChangeset);
 		builder.setView(ll);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_delete, new DialogInterface.OnClickListener(){
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -575,7 +575,7 @@ public class EditingPOIActivity implements DialogProvider {
 				ctx.removeDialog(DIALOG_OPENING_HOURS);
 			}
 		});
-		builder.setNegativeButton(ctx.getString(R.string.default_buttons_cancel), new DialogInterface.OnClickListener() {
+		builder.setNegativeButton(ctx.getString(R.string.shared_string_cancel), new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				ctx.removeDialog(DIALOG_OPENING_HOURS);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
index c8138594f3..08c011d006 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
@@ -126,7 +126,7 @@ public class LocalOpenstreetmapActivity extends OsmandListActivity {
 					listAdapter.notifyDataSetChanged();
 				}
 			});
-			b.setNegativeButton(R.string.default_buttons_cancel, null);
+			b.setNegativeButton(R.string.shared_string_cancel, null);
 			b.show();
 			return true;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
index 5ed3c88d05..04acfc42d0 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
@@ -157,10 +157,10 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 			showWarning(msg);
 		} catch (MalformedURLException e) {
 			log.error(userOperation + " " + ctx.getString(R.string.failed_op) , e); //$NON-NLS-1$
-			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.poi_error_unexpected_template), userOperation));
+			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template) + ": " + ctx.getResources().getString(R.string.shared_string_unexpected_error), userOperation));
 		} catch (IOException e) {
 			log.error(userOperation + " " + ctx.getString(R.string.failed_op) , e); //$NON-NLS-1$
-			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.poi_error_io_error_template), userOperation));
+			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template) + ": " + ctx.getResources().getString(R.string.shared_string_io_error), userOperation));
 		}
 
 		return null;
@@ -329,10 +329,10 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 			
 		} catch (IOException e) {
 			log.error("Loading node failed " + nodeId, e); //$NON-NLS-1$
-			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.error_io_error), Toast.LENGTH_LONG).show();
+			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error), Toast.LENGTH_LONG).show();
 		} catch (SAXException e) {
 			log.error("Loading node failed " + nodeId, e); //$NON-NLS-1$
-			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.error_io_error), Toast.LENGTH_LONG).show();
+			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error), Toast.LENGTH_LONG).show();
 		}
 		return null;
 	}
@@ -365,7 +365,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 				
 				@Override
 				public void run() {
-					AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.error_io_error), Toast.LENGTH_LONG).show();					
+					AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error), Toast.LENGTH_LONG).show();					
 				}
 			});
 		}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
index 81cffc9d81..de5b06a5cc 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
@@ -341,7 +341,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
 		Builder builder = new AlertDialog.Builder(activity);
 		builder.setTitle(R.string.osb_add_dialog_title);
 		builder.setView(openBug);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		((EditText)openBug.findViewById(R.id.Password)).setText(((OsmandApplication) activity.getApplication()).getSettings().USER_PASSWORD.get());
 		((EditText)openBug.findViewById(R.id.AuthorName)).setText(((OsmandApplication) activity.getApplication()).getSettings().USER_NAME.get());
 		AndroidUtils.softKeyboardDelayed((EditText)openBug.findViewById(R.id.BugMessage));
@@ -417,7 +417,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
 		((EditText)view.findViewById(R.id.AuthorName)).setText(((OsmandApplication) activity.getApplication()).getSettings().USER_NAME.get());
 		((EditText)view.findViewById(R.id.Password)).setText(((OsmandApplication) activity.getApplication()).getSettings().USER_PASSWORD.get());
 		AndroidUtils.softKeyboardDelayed((EditText)view.findViewById(R.id.BugMessage));
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setPositiveButton(R.string.osb_comment_dialog_add_button, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -452,7 +452,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
 	private Dialog createCloseBugDialog(final Bundle args) {
 		Builder builder = new AlertDialog.Builder(activity);
 		builder.setTitle(R.string.osb_close_dialog_title);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setPositiveButton(R.string.osb_close_dialog_close_button, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
index 7f49a74e34..21036512a5 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@@ -240,8 +240,8 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		visibility.setSelection(0);
 		
 		bldr.setView(view);
-		bldr.setNegativeButton(R.string.default_buttons_no, null);
-		bldr.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		bldr.setNegativeButton(R.string.shared_string_no, null);
+		bldr.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 10cc141af4..d8c02991af 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -429,7 +429,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				group = (OsMoGroup) (o instanceof OsMoGroup ? o : null);
 				MenuItem mi = null;
 				if (device != null) {
-					mi = createMenuItem(menu, ON_OFF_ACTION_ID, R.string.default_buttons_ok, 0, 0,
+					mi = createMenuItem(menu, ON_OFF_ACTION_ID, R.string.shared_string_ok, 0, 0,
 							MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 				}
 				if (device != null && device.getLastLocation() != null) {
@@ -441,7 +441,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 						device != null && device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				///
 				if (device != null) {
-					createMenuItem(menu, SETTINGS_DEV_ID, R.string.settings, R.drawable.ic_action_settings_enabled_light, R.drawable.ic_action_settings_enabled_dark,
+					createMenuItem(menu, SETTINGS_DEV_ID, R.string.shared_string_settings, R.drawable.ic_action_settings_enabled_light, R.drawable.ic_action_settings_enabled_dark,
 							// there is a bug in Android 4.2 layout
 							device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				}
@@ -506,7 +506,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 					bld.setTitle(getString(
 							selectedObject instanceof OsMoDevice ? R.string.delete_confirmation_msg :
 									R.string.osmo_leave_confirmation_msg, name));
-					bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+					bld.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
@@ -515,7 +515,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 							deleteObject(obj);
 						}
 					});
-					bld.setNegativeButton(R.string.default_buttons_no, null);
+					bld.setNegativeButton(R.string.shared_string_no, null);
 					bld.show();
 				} else if (item.getItemId() == GROUP_INFO) {
 					showGroupInfo(group);
@@ -600,7 +600,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		tv.setMovementMethod(LinkMovementMethod.getInstance());
 		tv.setText(sb.toString());
 		bld.setView(sv);
-		bld.setPositiveButton(R.string.default_buttons_ok, null);
+		bld.setPositiveButton(R.string.shared_string_ok, null);
 		bld.setNegativeButton(R.string.osmo_invite, new OnClickListener() {
 			
 			@Override
@@ -672,7 +672,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				}
 			}
 		});
-		bld.setNegativeButton(R.string.default_buttons_cancel, null);
+		bld.setNegativeButton(R.string.shared_string_cancel, null);
 		bld.show();
 	}
 	
@@ -834,7 +834,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 			}
 		});
 		
-		//builder.setNegativeButton(R.string.default_buttons_no, null);
+		//builder.setNegativeButton(R.string.shared_string_no, null);
 		builder.show();
 	}
 
@@ -864,8 +864,8 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		warnCreateDesc.setOnClickListener(click);
 		
 		builder.setView(v);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
-		builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
+		builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				if(!checkOperationIsNotRunning()) {
@@ -920,7 +920,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		});
 		
 		builder.setView(v);
-		builder.setNegativeButton(R.string.default_buttons_cancel, null);
+		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
 
 			@Override
@@ -966,7 +966,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		createMenuItem(menu, CREATE_GROUP, R.string.osmo_create_group, 
 				R.drawable.ic_action_plus_dark, R.drawable.ic_action_plus_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-		createMenuItem(menu, SETTINGS_ID, R.string.settings, 
+		createMenuItem(menu, SETTINGS_ID, R.string.shared_string_settings, 
 				R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		return super.onCreateOptionsMenu(menu);
@@ -1369,7 +1369,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
         final TIntArrayList list = new TIntArrayList();
         ColorDialogs.setupColorSpinner(this, devColor, colorSpinner, list);
 		
-		bld.setPositiveButton(R.string .default_buttons_yes, new DialogInterface.OnClickListener() {
+		bld.setPositiveButton(R.string .shared_string_yes, new DialogInterface.OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -1377,7 +1377,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 						name.getText().toString(), list.get(colorSpinner.getSelectedItemPosition()));
 			}
 		});
-		bld.setNegativeButton(R.string.default_buttons_no, null);
+		bld.setNegativeButton(R.string.shared_string_no, null);
 		bld.show();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
index 245b66c7ff..6a91bd1789 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
@@ -403,14 +403,14 @@ public class OsMoService implements OsMoReactor {
 	protected void showRegisterAgain(OsMoGroupsActivity ga, String msg) {
 		Builder bld = new AlertDialog.Builder(ga);
 		bld.setMessage(msg);
-		bld.setPositiveButton(R.string.default_buttons_ok, new OnClickListener() {
+		bld.setPositiveButton(R.string.shared_string_ok, new OnClickListener() {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				registerAsync();
 			}
 		});
-		bld.setNegativeButton(R.string.default_buttons_cancel, null);
+		bld.setNegativeButton(R.string.shared_string_cancel, null);
 		
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
index 5218dd8f02..f17bb17092 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
@@ -134,7 +134,7 @@ public class SettingsOsMoActivity extends SettingsBaseActivity {
 			tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 19);
 			tv.setMovementMethod(LinkMovementMethod.getInstance());
 			bld.setView(sv);
-			bld.setPositiveButton(R.string.default_buttons_ok, null);
+			bld.setPositiveButton(R.string.shared_string_ok, null);
 			bld.show();
 			return true;
 		} else if(preference == trackerId) {
@@ -162,7 +162,7 @@ public class SettingsOsMoActivity extends SettingsBaseActivity {
 			public void run() {
 				Builder bld = new AlertDialog.Builder(SettingsOsMoActivity.this);
 				bld.setMessage(R.string.osmo_regenerate_login_ids_confirm);
-				bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
+				bld.setPositiveButton(R.string.shared_string_yes, new OnClickListener() {
 					
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
@@ -170,7 +170,7 @@ public class SettingsOsMoActivity extends SettingsBaseActivity {
 						plugin.getService().pushCommand(OsMoService.REGENERATE_CMD);
 					}
 				});
-				bld.setNegativeButton(R.string.default_buttons_no, null);
+				bld.setNegativeButton(R.string.shared_string_no, null);
 				bld.show();
 			}
 		};
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index 69a75da27f..40b8d4c082 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -281,7 +281,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		confirm.setTitle(activity.getString(R.string.osmand_parking_delete));
 		confirm.setMessage(activity.getString(R.string.osmand_parking_delete_confirm));
 		confirm.setCancelable(true);
-		confirm.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		confirm.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				showDeleteEventWarning(activity);
@@ -294,7 +294,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 				}
 			}
 		});
-		confirm.setNegativeButton(R.string.default_buttons_cancel, null);
+		confirm.setNegativeButton(R.string.shared_string_cancel, null);
 		return confirm.show();
 	}
 	
@@ -310,7 +310,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		Builder setTime = new AlertDialog.Builder(mapActivity);
 		setTime.setView(setTimeParking);
 		setTime.setTitle(mapActivity.getString(R.string.osmand_parking_time_limit_title));
-		setTime.setNegativeButton(R.string.default_buttons_cancel, null);
+		setTime.setNegativeButton(R.string.shared_string_cancel, null);
 		final TextView  textView = (TextView) setTimeParking.findViewById(R.id.parkTime);
 		final TimePicker timePicker = (TimePicker) setTimeParking.findViewById(R.id.parking_time_picker);
 
@@ -348,7 +348,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		timePicker.setCurrentHour(0);
 		timePicker.setCurrentMinute(0);
 		
-		setTime.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		setTime.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				choose.dismiss();
@@ -394,7 +394,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 			Builder deleteEventWarning = new AlertDialog.Builder(activity);
 			deleteEventWarning.setTitle(activity.getString(R.string.osmand_parking_warning));
 			deleteEventWarning.setMessage(activity.getString(R.string.osmand_parking_warning_text));
-			deleteEventWarning.setNeutralButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {						
+			deleteEventWarning.setNeutralButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {						
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 				}
diff --git a/OsmAnd/src/net/osmand/plus/poi/NameFinderPoiFilter.java b/OsmAnd/src/net/osmand/plus/poi/NameFinderPoiFilter.java
index e5e9790954..2f9a53ca2e 100644
--- a/OsmAnd/src/net/osmand/plus/poi/NameFinderPoiFilter.java
+++ b/OsmAnd/src/net/osmand/plus/poi/NameFinderPoiFilter.java
@@ -135,10 +135,10 @@ public class NameFinderPoiFilter extends PoiLegacyFilter {
 			stream.close();
 		} catch (IOException e) {
 			log.error("Error loading name finder poi", e); //$NON-NLS-1$
-			lastError = getApplication().getString(R.string.input_output_error); //$NON-NLS-1$
+			lastError = getApplication().getString(R.string.shared_string_io_error); //$NON-NLS-1$
 		} catch (XmlPullParserException e) {
 			log.error("Error parsing name finder poi", e); //$NON-NLS-1$
-			lastError = getApplication().getString(R.string.input_output_error); //$NON-NLS-1$
+			lastError = getApplication().getString(R.string.shared_string_io_error); //$NON-NLS-1$
 		}
 		MapUtils.sortListOfMapObject(searchedAmenities, lat, lon);
 		return searchedAmenities;
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
index c8eea4236e..6ff8594d29 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
@@ -269,7 +269,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 			}
 			protected void onPostExecute(final java.util.List<TileSourceTemplate> downloaded) {
 				if (downloaded == null || downloaded.isEmpty()) {
-					AccessibleToast.makeText(activity, R.string.error_io_error, Toast.LENGTH_SHORT).show();
+					AccessibleToast.makeText(activity, R.string.shared_string_io_error, Toast.LENGTH_SHORT).show();
 					return;
 				}
 				Builder builder = new AlertDialog.Builder(activity);
@@ -288,7 +288,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 						}
 					}
 				});
-				builder.setNegativeButton(R.string.default_buttons_cancel, null);
+				builder.setNegativeButton(R.string.shared_string_cancel, null);
 				builder.setTitle(R.string.select_tile_source_to_install);
 				builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
 					@Override
@@ -393,7 +393,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 				}
 			}
 		});
-		bld.setNegativeButton(R.string.default_buttons_cancel, null);
+		bld.setNegativeButton(R.string.shared_string_cancel, null);
 		bld.show();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
index 8945130720..62d6c87109 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/SettingsRasterMapsActivity.java
@@ -142,7 +142,7 @@ public class SettingsRasterMapsActivity extends SettingsBaseActivity {
 		String[] values = new String[entriesMap.size() + 2 + add];
 		int ki = 0;
 		if (addNone) {
-			entries[ki] = getString(R.string.default_none);
+			entries[ki] = getString(R.string.shared_string_none);
 			values[ki] = "";
 			ki++;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
index 906189bc92..be99f823b0 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
@@ -293,7 +293,7 @@ public class RoutePointsActivity extends OsmandListActivity {
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		createMenuItem(menu, OK_ID, R.string.default_buttons_ok, 
+		createMenuItem(menu, OK_ID, R.string.shared_string_ok, 
 				R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark ,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		createMenuItem(menu, NAVIGATE_DIALOG_ID, R.string.navigate_dialog,
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 1f0f06fbc9..1b804f9595 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -354,7 +354,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 				bld.setMessage(R.string.stage_is_completed);
 			}
 			bld.setTitle(getString(R.string.stage_is_completed_short))
-					.setPositiveButton(R.string.default_buttons_ok, null);
+					.setPositiveButton(R.string.shared_string_ok, null);
 			if (args != null && args.getBoolean(START_OVER)) {
 				String id = args.getString(TOUR_PARAM);
 				TourInformation tours = null;
@@ -522,7 +522,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 			ssf.onAttach(getActivity());
             AlertDialog dlg = new AlertDialog.Builder(getActivity())
             		.setView(ssf.onCreateView(getActivity().getLayoutInflater(), null, savedInstanceState))
-                    .setPositiveButton(R.string.default_buttons_ok, null)
+                    .setPositiveButton(R.string.shared_string_ok, null)
                     .create();
             return dlg;
         }
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
index bb15efb9bd..263a367ec7 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
@@ -100,7 +100,7 @@ public class SherpafySelectToursFragment extends ListFragment {
 			}
 		});
 		
-		builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				String acCode = editText.getText().toString();
diff --git a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
index 8fc0138455..be91e8ce1b 100644
--- a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
@@ -271,7 +271,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer {
 							continue;
 						}
 						if (set.size() > 1) {
-							s.append(" ").append(view.getResources().getString(R.string.default_or)).append(" ");
+							s.append(" ").append(view.getResources().getString(R.string.shared_string_or)).append(" ");
 							filter.append(", ");
 						} else {
 							s.append(" ");
diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
index 4964f9193c..8ef1190e49 100644
--- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
@@ -208,8 +208,8 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 						final Resources resources = view.getContext().getResources();
 						Builder builder = new AlertDialog.Builder(view.getContext());
 						builder.setMessage(resources.getString(R.string.favourites_remove_dialog_msg, a.getName()));
-						builder.setNegativeButton(R.string.default_buttons_no, null);
-						builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+						builder.setNegativeButton(R.string.shared_string_no, null);
+						builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
 							@Override
 							public void onClick(DialogInterface dialog, int which) {
 								favorites.deleteFavourite(a);
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
index 7670c13a9c..50f7b058b6 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
@@ -384,8 +384,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 	private Spinner setupFromSpinner( View view) {
 		ArrayList<String> fromActions = new ArrayList<String>();
 		fromActions.add(mapActivity.getString(R.string.route_descr_current_location));
-		fromActions.add(mapActivity.getString(R.string.route_descr_favorite));
-		fromActions.add(mapActivity.getString(R.string.route_descr_select_on_map));
+		fromActions.add(mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis));
+		fromActions.add(mapActivity.getString(R.string.shared_string_select_on_map));
 		
 		TargetPoint start = getTargets().getPointToStart();
 		if (start != null) {
@@ -423,7 +423,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 			toSpinner.setPromptId(R.string.route_descr_select_destination);
 			toActions.add(mapActivity.getString(R.string.route_descr_select_destination));			
 		}
-		toActions.add(mapActivity.getString(R.string.route_descr_favorite));
+		toActions.add(mapActivity.getString(R.string.shared_string_favorite) + mapActivity.getString(R.string.shared_string_ellipsis));
 		toActions.add(mapActivity.getString(R.string.route_descr_select_on_map));
 		
 		ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(view.getContext(), 
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
index 1ce15279e3..6951fdbc53 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
@@ -385,7 +385,7 @@ public class MapRoutePreferencesControl extends MapControls {
 
 	private void updateSpinnerItems(Spinner gpxSpinner) {
 		ArrayList<String> gpxActions = new ArrayList<String>();
-		gpxActions.add(mapActivity.getString(R.string.default_none));
+		gpxActions.add(mapActivity.getString(R.string.shared_string_none));
 		gpxActions.add(mapActivity.getString(R.string.select_gpx));
 		GPXRouteParamsBuilder rp = mapActivity.getRoutingHelper().getCurrentGPXRoute();
 		if(rp != null) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index de15f3c8c3..603333e7b4 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -158,14 +158,14 @@ public class MapInfoWidgetsFactory {
 						});
 					}
 					dlg.setView(ll);
-					dlg.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
+					dlg.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
 							app.getSettings().SERVICE_OFF_INTERVAL.set(vs.value);
 							app.startNavigationService(NavigationService.USED_BY_GPX);
 						}
 					});
-					dlg.setNegativeButton(R.string.default_buttons_cancel, null);
+					dlg.setNegativeButton(R.string.shared_string_cancel, null);
 					dlgshow[0] = dlg.show();
 
 				}
diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
index aeb9eb511b..140dba8085 100644
--- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
@@ -229,8 +229,8 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 			IntentStarter intentStarter, final Activity ctx) {
 		Builder builder = new AlertDialog.Builder(ctx);
 		builder.setCancelable(true);
-		builder.setNegativeButton(R.string.default_buttons_no, null);
-		builder.setPositiveButton(R.string.default_buttons_yes, intentStarter);
+		builder.setNegativeButton(R.string.shared_string_no, null);
+		builder.setPositiveButton(R.string.shared_string_yes, intentStarter);
 		builder.setTitle(titleResID);
 		builder.setMessage(messageResID);
 		return builder;
diff --git a/plugins/OsmAnd-AddressPlugin/res/values/strings.xml b/plugins/OsmAnd-AddressPlugin/res/values/strings.xml
index 27c8371abd..58c67bd539 100644
--- a/plugins/OsmAnd-AddressPlugin/res/values/strings.xml
+++ b/plugins/OsmAnd-AddressPlugin/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Address Book Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Address Book Plugin is installed.</string>
diff --git a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java
index 01b79ccf16..5d3083dfea 100644
--- a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java
+++ b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/AddressBookPluginActivity.java
@@ -40,7 +40,7 @@ public class AddressBookPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
@@ -51,7 +51,7 @@ public class AddressBookPluginActivity extends Activity {
 						}
 					}
 				});
-				builder.setNegativeButton(getString(R.string.default_buttons_no), null);
+				builder.setNegativeButton(getString(R.string.shared_string_no), null);
 				builder.show();
 			}
 		}
diff --git a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java
index e020f5b25b..8619fd283d 100644
--- a/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java
+++ b/plugins/OsmAnd-AddressPlugin/src/net/osmand/addressPlugin/ContactAddressPluginActivity.java
@@ -100,7 +100,7 @@ public class ContactAddressPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
@@ -111,7 +111,7 @@ public class ContactAddressPluginActivity extends Activity {
 						}
 					}
 				});
-				builder.setNegativeButton(getString(R.string.default_buttons_no), null);
+				builder.setNegativeButton(getString(R.string.shared_string_no), null);
 				builder.show();
 			}
 		}
diff --git a/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml
index 70a2ac2e92..e6fc2e5755 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Nee</string>
-    <string name="default_buttons_yes">Ja</string>
+<resources><string name="shared_string_no">Nee</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd is nie geïnstalleer nie</string>
     <string name="app_name">OsmAnd Parkering</string>
     <string name="parking_plugin_installed">OsmAnd Parkering inlegmodule is geïnstalleer en aangeskakel in OsmAnd verstellings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml
index 3a381d1da7..6ea95fbcc6 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">ليس</string>
-    <string name="default_buttons_yes">نعم</string>
+<resources><string name="shared_string_no">ليس</string>
+    <string name="shared_string_yes">نعم</string>
     <string name="osmand_app_not_found">لم يتم تثبيت OsmAnd</string>
     <string name="app_name">وقوف السيارات</string>
     <string name="parking_plugin_installed">يتم تثبيت البرنامج المساعد OsmAnd وقوف السيارات وتمكينها في إعدادات OsmAnd</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml
index ddcf9bceee..34ae26de09 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">Так</string>
-    <string name="default_buttons_no">Не</string>
+<resources><string name="shared_string_yes">Так</string>
+    <string name="shared_string_no">Не</string>
     <string name="osmand_app_not_found">OsmAnd не ўсталяваны</string>
     <string name="app_name">Модуль Паркоўкі OsmAnd</string>
     <string name="parking_plugin_installed">Модуль Паркоўкі OsmAnd ўсталяваны і ўключаны ў наладах OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml
index 5fa60b0f21..1141210947 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-bg/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">Не</string>
-    <string name="default_buttons_yes">Да</string>
+    <string name="shared_string_no">Не</string>
+    <string name="shared_string_yes">Да</string>
     <string name="osmand_app_not_found">Приложението OsmAnd не е инсталирано</string>
     <string name="app_name">Добавка Parking за OsmAnd</string>
     <string name="parking_plugin_installed">Добавката Parking е инсталирана и включена в настройките на OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml
index 9a7ad48ac9..64e7d0d8e2 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-bs/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Da</string>
+    <string name="shared_string_no">Ne</string>
+    <string name="shared_string_yes">Da</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml
index 589612632c..f661e47954 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">Sí</string>
-<string name="default_buttons_no">No</string>
+<resources><string name="shared_string_yes">Sí</string>
+<string name="shared_string_no">No</string>
 <string name="osmand_app_not_found">L\'OsmAnd no està instal·lat</string>
 <string name="app_name">OsmAnd Aparcament</string>
 <string name="parking_plugin_installed">El connector OsmAnd Aparcament està instal·lat i activat a la configuració de l\'OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml
index 883bce9a9b..835f2af433 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-cs/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Ano</string>
+    <string name="shared_string_no">Ne</string>
+    <string name="shared_string_yes">Ano</string>
     <string name="osmand_app_not_found">OsmAnd není nainstalován</string>
     <string name="app_name">OsmAnd parkování</string>
     <string name="parking_plugin_installed">OsmAnd modul parkování je nainstalován a aktivován v nastavení OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml
index a92883c498..63348f21cc 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Nej</string>
-    <string name="default_buttons_yes">Ja</string>
+<resources><string name="shared_string_no">Nej</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd er ikke installeret</string>
     <string name="app_name">OsmAnd parkering</string>
     <string name="parking_plugin_installed">OsmAnd udvidelsen Parkering er installeret og aktiveret i OsmAnd indstillinger.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml
index 58c6915252..aad91a45ab 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Nein</string>
-    <string name="default_buttons_yes">Ja</string>
+<resources><string name="shared_string_no">Nein</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd ist nicht installiert</string>
     <string name="app_name">OsmAnd Parkplatz-Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parkplatz-Plugin wurde installiert und in den OsmAnd-Einstellungen aktiviert.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml
index 226971b771..06a453fb89 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Όχι</string>
-    <string name="default_buttons_yes">Ναι</string>
+<resources><string name="shared_string_no">Όχι</string>
+    <string name="shared_string_yes">Ναι</string>
     <string name="osmand_app_not_found">Το OsmAnd δεν είναι εγκατεστημένο</string>
     <string name="app_name">Στάθμευση OsmAnd</string>
     <string name="parking_plugin_installed">Το πρόσθετο Στάθμευση OsmAnd είναι εγκατεστημένο και ενεργοποιημένο στις ρυθμίσεις του OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml
index 98bf22ee28..afc8d117a3 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Sí</string>
+<resources><string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Sí</string>
     <string name="osmand_app_not_found">OsmAnd no está instalado</string>
     <string name="app_name">Aparcamiento de OsmAnd</string>
     <string name="parking_plugin_installed">El Plugin Aparcamiento de OsmAnd está instalado y activado en la configuración de OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml
index e2d524ffe4..93bc6288e4 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Ei</string>
-    <string name="default_buttons_yes">Jah</string>
+<resources><string name="shared_string_no">Ei</string>
+    <string name="shared_string_yes">Jah</string>
     <string name="osmand_app_not_found">OsmAnd ei ole paigaldatud</string>
     <string name="app_name">OsmAnd Parkimine</string>
     <string name="parking_plugin_installed">OsmAnd Parkimine on paigaldatud ja aktiveeritud OsmAnd seadetes.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml
index a754e2c8c1..39528867f9 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Ez</string>
-    <string name="default_buttons_yes">Bai</string>
+<resources><string name="shared_string_no">Ez</string>
+    <string name="shared_string_yes">Bai</string>
     <string name="osmand_app_not_found">OsmAnd ez dago instalatuta</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin instalatuta eta aktibatuta dago OsmAnd-en konfigurazioan.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml
index bb19b23625..48ac518a12 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">بله</string>
-    <string name="default_buttons_no">خیر</string>
+<resources><string name="shared_string_yes">بله</string>
+    <string name="shared_string_no">خیر</string>
     <string name="osmand_app_not_found">OsmAnd نصب نشده است</string>
     <string name="app_name">پارکینگ OsmAnd</string>
     <string name="parking_plugin_installed">افزونه پارکینگ OsmAnd نصب شده و در تنظیمات OsmAnd فعال شده است.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml
index d124d59015..a4b4960cd1 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-fi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_no">Ei</string>
-    <string name="default_buttons_yes">Kyllä</string>
+<string name="shared_string_no">Ei</string>
+    <string name="shared_string_yes">Kyllä</string>
     <string name="osmand_app_not_found">OsmAnd ei ole asennettu</string>
     <string name="app_name">OsmAnd Parking</string>
     <string name="parking_plugin_installed">OsmAnd Parking lisäosa on asennettu ja aktivoitu OsmAnd:in asetuksista.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml
index 3bc15e4383..8f6298f123 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Non</string>
-    <string name="default_buttons_yes">Oui</string>
+<resources><string name="shared_string_no">Non</string>
+    <string name="shared_string_yes">Oui</string>
     <string name="osmand_app_not_found">OsmAnd n\'est pas installé</string>
     <string name="app_name">Greffon Parking pour OsmAnd</string>
     <string name="parking_plugin_installed">Le greffon Parking est installé et activé dans les paramètres de OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml
index eb0a0b4147..f4caa15c2b 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Non</string>
-    <string name="default_buttons_yes">Si</string>
+<resources><string name="shared_string_no">Non</string>
+    <string name="shared_string_yes">Si</string>
     <string name="osmand_app_not_found">OsmAnd non está instalado</string>
     <string name="app_name">Aparcar co OsmAnd</string>
     <string name="parking_plugin_installed">O engadido Aparcar co OsmAnd está instalado e xa foi activado na configuración do OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml
index 5162b53939..99afcdabc3 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-he/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_no">לא</string>
-    <string name="default_buttons_yes">כן</string>
+<string name="shared_string_no">לא</string>
+    <string name="shared_string_yes">כן</string>
     <string name="osmand_app_not_found">התכנית OsmAnd אינה מותקנת</string>
     <string name="app_name">חנייה עם OsmAnd</string>
     <string name="parking_plugin_installed">תוסף החנייה של OsmAnd מותקן ומופעל בהגדרות של OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml
index b9f9455f52..7eb89bdc54 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="default_buttons_no">नही</string>
-    <string name="default_buttons_yes">हा</string>
+    <string name="shared_string_no">नही</string>
+    <string name="shared_string_yes">हा</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">ओएसएमएएनडी पार्किंग प्लगिन</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml
index eac16b7083..f36f3ff342 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Da</string>
+<string name="shared_string_no">Ne</string>
+    <string name="shared_string_yes">Da</string>
     <string name="osmand_app_not_found">OsmAnd nije instaliran</string>
     <string name="app_name">OsmAnd Parkiralište</string>
     <string name="parking_plugin_installed">OsmAnd dodatak za parkirališta je instaliran i omogućen u OsmAnd postavkama.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml
index 0cf8f2d229..a3c3af4515 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hu/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">Nem</string>
-    <string name="default_buttons_yes">Igen</string>
+    <string name="shared_string_no">Nem</string>
+    <string name="shared_string_yes">Igen</string>
     <string name="osmand_app_not_found">Az OsmAnd nincs feltelepítve</string>
     <string name="app_name">OsmAnd Parkolás</string>
     <string name="parking_plugin_installed">OsmAnd Parkolási Bővítmény feltelepítve és engedélyezve az OsmAnd beállításaiban.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml
index b1e23297f0..a519ae8603 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-hy/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="default_buttons_no">Ոչ</string>
-    <string name="default_buttons_yes">Այո</string>
+    <string name="shared_string_no">Ոչ</string>
+    <string name="shared_string_yes">Այո</string>
     <string name="osmand_app_not_found">OsmAnd - ը չի տեղադրված</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugiն - ը տեղադրված է և ակտիվացված է OsmAnd-ի կարգավորումներում.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml
index 4b839728f1..fc1c4f5b65 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-id/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml
index 54da317695..87b4c7f61c 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Si</string>
+<resources><string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Si</string>
     <string name="osmand_app_not_found">OsmAnd non è installato</string>
     <string name="app_name">OsmAnd Parking</string>
     <string name="parking_plugin_installed">Il Plugin Parcheggio per OsmAnd è installato e abilitato nelle impostazioni di OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml
index 5922c6dff3..9877ab80f2 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">いいえ</string>
-    <string name="default_buttons_yes">はい</string>
+<resources><string name="shared_string_no">いいえ</string>
+    <string name="shared_string_yes">はい</string>
     <string name="osmand_app_not_found">OsmAndがインストールされていません</string>
     <string name="app_name">OsmAnd駐車場</string>
     <string name="parking_plugin_installed">OsmAnd駐車場プラグインはインストールされており、設定は有効です。</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml
index 8addea2bbb..f46bfefe65 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ka/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">არა</string>
-    <string name="default_buttons_yes">დიახ</string>
+    <string name="shared_string_no">არა</string>
+    <string name="shared_string_yes">დიახ</string>
     <string name="osmand_app_not_found">OsmAnd ჩადგმული არაა</string>
     <string name="app_name">OsmAnd პარკინგი</string>
     <string name="parking_plugin_installed">OsmAnd-ის პარკინგის დამატება ჩადგმულია და ჩართულია პარამეტრებში.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml
index 6a47113e9b..06e09dfa9d 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">아니오</string>
-    <string name="default_buttons_yes">예</string>
+<resources><string name="shared_string_no">아니오</string>
+    <string name="shared_string_yes">예</string>
     <string name="osmand_app_not_found">OsmAnd는 설치되어 있지 않습니다.</string>
     <string name="app_name">OsmAnd 주차장</string>
     <string name="parking_plugin_installed">OsmAnd 주차 플러그인은 OsmAnd 설정에서 설치되고 활성화 되었습니다.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml
index a6e9e3ebad..59025f9e82 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Ne</string>
-    <string name="default_buttons_yes">Taip</string>
+<resources><string name="shared_string_no">Ne</string>
+    <string name="shared_string_yes">Taip</string>
     <string name="osmand_app_not_found">OsmAnd programa neįdiegta</string>
     <string name="app_name">OsmAnd parkavimo įskiepis</string>
     <string name="parking_plugin_installed">OsmAnd Parkavimo įskiepis įdiegiamas ir aktyvuojamas OsmAnd nustatymuose.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml
index e19efe8800..f6902ff8a4 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-lv/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">Nē</string>
-    <string name="default_buttons_yes">Jā</string>
+    <string name="shared_string_no">Nē</string>
+    <string name="shared_string_yes">Jā</string>
     <string name="osmand_app_not_found">OsmAnd nav instalēts</string>
     <string name="app_name">OsmAnd Parkošanās</string>
     <string name="parking_plugin_installed">OsmAnd parkošanās spraudnis ir instalēts un iespējots OsmAnd uzstādījumos.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml
index 9adb8b27be..de8f3ed601 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-mr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">नाही</string>
-    <string name="default_buttons_yes">हो</string>
+    <string name="shared_string_no">नाही</string>
+    <string name="shared_string_yes">हो</string>
     <string name="osmand_app_not_found">ओएसएमएएनडि इन्स्टॉल केलेले नाही</string>
     <string name="app_name">ओएसएमएएनडि पार्किंग</string>
     <string name="parking_plugin_installed">ओएसएमएएनडि पार्किंग प्लगिन इन्स्टॉल आणि चालू केले आहे.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
index fd7e092f97..1ff0342811 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">Ja</string>
-    <string name="default_buttons_no">Nei</string>
+<resources><string name="shared_string_yes">Ja</string>
+    <string name="shared_string_no">Nei</string>
     <string name="osmand_app_not_found">OsmAnd er ikke installert</string>
     <string name="app_name">OsmAnd-Parkering</string>
     <string name="parking_plugin_installed">Programtillegget OsmAnd-Parkering er installert og aktivert i innstillingene for OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml
index b9f9998bd7..0272cbf421 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Nee</string>
-    <string name="default_buttons_yes">Ja</string>
+<resources><string name="shared_string_no">Nee</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd is niet geïnstalleerd</string>
     <string name="app_name">OsmAnd parkeerplugin</string>
     <string name="parking_plugin_installed">OsmAnd parkeerplugin is geïnstalleerd en geactiveerd in de OsmAnd-instellingen.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml
index b4817b3311..056adf8a23 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Nie</string>
-    <string name="default_buttons_yes">Tak</string>
+<resources><string name="shared_string_no">Nie</string>
+    <string name="shared_string_yes">Tak</string>
     <string name="osmand_app_not_found">Osmand nie jest zainstalowany</string>
     <string name="app_name">Wtyczka parkowania dla OsmAnd</string>
     <string name="parking_plugin_installed">Wtyczka parkowania jest zainstalowana i włączona w ustawieniach OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml
index 88ba9b8271..f1fc25ef26 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Não</string>
-    <string name="default_buttons_yes">Sim</string>
+<resources><string name="shared_string_no">Não</string>
+    <string name="shared_string_yes">Sim</string>
     <string name="osmand_app_not_found">Osmand não está instalado</string>
     <string name="app_name">OsmAnd Parking Plugin</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin está instalado e activado nas opções OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
index 070f2fe0c6..5db7014b07 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Nu</string>
-    <string name="default_buttons_yes">Da</string>
+<resources><string name="shared_string_no">Nu</string>
+    <string name="shared_string_yes">Da</string>
     <string name="osmand_app_not_found">OsmAnd nu este instalat</string>
     <string name="app_name">Parcare OsmAnd</string>
     <string name="parking_plugin_installed">Plugin-ul OsmAnd Parking este instalat și activat în setările OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml
index 48defb5730..01101af468 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="default_buttons_no">Нет</string>
-    <string name="default_buttons_yes">Да</string>
+    <string name="shared_string_no">Нет</string>
+    <string name="shared_string_yes">Да</string>
     <string name="osmand_app_not_found">OsmAnd не установлен</string>
     <string name="app_name">Плагин парковки OsmAnd</string>
     <string name="parking_plugin_installed">Плагин парковки установлен и включен в настройках OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml
index d79b4f46ec..fe8742b976 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sc/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Nono</string>
-    <string name="default_buttons_yes">Eja</string>
+<resources><string name="shared_string_no">Nono</string>
+    <string name="shared_string_yes">Eja</string>
     <string name="osmand_app_not_found">OsmAnd no est installau</string>
     <string name="app_name">OsmAnd Parchezu</string>
     <string name="parking_plugin_installed">OsmAnd Parchezu est installau e insertau in sas impostaduras de OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml
index c58aadf41c..4546cd30ff 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sk/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">Nie</string>
-    <string name="default_buttons_yes">Áno</string>
+    <string name="shared_string_no">Nie</string>
+    <string name="shared_string_yes">Áno</string>
     <string name="osmand_app_not_found">Aplikácia OsmAnd nie je nainštalovaná</string>
     <string name="app_name">OsmAnd parkovanie</string>
     <string name="parking_plugin_installed">Parkovací zásuvný modul pre OsmAnd je nainštalovaný a povolený v nastaveniach aplikácie OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml
index 4ab7d814c0..078c1f4afa 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_yes">Da</string>
-    <string name="default_buttons_no">Ne</string>
+<string name="shared_string_yes">Da</string>
+    <string name="shared_string_no">Ne</string>
     <string name="osmand_app_not_found">OsmAnd ni nameščen</string>
     <string name="app_name">OsmAnd parkiranje</string>
     <string name="parking_plugin_installed">Vtičnik OsmAnd parkiranje je nameščen in omogočen v OsmAnd nastavitvah.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml
index cf74a7a346..860563f679 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Jo</string>
-    <string name="default_buttons_yes">Po</string>
+<resources><string name="shared_string_no">Jo</string>
+    <string name="shared_string_yes">Po</string>
     <string name="osmand_app_not_found">OsmAnd nuk është instaluar</string>
     <string name="app_name">OsmAnd Parkim</string>
     <string name="parking_plugin_installed">Plugini OsmAnd Parkim është instaluar dhe aktivizuar në OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml
index 16d3e4095a..acfee7145c 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-sv/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_no">Nej</string>
-    <string name="default_buttons_yes">Ja</string>
+<string name="shared_string_no">Nej</string>
+    <string name="shared_string_yes">Ja</string>
     <string name="osmand_app_not_found">OsmAnd är inte installerad</string>
     <string name="app_name">OsmAnd - parkering</string>
     <string name="parking_plugin_installed">OsmAnd-pluginen Parkering är installerad och aktiverad i inställningarna för OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml
index 01b39afda6..84a2456157 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-tr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-<string name="default_buttons_yes">Evet</string>
-    <string name="default_buttons_no">Hayır</string>
+<string name="shared_string_yes">Evet</string>
+    <string name="shared_string_no">Hayır</string>
     </resources>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml
index 79037bb19a..c683edb1a8 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">Ні</string>
-    <string name="default_buttons_yes">Так</string>
+<resources><string name="shared_string_no">Ні</string>
+    <string name="shared_string_yes">Так</string>
     <string name="osmand_app_not_found">Osmand не встановлено</string>
     <string name="app_name">Паркування OsmAnd</string>
     <string name="parking_plugin_installed">Плагін Паркування OsmAnd встановлено та увімкнено у налаштуваннях OsmAnd.</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml
index 27ec4583d1..d50424dab5 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_yes">是</string>
-    <string name="default_buttons_no">没有</string>
+<resources><string name="shared_string_yes">是</string>
+    <string name="shared_string_no">没有</string>
     <string name="osmand_app_not_found">OsmAnd 未安装</string>
     <string name="app_name">OsmAnd 停车场</string>
     <string name="parking_plugin_installed">OsmAnd 停车场插件已安装，并已在 OsmAnd 设置中启用。</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml
index fddffb4952..8355d0f1ad 100644
--- a/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="default_buttons_no">否</string>
-    <string name="default_buttons_yes">是</string>
+<resources><string name="shared_string_no">否</string>
+    <string name="shared_string_yes">是</string>
     <string name="osmand_app_not_found">OsmAnd 並未安裝</string>
     <string name="parking_plugin_installed">OsmAnd 停車場外掛元件已安裝，並且已在 OsmAnd 設定裡啟用。</string>
 <string name="app_name">OsmAnd 停車場</string>
diff --git a/plugins/Osmand-ParkingPlugin/res/values/strings.xml b/plugins/Osmand-ParkingPlugin/res/values/strings.xml
index 1b12c9740e..f194a9f7c2 100644
--- a/plugins/Osmand-ParkingPlugin/res/values/strings.xml
+++ b/plugins/Osmand-ParkingPlugin/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Parking</string>
     <string name="parking_plugin_installed">OsmAnd Parking Plugin is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
index 2eccccfe78..287c120ead 100644
--- a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
+++ b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
@@ -40,7 +40,7 @@ public class ParkingPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
@@ -51,7 +51,7 @@ public class ParkingPluginActivity extends Activity {
 						}
 					}
 				});
-				builder.setNegativeButton(getString(R.string.default_buttons_no), null);
+				builder.setNegativeButton(getString(R.string.shared_string_no), null);
 				builder.show();
 			}
 		}
diff --git a/plugins/Osmand-SRTMPlugin/res/values/strings.xml b/plugins/Osmand-SRTMPlugin/res/values/strings.xml
index 9ee60d3b8e..f65a8afcb6 100644
--- a/plugins/Osmand-SRTMPlugin/res/values/strings.xml
+++ b/plugins/Osmand-SRTMPlugin/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">OsmAnd Contour lines</string>
     <string name="app_label">OsmAnd Contour lines</string>
diff --git a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
index 2ec9462629..46a680781e 100644
--- a/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
+++ b/plugins/Osmand-SRTMPlugin/src/net/osmand/srtmPlugin/SRTMPluginActivity.java
@@ -41,7 +41,7 @@ public class SRTMPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
@@ -52,7 +52,7 @@ public class SRTMPluginActivity extends Activity {
 						}
 					}
 				});
-				builder.setNegativeButton(getString(R.string.default_buttons_no), null);
+				builder.setNegativeButton(getString(R.string.shared_string_no), null);
 				builder.show();
 			}
 		}
diff --git a/plugins/Osmand-Sherpafy/res/values/strings.xml b/plugins/Osmand-Sherpafy/res/values/strings.xml
index 5e29d65327..5cac6def46 100644
--- a/plugins/Osmand-Sherpafy/res/values/strings.xml
+++ b/plugins/Osmand-Sherpafy/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_buttons_no">No</string>
-    <string name="default_buttons_yes">Yes</string>
+    <string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Yes</string>
     <string name="osmand_app_not_found">OsmAnd is not installed</string>
     <string name="app_name">Sherpafy</string>
     <string name="parking_plugin_installed">OsmAnd Sherpafy is installed and enabled in OsmAnd settings.</string>
diff --git a/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java b/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
index a4577210b3..c2773ea6dd 100644
--- a/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
+++ b/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
@@ -43,7 +43,7 @@ public class SherpafyPluginActivity extends Activity {
 			} else {
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setMessage(getString(R.string.osmand_app_not_found));
-				builder.setPositiveButton(getString(R.string.default_buttons_yes), new DialogInterface.OnClickListener() {
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
@@ -54,7 +54,7 @@ public class SherpafyPluginActivity extends Activity {
 						}
 					}
 				});
-				builder.setNegativeButton(getString(R.string.default_buttons_no), null);
+				builder.setNegativeButton(getString(R.string.shared_string_no), null);
 				builder.show();
 			}
 		}