Rewording of some categories of Preferences, avoid "General" as a title and...

Rewording of some categories of Preferences, avoid "General" as a title and using "VLC", every other two lines...

include/vlc_config_cat.h

@@ -33,13 +33,11 @@
 #define MAIN_HELP N_( \
     "Select \"Advanced Options\" to see all options." )
 
-#define GENERAL_TITLE N_("General")
-
 /* Interface */
 #define INTF_TITLE N_("Interface")
 #define INTF_HELP  N_( "Settings for VLC's interfaces" )
 
-#define INTF_GENERAL_HELP N_( "General interface settings" )
+#define INTF_GENERAL_HELP N_( "Main interfaces settings" )
 
 #define INTF_MAIN_TITLE  N_( "Main interfaces" )
 #define INTF_MAIN_HELP N_( "Settings for the main interface" )
@@ -54,19 +52,16 @@
 #define AUDIO_TITLE N_( "Audio" )
 #define AUDIO_HELP N_( "Audio settings" )
 
-#define AUDIO_GENERAL_TITLE N_( "General audio settings" )
 #define AUDIO_GENERAL_HELP N_("General audio settings")
 
 #define AFILTER_TITLE N_("Filters")
-#define AFILTER_HELP N_( \
-    "Audio filters are used to postprocess the audio stream." )
+#define AFILTER_HELP N_( "Audio filters are used to process the audio stream." )
 
 #define AVISUAL_TITLE N_("Visualizations")
-#define AVISUAL_HELP N_( \
-    "Audio visualizations" )
+#define AVISUAL_HELP N_( "Audio visualizations" )
 
 #define AOUT_TITLE N_( "Output modules" )
-#define AOUT_HELP N_("These are general settings for audio output modules.")
+#define AOUT_HELP N_("General settings for audio output modules.")
 
 #define AMISC_TITLE N_("Miscellaneous")
 #define AMISC_HELP N_( "Miscellaneous audio settings and modules." )
@@ -75,7 +70,6 @@
 #define VIDEO_TITLE N_("Video")
 #define VIDEO_HELP N_("Video settings")
 
-#define VIDEO_GENERAL_TITLE N_( "General video settings")
 #define VIDEO_GENERAL_HELP N_( "General video settings" )
 
 #define _VOUT_TITLE N_("Output modules" )
@@ -84,11 +78,11 @@
 
 #define VFILTER_TITLE N_("Filters" )
 #define VFILTER_HELP N_( \
-    "Video filters are used to postprocess the video stream." )
+    "Video filters are used to process the video stream." )
 
 #define SUBPIC_TITLE N_( "Subtitles/OSD")
-#define SUBPIC_HELP N_( "Miscellaneous settings related to On-Screen-Display,"\
-        " subtitles and \"overlay subpictures\".")
+#define SUBPIC_HELP N_( "Settings related to On-Screen-Display,"\
+        " subtitles and \"overlay subpictures\"")
 /*
 #define TEXT_TITLE N_("Text rendering")
 #define TEXT_HELP N_( \
@@ -97,20 +91,19 @@
 */
 /* Input */
 #define INPUT_TITLE N_( "Input / Codecs" )
-#define INPUT_HELP N_( "These are the settings for the input, demultiplexing " \
-         "and decoding parts of VLC. Encoder settings can also be found here." )
+#define INPUT_HELP N_( "Settings for input, demultiplexing, " \
+         "decoding and encoding")
 
 #define ACCESS_TITLE N_( "Access modules" )
 #define ACCESS_HELP N_( \
-    "Settings related to the various access methods used by VLC. " \
+    "Settings related to the various access methods. " \
     "Common settings you may want to alter are HTTP proxy or " \
     "caching settings." )
 
 #define STREAM_FILTER_TITLE N_( "Stream filters" )
 #define STREAM_FILTER_HELP N_( \
     "Stream filters are special modules that allow advanced operations on " \
-    "the input side of VLC. You should not touch anything here unless you " \
-    "know what you are doing." )
+    "the input side of VLC. Use with care..." )
 
 #define DEMUX_TITLE N_("Demuxers")
 #define DEMUX_HELP N_( "Demuxers are used to separate audio and video streams." )
@@ -124,14 +117,14 @@
 #define SDEC_TITLE N_( "Other codecs")
 #define SDEC_HELP N_( "Settings for audio+video and miscellaneous decoders and encoders." )
 
-#define ADVANCED_TITLE N_("General")
-#define ADVANCED_HELP N_( "General input settings. Use with care." )
+#define ADVANCED_TITLE N_("General Input" )
+#define ADVANCED_HELP N_( "General input settings. Use with care..." )
 
 /* Sout */
 #define SOUT_TITLE N_( "Stream output" )
 #define SOUT_HELP N_( \
-      "Stream output is what allows VLC to act as a streaming server " \
-      "or to save incoming streams.\n" \
+      "Stream output settings are used when acting as a streaming server " \
+      "or when saving incoming streams.\n" \
       "Streams are first muxed and then sent through an \"access output\" "\
       "module that can either save the stream to a file, or stream " \
       "it (UDP, HTTP, RTP/RTSP).\n" \
@@ -191,21 +184,21 @@
 
 /* Advanced */
 #define AADVANCED_TITLE N_( "Advanced" )
-#define AADVANCED_HELP N_( "Advanced settings. Use with care.")
+#define AADVANCED_HELP N_( "Advanced settings. Use with care...")
 
 #define CPU_TITLE N_( "CPU features" )
 #define CPU_HELP N_( "You can choose to disable some CPU accelerations " \
-        "here. You should probably not change these settings." )
+        "here. Use with extreme care!" )
 
 #define MISC_TITLE N_( "Advanced settings" )
-#define MISC_HELP N_( "Other advanced settings")
 
+
+/* OLD */
+#if 0
 #define NETWORK_TITLE N_( "Network" )
 #define NETWORK_HELP N_( "These modules provide network functions to all " \
                 "other parts of VLC." )
 
-/* OLD */
-
 #define CHROMA_TITLE N_("Chroma modules settings")
 #define CHROMA_HELP N_("These settings affect chroma transformation modules.")
 
@@ -233,32 +226,33 @@
 
 #define UNKNOWN_TITLE N_("No help available" )
 #define UNKNOWN_HELP N_("There is no help available for these modules.")
+#endif
 
 /* This function is deprecated and is kept only for compatibility */
 static const struct config_category_t categories_array[] =
 {
     /* Interface */
     { CAT_INTERFACE, INTF_TITLE, INTF_HELP },
-    { SUBCAT_INTERFACE_GENERAL, GENERAL_TITLE, INTF_GENERAL_HELP },
+    { SUBCAT_INTERFACE_GENERAL, INTF_TITLE, INTF_GENERAL_HELP },
     { SUBCAT_INTERFACE_MAIN, INTF_MAIN_TITLE, INTF_MAIN_HELP },
     { SUBCAT_INTERFACE_CONTROL, INTF_CONTROL_TITLE, INTF_CONTROL_HELP },
     { SUBCAT_INTERFACE_HOTKEYS, INTF_HOTKEYS_TITLE, INTF_HOTKEYS_HELP },
 
     { CAT_AUDIO, AUDIO_TITLE, AUDIO_HELP },
-    { SUBCAT_AUDIO_GENERAL, AUDIO_GENERAL_TITLE, AUDIO_GENERAL_HELP },
+    { SUBCAT_AUDIO_GENERAL, AUDIO_TITLE, AUDIO_GENERAL_HELP },
     { SUBCAT_AUDIO_AOUT, AOUT_TITLE, AOUT_HELP },
     { SUBCAT_AUDIO_AFILTER, AFILTER_TITLE, AFILTER_HELP },
     { SUBCAT_AUDIO_VISUAL, AVISUAL_TITLE, AVISUAL_HELP },
     { SUBCAT_AUDIO_MISC, AMISC_TITLE, AMISC_HELP },
 
     { CAT_VIDEO, VIDEO_TITLE, VIDEO_HELP },
-    { SUBCAT_VIDEO_GENERAL, VIDEO_GENERAL_TITLE, VIDEO_GENERAL_HELP },
+    { SUBCAT_VIDEO_GENERAL, VIDEO_TITLE, VIDEO_GENERAL_HELP },
     { SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP },
     { SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP },
     { SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP },
 
     { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
-    { SUBCAT_INPUT_GENERAL, ADVANCED_TITLE, ADVANCED_HELP },
+    { SUBCAT_INPUT_GENERAL, INPUT_TITLE, INPUT_HELP },
     { SUBCAT_INPUT_ACCESS, ACCESS_TITLE, ACCESS_HELP },
     { SUBCAT_INPUT_DEMUX, DEMUX_TITLE, DEMUX_HELP },
     { SUBCAT_INPUT_VCODEC, VDEC_TITLE, VDEC_HELP },
@@ -267,7 +261,7 @@ static const struct config_category_t categories_array[] =
     { SUBCAT_INPUT_STREAM_FILTER, STREAM_FILTER_TITLE, STREAM_FILTER_HELP },
 
     { CAT_SOUT, SOUT_TITLE, SOUT_HELP },
-    { SUBCAT_SOUT_GENERAL, GENERAL_TITLE, SOUT_GENERAL_HELP },
+    { SUBCAT_SOUT_GENERAL, SOUT_TITLE, SOUT_GENERAL_HELP },
     { SUBCAT_SOUT_STREAM, SOUT_STREAM_TITLE, SOUT_STREAM_HELP },
     { SUBCAT_SOUT_MUX, SOUT_MUX_TITLE, SOUT_MUX_HELP },
     { SUBCAT_SOUT_ACO, SOUT_ACO_TITLE, SOUT_ACO_HELP },
@@ -276,12 +270,12 @@ static const struct config_category_t categories_array[] =
     { SUBCAT_SOUT_VOD, SOUT_VOD_TITLE, SOUT_VOD_HELP },
 
     { CAT_PLAYLIST, PLAYLIST_TITLE , PLAYLIST_HELP },
-    { SUBCAT_PLAYLIST_GENERAL, GENERAL_TITLE, PGENERAL_HELP },
+    { SUBCAT_PLAYLIST_GENERAL, PLAYLIST_TITLE, PGENERAL_HELP },
     { SUBCAT_PLAYLIST_SD, SD_TITLE, SD_HELP },
 
     { CAT_ADVANCED, AADVANCED_TITLE, AADVANCED_HELP },
     { SUBCAT_ADVANCED_CPU, CPU_TITLE, CPU_HELP },
-    { SUBCAT_ADVANCED_MISC, MISC_TITLE, MISC_HELP },
+    { SUBCAT_ADVANCED_MISC, MISC_TITLE, AADVANCED_HELP },
 
     { -1, NULL, NULL }
 };