forward port [17012] and make update-po

modules/access/cdda/cdda.c

@@ -112,7 +112,7 @@ vlc_module_begin();
     add_usage_hint( N_("cddax://[device-or-file][@[T]track]") );
     set_description( _("Compact Disc Digital Audio (CD-DA) input") );
     set_capability( "access2", 10 /* compare with priority of cdda */ );
-    set_shortname( N_("Audio Compact Disc"));
+    set_shortname( _("Audio Compact Disc"));
     set_callbacks( CDDAOpen, CDDAClose );
     add_shortcut( "cddax" );
     add_shortcut( "cd" );

modules/access/dvb/access.c

@@ -181,7 +181,7 @@ static void Close( vlc_object_t *p_this );
 
 vlc_module_begin();
     set_shortname( _("DVB") );
-    set_description( N_("DVB input with v4l2 support") );
+    set_shortname( _("DVB input with v4l2 support") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/screen/screen.c

@@ -60,7 +60,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("Screen Input") );
-    set_shortname( N_("Screen" ));
+    set_shortname( _("Screen" ));
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/vcdx/vcd.c

@@ -92,7 +92,7 @@ int  E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name,
  *****************************************************************************/
 
 vlc_module_begin();
-    set_shortname( N_("(Super) Video CD"));
+    set_shortname( _("(Super) Video CD"));
     set_description( _("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") );
     add_usage_hint( N_("vcdx://[device-or-file][@{P,S,T}num]") );
     add_shortcut( "vcdx" );

modules/access_output/dummy.c

@@ -38,7 +38,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("Dummy stream output") );
-    set_shortname( N_( "Dummy" ));
+    set_shortname( _( "Dummy" ));
     set_capability( "sout access", 0 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );

modules/access_output/file.c

@@ -64,7 +64,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("File stream output") );
-    set_shortname( N_("File" ));
+    set_shortname( _("File" ));
     set_capability( "sout access", 50 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );

modules/access_output/http.c

@@ -90,7 +90,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_description( _("HTTP stream output") );
     set_capability( "sout access", 0 );
-    set_shortname( N_("HTTP" ) );
+    set_shortname( _("HTTP" ) );
     add_shortcut( "http" );
     add_shortcut( "https" );
     add_shortcut( "mmsh" );

modules/access_output/udp.c

@@ -95,7 +95,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("UDP stream output") );
-    set_shortname( N_( "UDP" ) );
+    set_shortname( _( "UDP" ) );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );
     add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );

modules/audio_filter/channel_mixer/dolby.c

@@ -44,7 +44,7 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( N_("Simple decoder for Dolby Surround encoded streams") );
+    set_description( _("Simple decoder for Dolby Surround encoded streams") );
     set_shortname( _("Dolby Surround decoder") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACODEC );

modules/audio_filter/channel_mixer/headphone.c

@@ -76,7 +76,7 @@ static block_t *Convert( filter_t *, block_t * );
      "processed by this filter. Enabling this setting is not recommended.")
 
 vlc_module_begin();
-    set_description( N_("Headphone virtual spatialization effect") );
+    set_description( _("Headphone virtual spatialization effect") );
     set_shortname( _("Headphone effect") );
     set_help( MODULE_DESCRIPTION );
     set_category( CAT_AUDIO );

modules/audio_filter/equalizer.c

@@ -68,7 +68,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("Equalizer with 10 bands") );
-    set_shortname( N_("Equalizer" ) );
+    set_shortname( _("Equalizer" ) );
     set_capability( "audio filter", 0 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AFILTER );

modules/audio_filter/normvol.c

@@ -80,7 +80,7 @@ typedef struct aout_filter_sys_t
 
 vlc_module_begin();
     set_description( _("Volume normalizer") );
-    set_shortname( N_("Volume normalizer") );
+    set_shortname( _("Volume normalizer") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AFILTER );
     add_shortcut( "volnorm" );

modules/audio_filter/param_eq.c

@@ -47,7 +47,7 @@ static void DoWork( aout_instance_t *, aout_filter_t *,
 
 vlc_module_begin();
     set_description( _("Parametric Equalizer") );
-    set_shortname( N_("Parametric Equalizer" ) );
+    set_shortname( _("Parametric Equalizer" ) );
     set_capability( "audio filter", 0 );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AFILTER );

