Fix Metacube header handling with multiple header blocks.

[vlc] / include / vlc_config_cat.h

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 5488f17d2abc6d5a680c2712c1087b1c037ff169..00d7352f061379bd7eca6cbfea6af347dd5ea0cb 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -74,18 +74,15 @@
 #define VIDEO_GENERAL_HELP N_( "General video settings" )
 
 #define _VOUT_TITLE N_("Output modules" )
-#define VOUT_HELP N_( \
-    "Choose your preferred video output and configure it here." )
+#define VOUT_HELP N_("General settings for video output modules.")
 
 #define VFILTER_TITLE N_("Filters" )
-#define VFILTER_HELP N_( \
-    "Video filters are used to process the video stream." )
+#define VFILTER_HELP N_("Video filters are used to process the video stream." )
 
 #define SUBPIC_TITLE N_( "Subtitles / OSD")
 #define SUBPIC_HELP N_( "Settings related to On-Screen-Display,"\
         " subtitles and \"overlay subpictures\"")
 /*
-#define TEXT_TITLE N_("Text rendering")
 #define TEXT_HELP N_( \
     "Use the settings of the \"freetype\" module to choose the font you " \
     "want VLC to use for text rendering (to display subtitles for example).")
@@ -115,10 +112,9 @@
 #define ADEC_TITLE  N_( "Audio codecs" )
 #define ADEC_HELP N_( "Settings for the audio-only decoders and encoders." )
 
-#define SDEC_TITLE N_( "Subtitles codecs")
-#define SDEC_HELP N_( "Settings for subtitles, teletext and CC decoders and encoders." )
+#define SDEC_TITLE N_( "Subtitle codecs")
+#define SDEC_HELP N_( "Settings for subtitle, teletext and CC decoders and encoders." )
 
-#define ADVANCED_TITLE N_("General Input" )
 #define ADVANCED_HELP N_( "General input settings. Use with care..." )
 
 /* Sout */
@@ -184,42 +180,6 @@
 
 #define MISC_TITLE N_( "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." )
-
-#define CHROMA_TITLE N_("Chroma modules settings")
-#define CHROMA_HELP N_("These settings affect chroma transformation modules.")
-
-#define PACKETIZER_TITLE  N_("Packetizer modules settings" )
-#define PACKETIZER_HELP "These are general settings for the "\
-        "packetizers used in VLC's stream output subsystem."
-
-#define ENCODER_TITLE N_("Encoders settings")
-#define ENCODER_HELP N_( \
-    "These are general settings for video/audio/subtitles encoding modules.")
-
-
-#define DIALOGS_TITLE N_("Dialog providers settings")
-#define DIALOGS_HELP  N_( \
-    "Dialog providers can be configured here.")
-
-#define SUBTITLE_DEMUX_TITLE N_("Subtitle demuxer settings")
-#define SUBTITLE_DEMUX_HELP N_( \
-    "In this section you can force the behavior of the subtitle demuxer, " \
-    "for example by setting the subtitles type or file name.")
-
-/*
- *  A little help for modules with unknown capabilities
- */
-
-#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[] =
 {