Forward port [17015] + a few more i18n fix

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index f861ee23fcbd7657ed9b8a537951afc3c28bc824..30b3ac52e79778dd02f30e3f5363719e08e4f451 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -181,7 +181,7 @@ static void Close( vlc_object_t *p_this );
 
 vlc_module_begin();
     set_shortname( _("DVB") );
-    set_shortname( _("DVB input with v4l2 support") );
+    set_description( _("DVB input with v4l2 support") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp
index 7a44d035cc06913497fa513cb3c5e79d7cb2667b..c28aa5ebfd6ae38bb292ac8d32223f3c8a0ff679 100644 (file)
--- a/modules/audio_output/hd1000a.cpp
+++ b/modules/audio_output/hd1000a.cpp
@@ -73,7 +73,7 @@ static void    InterleaveS16( int16_t *, int16_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_shortname( "Roku HD1000" );
-    set_description( N_("Roku HD1000 audio output") );
+    set_description( _("Roku HD1000 audio output") );
     set_capability( "audio output", 100 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );

diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c
index fd8e192f252c98c99046b84b1e745e8af0008f0e..65668f7348c25cdd53927deddd0bd5ad28a5dcd0 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -109,7 +109,7 @@ static int PAOpenStream( aout_instance_t * );
 
 vlc_module_begin();
     set_shortname( "PortAudio" );
-    set_shortname( _("PORTAUDIO audio output") );
+    set_description( _("PORTAUDIO audio output") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
     add_integer( "portaudio-device", 0, NULL,

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 3c6845f644e56ab3bdb7956e7e3ea408eec39349..677c201bae552d5a2e4aedfdf1243f39d4230835 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -63,7 +63,7 @@ gint E_(GtkModeManage)   ( intf_thread_t * p_intf );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_shortname( _("PDA Linux Gtk2+ interface") );
+    set_description( _("PDA Linux Gtk2+ interface") );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_MAIN );
 //    add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, VLC_TRUE );

diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index 8595eb8c7e2aacbc653479e2017cd16a88dc5051..2ece16110cbf98fc9007889f87a00dd82dbdcc8e 100644 (file)
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -71,7 +71,7 @@ static char *mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") };
 
 vlc_module_begin();
     set_description( _("Gradient video filter") );
-    set_shortname( N_( "Gradient" ));
+    set_shortname( _( "Gradient" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 2c74ca60416579e3141c4f7309c36f76cda651d7..fa5825731f7297c3a49dd65c1d7032fe41d42ff9 100644 (file)
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -61,7 +61,7 @@ static picture_t *Filter( filter_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("OpenCV face detection example filter") );
-    set_shortname( N_( "OpenCV example" ));
+    set_shortname( _( "OpenCV example" ));
     set_capability( "opencv example", 1 );
     add_shortcut( "opencv_example" );
     

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index d4f71d476d4c7e2391ec0621eefebaeacde9162f..36a64ecbfb784e2415dd66c6de571062d1da5bf2 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -77,7 +77,7 @@ static char *verbosity_list_text[] = { N_("Show only errors"),
 
 vlc_module_begin();
     set_description( _("OpenCV video filter wrapper") );
-    set_shortname( N_("OpenCV" ));
+    set_shortname( _("OpenCV" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter", 0 );

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 211d9b832fad8cf21c66f02e5e44fed923d7384d..d837e0a881fa43e0a2719c8b20823755239b19a6 100644 (file)
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -115,7 +115,7 @@ vlc_module_begin();
         OSD_UPDATE_LONGTEXT, VLC_TRUE );
 
     set_capability( "sub filter", 100 );
-    set_shortname( _("On Screen Display menu") );
+    set_description( _("On Screen Display menu") );
     set_shortname( _("OSD menu") );
     add_shortcut( "osdmenu" );
 /*

diff --git a/modules/video_filter/panoramix.c b/modules/video_filter/panoramix.c
index a4536951d7e01b19ef728d08d11e702b7ece05fa..4aa8dc7c5850c017a92d316590bef33f381a0efe 100644 (file)
--- a/modules/video_filter/panoramix.c
+++ b/modules/video_filter/panoramix.c
@@ -91,7 +91,7 @@ static int  SendEvents( vlc_object_t *, char const *,
 
 vlc_module_begin();
     set_description( _("Panoramix: wall with overlap video filter") );
-    set_shortname( N_("Panoramix" ));
+    set_shortname( _("Panoramix" ));
     set_capability( "video filter", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );

diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index ab6f92e53f032517a62e561817dc8b366042738b..ac8d402e3ce18e32c7c2c713f72d6481a466ae9a 100644 (file)
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -49,7 +49,7 @@ static picture_t *Filter( filter_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Psychedelic video filter") );
-    set_shortname( N_( "Psychedelic" ));
+    set_shortname( _( "Psychedelic" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );

diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index e2157e3a3b022068135cb5ad0c0f3eef0a77574a..e5c1ddc71d60dcec1f14d6e2118c7e84d07a6a62 100644 (file)
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -48,7 +48,7 @@ static picture_t *Filter( filter_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Ripple video filter") );
-    set_shortname( N_( "Ripple" ));
+    set_shortname( _( "Ripple" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );

diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index 8f9252fa877b22b355b49a88aa3e7cbe3dd857ae..8c571aec92ecd5a2cd8ff355e155ea3ab1b01c10 100644 (file)
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -48,7 +48,7 @@ static picture_t *Filter( filter_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Wave video filter") );
-    set_shortname( N_( "Wave" ));
+    set_shortname( _( "Wave" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );