modules/audio_output/waveout.c: backport of 13376.

[vlc] / include / vlc_config_cat.h

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 62b477cc22d0ef6025278fef4d2ed7dc943f7d74..959f472079f75fd04f56e2582ee6cd4198852275 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_help.h: Help strings
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id: vlc_help.h 9171 2004-11-06 11:15:50Z zorglub $
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -51,6 +51,7 @@
 #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")
@@ -71,7 +72,8 @@
 #define VIDEO_TITLE N_("Video")
 #define VIDEO_HELP N_("Video settings")
 
-#define VIDEO_GENERAL_HELP N_( "General video settings")
+#define VIDEO_GENERAL_TITLE N_( "General video settings")
+#define VIDEO_GENERAL_HELP N_( "General video settings" )
 
 #define _VOUT_TITLE N_("Output modules" )
 #define VOUT_HELP N_( \
@@ -95,10 +97,16 @@
 
 #define ACCESS_TITLE N_( "Access modules" )
 #define ACCESS_HELP N_( \
-    "Settings related to the various access methods used by VLC.\n" \
+    "Settings related to the various access methods used by VLC. " \
     "Common settings you may want to alter are HTTP proxy or " \
     "caching settings." )
 
+#define ACCESS_FILTER_TITLE N_( "Access filters" )
+#define ACCESS_FILTER_HELP N_( \
+    "Access 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.\n" )
+
 #define DEMUX_TITLE N_("Demuxers")
 #define DEMUX_HELP N_( "Demuxers are used to separate audio and video streams" )
 
@@ -111,8 +119,8 @@
 #define SDEC_TITLE N_( "Other codecs")
 #define SDEC_HELP N_( "Settings for audio+video and miscellaneous decoders and encoders" )
 
-#define ADVANCED_TITLE N_("Advanced")
-#define ADVANCED_HELP N_( "Advanced input settings. Use with care." )
+#define ADVANCED_TITLE N_("General")
+#define ADVANCED_HELP N_( "General input settings. Use with care." )
 
 /* Sout */
 #define SOUT_TITLE N_( "Stream output" )
@@ -130,19 +138,19 @@
 #define SOUT_MUX_TITLE N_( "Muxers" )
 #define SOUT_MUX_HELP N_( "Muxers are the encapsulation formats that are used to " \
                           "put all the elementary streams (video, audio, ...) " \
-                          "together. This setting allows you to always force a muxer." \
+                          "together. This setting allows you to always force a muxer. " \
                           "You should probably not do that.\n" \
                           "You can also set default parameters for each muxer." )
 #define SOUT_ACO_TITLE N_( "Access output" )
-#define SOUT_ACO_HELP N_( "Access output are the ways the muxed streams are sent." \
-                          "This setting allows you to always force an access output." \
+#define SOUT_ACO_HELP N_( "Access output are the ways the muxed streams are sent. " \
+                          "This setting allows you to always force an access output. " \
                           "You should probably not do that.\n" \
                           "You can also set default parameters for each access output.")
 
 #define SOUT_PACKET_TITLE N_( "Packetizers" )
 #define SOUT_PACKET_HELP N_( "Packetizers are used to \"preprocess\" the elementary "\
-                              "streams before muxing." \
-                          "This setting allows you to always force a packetizer." \
+                              "streams before muxing. " \
+                          "This setting allows you to always force a packetizer. " \
                           "You should probably not do that.\n" \
                           "You can also set default parameters for each packetizer." )
 
@@ -173,7 +181,7 @@
 #define AADVANCED_HELP N_( "Advanced settings. Use with care.")
 
 #define CPU_TITLE N_( "CPU features" )
-#define CPU_HELP N_( "From here you can choose to disable some CPU accelearations. You should probably not touch that." )
+#define CPU_HELP N_( "From here you can choose to disable some CPU accelerations. You should probably not touch that." )
 
 #define MISC_TITLE N_( "Other" )
 #define MISC_HELP N_( "Other advanced settings")
@@ -280,26 +288,27 @@ static struct config_category_t categories_array[] =
     { SUBCAT_INTERFACE_HOTKEYS, INTF_HOTKEYS_TITLE, INTF_HOTKEYS_HELP },
 
     { CAT_AUDIO, AUDIO_TITLE, AUDIO_HELP },
-    { SUBCAT_AUDIO_GENERAL, GENERAL_TITLE, AUDIO_GENERAL_HELP },
+    { SUBCAT_AUDIO_GENERAL, AUDIO_GENERAL_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, GENERAL_TITLE, VIDEO_GENERAL_HELP },
+    { SUBCAT_VIDEO_GENERAL, VIDEO_GENERAL_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 },
-    { SUBCAT_VIDEO_TEXT, TEXT_TITLE, TEXT_HELP },
+//    { SUBCAT_VIDEO_TEXT, TEXT_TITLE, TEXT_HELP },
 
     { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
+    { SUBCAT_INPUT_GENERAL, ADVANCED_TITLE, ADVANCED_HELP },
     { SUBCAT_INPUT_ACCESS, ACCESS_TITLE, ACCESS_HELP },
+    { SUBCAT_INPUT_ACCESS_FILTER, ACCESS_FILTER_TITLE, ACCESS_FILTER_HELP },
     { SUBCAT_INPUT_DEMUX, DEMUX_TITLE, DEMUX_HELP },
     { SUBCAT_INPUT_VCODEC, VDEC_TITLE, VDEC_HELP },
     { SUBCAT_INPUT_ACODEC, ADEC_TITLE, ADEC_HELP },
     { SUBCAT_INPUT_SCODEC, SDEC_TITLE, SDEC_HELP },
-    { SUBCAT_INPUT_ADVANCED, ADVANCED_TITLE, ADVANCED_HELP },
 
     { CAT_SOUT, SOUT_TITLE, SOUT_HELP },
     { SUBCAT_SOUT_GENERAL, GENERAL_TITLE, SOUT_GENERAL_HELP },