Preferences consistency fixes by Christophe Mutricy <xtophe at nxtelevision d0t com>

+ put access and demux in the right place

modules/access/cdda.c

@@ -45,6 +45,7 @@ static void Close( vlc_object_t * );
     "value should be set in milliseconds units." )
 
 vlc_module_begin();
+    set_shortname( _("Audio CD"));
     set_description( _("Audio CD input") );
     set_capability( "access2", 10 );
     set_category( CAT_INPUT );

modules/access/vcd/vcd.c

@@ -43,6 +43,7 @@ static void Close( vlc_object_t * );
     "value should be set in milliseconds units." )
 
 vlc_module_begin();
+    set_shortname( _("VCD"));
     set_description( _("VCD input") );
     set_capability( "access2", 60 );
     set_callbacks( Open, Close );

modules/audio_filter/channel_mixer/headphone.c

@@ -58,7 +58,7 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
      "Distance between front left speaker and listener in meters.")
 
 vlc_module_begin();
-    set_description( N_("headphone channel mixer with virtual spatialization effect") );
+    set_description( N_("Headphone channel mixer with virtual spatialization effect") );
     set_shortname( _("Headphone effect") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AFILTER );

modules/codec/ffmpeg/ffmpeg.c

@@ -76,17 +76,17 @@ static char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-
+    set_shortname( _("Ffmpeg"));
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_SCODEC );
     /* decoder main module */
 #if defined(MODULE_NAME_is_ffmpegaltivec) \
      || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
-    set_description( _("AltiVec ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+    set_description( _("AltiVec ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
     /*add_requirement( ALTIVEC );*/
     set_capability( "decoder", 71 );
 #else
-    set_description( _("ffmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+    set_description( _("Ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
     set_capability( "decoder", 70 );
 #endif
     set_section( N_("Decoding") , NULL );

modules/codec/subsdec.c

@@ -89,7 +89,8 @@ static char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")};
 #define ALIGN_LONGTEXT N_("Set the justification of subtitles")
 
 vlc_module_begin();
-    set_description( _("text subtitles decoder") );
+    set_shortname( _("Subtitles"));
+    set_description( _("Text subtitles decoder") );
     set_capability( "decoder", 50 );
     set_callbacks( OpenDecoder, CloseDecoder );
     set_category( CAT_INPUT );

modules/codec/toolame.c

@@ -60,7 +60,8 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
   "By default the encoding is CBR." )
 
 vlc_module_begin();
-    set_description( _("libtoolame audio encoder") );
+    set_shortname( _("Toolame"));
+    set_description( _("Libtoolame audio encoder") );
     set_capability( "encoder", 50 );
     set_callbacks( OpenEncoder, CloseEncoder );
     set_category( CAT_INPUT );

modules/codec/vorbis.c

@@ -141,7 +141,7 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
   "Allows you to force a constant bitrate encoding (CBR)." )
 
 vlc_module_begin();
-
+    set_shortname( _("Vorbis"));
     set_description( _("Vorbis audio decoder") );
 #ifdef MODULE_NAME_IS_tremor
     set_capability( "decoder", 90 );

modules/control/gestures.c

@@ -87,6 +87,7 @@ static char *button_list[] = { "left", "middle", "right" };
 static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") };
 
 vlc_module_begin();
+    set_shortname( _("Gestures"));
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_CONTROL );
     add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );

modules/control/http.c

@@ -89,6 +89,7 @@ static void Close( vlc_object_t * );
 #define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file" )
 
 vlc_module_begin();
+    set_shortname( _("HTTP"));
     set_description( _("HTTP remote control interface") );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_GENERAL );

modules/control/netsync.c

@@ -87,6 +87,7 @@ static mtime_t GetClockRef( intf_thread_t *, mtime_t );
   "the master client used for the network synchronisation." )
 
 vlc_module_begin();
+    set_shortname( _("Netsync"));
     set_description( _("Network synchronisation") );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_CONTROL );

modules/control/ntservice.c

