adjust main menu order

OsmAnd/res/values/strings.xml

@@ -865,7 +865,7 @@
     <string name="favourites_activity">Favorites</string>
     <string name="add_to_favourite">Add to Favorites</string>
     <string name="use_english_names_descr">Select between native and English names</string>
-    <string name="use_english_names">Use English names</string>
+    <string name="use_english_names">Use English names in maps</string>
     <string name="app_settings">Application settings</string>
     <string name="search_address">Search address</string>
     <string name="choose_building">Choose building</string>

OsmAnd/res/xml/settings_pref.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 	<Preference android:title="@string/index_settings" android:key="local_indexes" android:summary="@string/index_settings_descr"></Preference>
+
 	<PreferenceCategory android:title="@string/profile_settings" android:key="profile_dep_cat">
 		<ListPreference android:summary="@string/settings_preset_descr" android:title="@string/settings_preset" android:key="application_mode"></ListPreference>
+
 		<PreferenceScreen android:key="appearance_settings" android:title="@string/map_settings" android:summary="@string/map_settings_descr">
 			<ListPreference android:key="rotate_map" android:title="@string/rotate_map_to_bearing" android:summary="@string/rotate_map_to_bearing_descr"></ListPreference>
 			<ListPreference android:key="daynight_mode" android:title="@string/daynight" android:summary="@string/daynight_descr"></ListPreference>
 			<CheckBoxPreference android:key="show_view_angle" android:title="@string/show_view_angle" android:summary="@string/show_view_angle_descr"></CheckBoxPreference>
 			<CheckBoxPreference android:title="@string/auto_zoom_map" android:summary="@string/auto_zoom_map_descr" android:key="auto_zoom_map"></CheckBoxPreference>
-		<CheckBoxPreference android:summary="@string/use_english_names_descr" android:title="@string/use_english_names"
-			android:key="use_english_names"></CheckBoxPreference>
 			<CheckBoxPreference android:key="show_altitude_info" android:title="@string/show_altitude_info" android:summary="@string/show_altitude_info_descr"/>
+
 			<PreferenceCategory android:title="@string/pref_vector_map">
 				<ListPreference android:key="renderer" android:title="@string/renderers" android:summary="@string/renderers_descr"></ListPreference>
 				<ListPreference android:key="map_text_size" android:title="@string/map_text_size" android:summary="@string/map_text_size_descr"/>
@@ -27,28 +28,30 @@
 			<!-- try without AUTO_FOLLOW_ROUTE_NAV (see forum discussion 'Simplify our navigation preference menu')
 			<CheckBoxPreference android:summary="@string/auto_follow_route_navigation_descr" android:title="@string/auto_follow_route_navigation"
 				android:key="auto_follow_route_navigation"></CheckBoxPreference>
-		<CheckBoxPreference android:summary="@string/use_osmand_routing_service_descr" android:title="@string/use_osmand_routing_service"
-			android:key="use_osmand_routing_service"></CheckBoxPreference>
 			-->
-			
 			<CheckBoxPreference android:summary="@string/left_side_navigation_descr" android:title="@string/left_side_navigation"
 				android:key="left_side_navigation"></CheckBoxPreference>	
+			<!-- CheckBoxPreference android:summary="@string/use_osmand_routing_service_descr" android:title="@string/use_osmand_routing_service"
+				android:key="use_osmand_routing_service"></CheckBoxPreference -->
 		</PreferenceScreen>
-</PreferenceCategory>
+	</PreferenceCategory>
 
-
+	<PreferenceCategory android:title="@string/global_settings" android:key="global_settings" >
-<PreferenceCategory android:title="@string/global_settings" android:key="global_settings" >
 		<PreferenceScreen android:key="general_settings" android:title="@string/general_settings" android:summary="@string/general_settings_descr">
 			<PreferenceCategory android:title="@string/global_app_settings">
 				<ListPreference android:key="map_screen_orientation" android:title="@string/map_screen_orientation" android:summary="@string/map_screen_orientation_descr"></ListPreference>
 				<ListPreference android:key="preferred_locale" android:title="@string/preferred_locale" android:summary="@string/preferred_locale_descr"></ListPreference>
+				<CheckBoxPreference android:summary="@string/use_english_names_descr" android:title="@string/use_english_names"
+					android:key="use_english_names"></CheckBoxPreference>
 				<ListPreference android:key="default_metric_system" android:title="@string/unit_of_length" android:summary="@string/unit_of_length_descr"></ListPreference>
 				<CheckBoxPreference android:key="native_rendering" android:title="@string/native_rendering" android:summary="@string/vector_maps_may_display_faster_on_some_devices"></CheckBoxPreference>
 				<EditTextPreference android:title="@string/application_dir" android:key="external_storage_dir"></EditTextPreference>
 			</PreferenceCategory>
 		</PreferenceScreen>
+
 		<Preference android:title="@string/prefs_plugins" android:summary="@string/prefs_plugins_descr" android:key="plugins"/>
-</PreferenceCategory>
+	</PreferenceCategory>
-<Preference android:title="@string/support_new_features" android:key="bidforfix"/>
+
+	<Preference android:title="@string/support_new_features" android:key="bidforfix"/>
 
 </PreferenceScreen>