Make a general category, move notification settings back inline.

res/values/strings.xml

@@ -355,7 +355,7 @@
     <string name="AndroidManifest__verify_imported_identity">Verify Imported Identity</string>
         
     <!-- preferences.xml -->
-    
+    <string name="preferences__general">General</string>
     <string name="preferences__use_settings">Use Settings</string>
     <string name="preferences__pref_all_sms_title">Use for all SMS</string>
     <string name="preferences__pref_all_mms_title">Use for all MMS</string> 
@@ -500,8 +500,6 @@
     <string name="verify_keys__menu_verified">Verified</string>
 
     <!-- Misc. piggybacking -->
-    <string name="PlayStoreListing">TextSecure is a security enhanced text messaging application that serves as a full replacement for the default text messaging application.  Messages to other TextSecure users are encrypted over the air, and all text messages are stored in an encrypted database on the device. If your phone is lost or stolen, your messages will be safe, and communication with other TextSecure users can\'t be monitored over the air.</string>
-    
     <!-- EOF -->
     
 </resources>

res/xml/preferences.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/preferences__general">
         <CheckBoxPreference android:defaultValue="true"
                           android:key="pref_all_sms"
                           android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages"
@@ -20,8 +21,8 @@
                           android:key="pref_enter_sends"
                           android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
                           android:title="@string/preferences__pref_enter_sends_title" />
-
+    </PreferenceCategory>
-  <PreferenceScreen android:title="@string/preferences__notifications">
+    <PreferenceCategory android:title="@string/preferences__notifications">
         <CheckBoxPreference android:key="pref_key_enable_notifications"
                             android:title="@string/preferences__notifications"
                             android:summary="@string/preferences__display_message_notifications_in_status_bar"
@@ -59,7 +60,7 @@
                             android:defaultValue="true"
                             android:title="@string/preferences__vibrate"
                             android:summary="@string/preferences__also_vibrate_when_notified" />
-  </PreferenceScreen>
+  </PreferenceCategory>
 
   <PreferenceCategory android:title="@string/preferences__storage">
     <CheckBoxPreference android:defaultValue="false"