modules/audio_output/file.c

@@ -108,7 +108,7 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
 #define FILE_LONGTEXT N_("File to which the audio samples will be written to.")
 
 vlc_module_begin();
-    set_description( N_("File audio output") );
+    set_description( _("File audio output") );
     set_shortname( _("File") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );

modules/audio_output/portaudio.c

@@ -109,7 +109,7 @@ static int PAOpenStream( aout_instance_t * );
 
 vlc_module_begin();
     set_shortname( "PortAudio" );
-    set_description( N_("PORTAUDIO audio output") );
+    set_shortname( _("PORTAUDIO audio output") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AOUT );
     add_integer( "portaudio-device", 0, NULL,

modules/codec/svcdsub.c

@@ -39,17 +39,16 @@ static int  DecoderOpen   ( vlc_object_t * );
 static int  PacketizerOpen( vlc_object_t * );
 static void DecoderClose  ( vlc_object_t * );
 
-#define DEBUG_TEXT \
-     "Enable debug"
+#define DEBUG_TEXT N_("Enable debug")
 
-#define DEBUG_LONGTEXT N_( \
-    "This integer when viewed in binary is a debugging mask\n" \
+#define DEBUG_LONGTEXT  \
+    N_("This integer when viewed in binary is a debugging mask\n" \
     "calls                 1\n" \
-    "packet assembly info  2\n")
+    "packet assembly info  2\n" )
 
 vlc_module_begin();
     set_description( _("Philips OGT (SVCD subtitle) decoder") );
-    set_shortname( N_("SVCD subtitles"));
+    set_shortname( _("SVCD subtitles") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_SCODEC );
     set_capability( "decoder", 50 );

modules/demux/subtitle.c

@@ -47,15 +47,15 @@ static int  Open ( vlc_object_t *p_this );
 static void Close( vlc_object_t *p_this );
 
 #define SUB_DELAY_LONGTEXT \
-    "Apply a delay to all subtitles (in 1/10s, eg 100 means 10s)."
+    N_("Apply a delay to all subtitles (in 1/10s, eg 100 means 10s).")
 #define SUB_FPS_LONGTEXT \
-    "Override the normal frames per second settings. " \
-    "This will only work with MicroDVD and SubRIP (SRT) subtitles."
+    N_("Override the normal frames per second settings. " \
+    "This will only work with MicroDVD and SubRIP (SRT) subtitles.")
 #define SUB_TYPE_LONGTEXT \
-    "Force the subtiles format. Valid values are : \"microdvd\", \"subrip\"," \
-    "\"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \
+    N_("Force the subtiles format. Valid values are : \"microdvd\", " \
+    "\"subrip\",  \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \
     "\"sami\", \"dvdsubtitle\" and \"auto\" (meaning autodetection, this " \
-    "should always work)."
+    "should always work).")
 static char *ppsz_sub_type[] =
 {
     "auto", "microdvd", "subrip", "subviewer", "ssa1",

modules/gui/pda/pda.c

@@ -63,7 +63,7 @@ gint E_(GtkModeManage)   ( intf_thread_t * p_intf );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( N_("PDA Linux Gtk2+ interface") );
+    set_shortname( _("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 );

modules/gui/wxwidgets/dialogs.cpp

@@ -471,7 +471,7 @@ void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )
     }
 
     if( p_dir_dialog == NULL )
-        p_dir_dialog = new wxDirDialog( NULL );
+        p_dir_dialog = new wxDirDialog( NULL, wxU(_("Select a directory")) );
 
     if( p_dir_dialog && p_dir_dialog->ShowModal() == wxID_OK )
     {

modules/gui/wxwidgets/dialogs/preferences_widgets.cpp

@@ -573,7 +573,7 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *p_this,
     {
         wxButton *button =
             new wxButton( this, wxID_HIGHEST+i,
-                          wxU(p_item->ppsz_action_text[i]) );
+                          wxU(_(p_item->ppsz_action_text[i])) );
         sizer->Add( button, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
     }