Sort shared preferences in correct categories

res/values-es/strings.xml

@@ -198,6 +198,7 @@
     <string name="pref_apk_install">Application install</string>
     <string name="pref_performance">Rendimiento</string>
     <string name="pref_general">General</string>
+    <string name="pref_general2">General</string>
     <string name="pref_sim_global">Global</string>
     <string name="pref_sim_remote">Remoto</string>
     <string name="pref_sim_local">Local</string>

res/values-fr/strings.xml

@@ -199,6 +199,7 @@
     <string name="pref_apk_install">Application install</string>
     <string name="pref_performance">Performance</string>
     <string name="pref_general">Général</string>
+    <string name="pref_general2">Général</string>
     <string name="pref_sim_global">Global</string>
     <string name="pref_sim_remote">Éloigné</string><!-- Check -->
     <string name="pref_sim_local">Locale</string>

res/values/keys.xml

@@ -28,6 +28,7 @@
     <string name="pref_key_sim_local">pref_key_sim_local</string>
 	<string name="pref_key_performance">pref_key_performance</string>
     <string name="pref_key_general">pref_key_general</string>
+    <string name="pref_key_general2">pref_key_general2</string>
     <string name="pref_key_axis">pref_key_axis</string>
     <string name="pref_key_spacecraft">pref_key_spacecraft</string>
     <string name="pref_key_sun">pref_key_sun</string>

res/values/strings.xml

@@ -198,6 +198,7 @@
     <string name="pref_apk_install">Application install</string>
     <string name="pref_performance">Performance</string>
     <string name="pref_general">General</string>
+    <string name="pref_general2">General</string>
     <string name="pref_sim_global">Global</string>
     <string name="pref_sim_remote">Remote</string>
     <string name="pref_sim_local">Local</string>

res/xml/models.xml

 <PreferenceScreen 
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="@string/pref_screen_models">
+    <PreferenceCategory 
+    android:title="@string/pref_general2"
+    android:key="@string/pref_key_general2">
+        <CheckBoxPreference
+            android:key="@string/pref_key_show_sphere"
+            android:summary="@string/pref_summary_show_sphere"
+            android:title="@string/pref_title_show_sphere"
+            android:defaultValue="true" />
+        <CheckBoxPreference
+            android:key="@string/pref_key_show_mini_spheres"
+            android:summary="@string/pref_summary_show_mini_spheres"
+            android:title="@string/pref_title_show_mini_spheres"
+            android:defaultValue="true" />
+        <CheckBoxPreference
+            android:key="@string/pref_key_show_circles"
+            android:summary="@string/pref_summary_show_circles"
+            android:title="@string/pref_title_show_circles"
+            android:defaultValue="true" />
+        <!-- <CheckBoxPreference
+            android:key="@string/pref_key_show_planes"
+            android:summary="@string/pref_summary_show_planes"
+            android:title="@string/pref_title_show_planes"
+            android:defaultValue="true" /> -->
+    </PreferenceCategory>
     <PreferenceCategory 
         android:title="@string/pref_spacecraft"
         android:key="@string/pref_key_spacecraft">

res/xml/preferences.xml

@@ -35,26 +35,6 @@
             android:summary="@string/pref_summary_show_sky"
             android:title="@string/pref_title_show_sky"
             android:defaultValue="true" />
-        <CheckBoxPreference
-            android:key="@string/pref_key_show_sphere"
-            android:summary="@string/pref_summary_show_sphere"
-            android:title="@string/pref_title_show_sphere"
-            android:defaultValue="true" />
-        <CheckBoxPreference
-            android:key="@string/pref_key_show_mini_spheres"
-            android:summary="@string/pref_summary_show_mini_spheres"
-            android:title="@string/pref_title_show_mini_spheres"
-            android:defaultValue="true" />
-        <CheckBoxPreference
-            android:key="@string/pref_key_show_circles"
-            android:summary="@string/pref_summary_show_circles"
-            android:title="@string/pref_title_show_circles"
-            android:defaultValue="true" />
-        <!-- <CheckBoxPreference
-            android:key="@string/pref_key_show_planes"
-            android:summary="@string/pref_summary_show_planes"
-            android:title="@string/pref_title_show_planes"
-            android:defaultValue="true" /> -->
     </PreferenceCategory>
     <PreferenceCategory 
         android:title="@string/pref_axis"