@@ -58,6 +58,7 @@ static void Close   ( vlc_object_t * );
     "(common values are: logger, sap, rc, http)")
 
 vlc_module_begin();
+    set_shortname( _("NT Service"));
     set_description( _("Windows Service interface") );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_CONTROL );

modules/control/rc.c

@@ -149,6 +149,7 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
 #endif
 
 vlc_module_begin();
+    set_shortname( _("RC"));
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_GENERAL );
     set_description( _("Remote control interface") );

modules/control/showintf.c

@@ -63,6 +63,7 @@ static int  MouseEvent( vlc_object_t *, char const *,
 #define THRESHOLD_LONGTEXT N_( "Height of the zone triggering the interface" )
 
 vlc_module_begin();
+    set_shortname( _("Showintf"));
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_CONTROL );
     add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );

modules/control/telnet.c

@@ -82,13 +82,14 @@ static void Close( vlc_object_t * );
 #define TELNETPWD_LONGTEXT N_( "Default to admin" )
 
 vlc_module_begin();
+    set_shortname( _("Telnet"));
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_GENERAL );
     add_integer( "telnet-port", 4212, NULL, TELNETPORT_TEXT,
                  TELNETPORT_LONGTEXT, VLC_TRUE );
     add_string( "telnet-password", "admin", NULL, TELNETPWD_TEXT,
                 TELNETPWD_LONGTEXT, VLC_TRUE );
-    set_description( _("Telnet remote control interface") );
+    set_description( _("VLM remote control interface") );
     add_category_hint( "VLM", NULL, VLC_FALSE );
     set_capability( "interface", 0 );
     set_callbacks( Open , Close );

modules/demux/subtitle.c

@@ -58,6 +58,7 @@ static char *ppsz_sub_type[] =
 };
 
 vlc_module_begin();
+    set_shortname( _("Subtitles"));
     set_description( _("Text subtitles demux") );
     set_capability( "demux2", 0 );
     set_category( CAT_INPUT );

modules/gui/ncurses.c

@@ -96,7 +96,8 @@ static void ReadDir        ( intf_thread_t * );
     "will show you initially.")
 
 vlc_module_begin();
-    set_description( _("ncurses interface") );
+    set_shorname( _("Ncurses"));
+    set_description( _("Ncurses interface") );
     set_capability( "interface", 10 );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_GENERAL );

modules/gui/skins2/src/skin_main.cpp

@@ -350,7 +350,7 @@ vlc_module_begin();
     add_bool( "skins2-transparency", VLC_FALSE, NULL, SKINS2_TRANSPARENCY,
               SKINS2_TRANSPARENCY_LONG, VLC_FALSE );
 #endif
-
+    set_shorname( _("Skins"));
     set_description( _("Skinnable Interface") );
     set_capability( "interface", 30 );
     set_callbacks( Open, Close );

modules/gui/wxwindows/wxwindows.cpp

@@ -96,6 +96,7 @@ vlc_module_begin();
 #else
     int i_score = getenv( "DISPLAY" ) == NULL ? 15 : 150;
 #endif
+    set_shortname( (char*) _("wxWindows"));
     set_description( (char *) _("wxWindows interface module") );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_GENERAL );

modules/misc/freetype.c

@@ -104,7 +104,8 @@ static char *ppsz_color_descriptions[] = { N_("Black"), N_("Gray"), N_("Silver")
                                  N_("Navy"), N_("Blue"), N_("Aqua") };
 
 vlc_module_begin();
-    set_description( _("freetype2 font renderer") );
+    set_shortname( _("Freetype"));
+    set_description( _("Freetype2 font renderer") );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_TEXT );
 

modules/mux/mpjpeg.c

@@ -46,6 +46,7 @@ static void Close  ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-mpjpeg-"
 
 vlc_module_begin();
+    set_shortname( _("MPJPEG"));
     set_description( _("Multipart jpeg muxer") );
     set_capability( "sout mux", 5 );
     add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL,