Use gettext_noop() consistently

modules/access/bda/bda.c

@@ -168,8 +168,8 @@ static const char *ppsz_polar_text[] = { N_("Horizontal"), N_("Vertical"),
     N_("Circular Left"), N_("Circular Right") };
 
 vlc_module_begin();
-    set_shortname( _("DVB") );
-    set_description( _("DirectShow DVB input") );
+    set_shortname( N_("DVB") );
+    set_description( N_("DirectShow DVB input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/cdda.c

@@ -68,8 +68,8 @@ static void Close( vlc_object_t * );
     "value should be set in milliseconds." )
 
 vlc_module_begin();
-    set_shortname( _("Audio CD"));
-    set_description( _("Audio CD input") );
+    set_shortname( N_("Audio CD"));
+    set_description( N_("Audio CD input") );
     set_capability( "access", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );

modules/access/cdda/cdda.c

@@ -111,9 +111,9 @@ static const char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
 
 vlc_module_begin();
     add_usage_hint( N_("cddax://[device-or-file][@[T]track]") );
-    set_description( _("Compact Disc Digital Audio (CD-DA) input") );
+    set_description( N_("Compact Disc Digital Audio (CD-DA) input") );
     set_capability( "access", 10 /* compare with priority of cdda */ );
-    set_shortname( _("Audio Compact Disc"));
+    set_shortname( N_("Audio Compact Disc"));
     set_callbacks( CDDAOpen, CDDAClose );
     add_shortcut( "cddax" );
     add_shortcut( "cd" );

modules/access/dc1394.c

@@ -64,7 +64,7 @@ static void OpenAudioDev( demux_t *p_demux );
 static inline void CloseAudioDev( demux_t *p_demux );
 
 vlc_module_begin();
-    set_description( _("dc1394 input") );
+    set_description( N_("dc1394 input") );
     set_capability( "access_demux", 10 );
     add_shortcut( "dc1394" );
     set_callbacks( Open, Close );

modules/access/directory.c

@@ -92,9 +92,9 @@ static const char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),
 
 vlc_module_begin();
     set_category( CAT_INPUT );
-    set_shortname( _("Directory" ) );
+    set_shortname( N_("Directory" ) );
     set_subcategory( SUBCAT_INPUT_ACCESS );
-    set_description( _("Standard filesystem directory input") );
+    set_description( N_("Standard filesystem directory input") );
     set_capability( "access", 55 );
     add_shortcut( "directory" );
     add_shortcut( "dir" );

modules/access/dshow/dshow.cpp

@@ -170,8 +170,8 @@ static int  DemuxOpen  ( vlc_object_t * );
 static void DemuxClose ( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("DirectShow") );
-    set_description( _("DirectShow input") );
+    set_shortname( N_("DirectShow") );
+    set_description( N_("DirectShow input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "dshow-caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000, NULL,
@@ -232,7 +232,7 @@ vlc_module_begin();
     set_callbacks( DemuxOpen, DemuxClose );
 
     add_submodule();
-    set_description( _("DirectShow input") );
+    set_description( N_("DirectShow input") );
     set_capability( "access", 0 );
     set_callbacks( AccessOpen, AccessClose );
 

modules/access/dv.c

@@ -74,8 +74,8 @@ static int Control( access_t *, int, va_list );
     "value should be set in milliseconds." )
 
 vlc_module_begin();
-    set_description( _("Digital Video (Firewire/ieee1394)  input") );
-    set_shortname( _("dv") );
+    set_description( N_("Digital Video (Firewire/ieee1394)  input") );
+    set_shortname( N_("dv") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );

modules/access/dvb/access.c

@@ -185,8 +185,8 @@ static void Close( vlc_object_t *p_this );
 #define CRL_LONGTEXT N_( "HTTP interface Certificates Revocation List file" )
 
 vlc_module_begin();
-    set_shortname( _("DVB") );
-    set_description( _("DVB input with v4l2 support") );
+    set_shortname( N_("DVB") );
+    set_description( N_("DVB input with v4l2 support") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/dvdnav.c

@@ -84,8 +84,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("DVD with menus") );
-    set_description( _("DVDnav Input") );
+    set_shortname( N_("DVD with menus") );
+    set_description( N_("DVDnav Input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT,

modules/access/dvdread.c

@@ -92,8 +92,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("DVD without menus") );
-    set_description( _("DVDRead Input (DVD without menu support)") );
+    set_shortname( N_("DVD without menus") );
+    set_description( N_("DVDRead Input (DVD without menu support)") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,

modules/access/eyetv.m

@@ -57,7 +57,7 @@ static void Close( vlc_object_t * );
     "-1 for S-Video input, -2 for Composite input" )
 vlc_module_begin();
     set_shortname( "EyeTV" );
-    set_description( _("EyeTV access module") );
+    set_description( N_("EyeTV access module") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/fake.c

@@ -57,8 +57,8 @@ static void Close( vlc_object_t * );
     "end-of-file (default is 0, meaning that the stream is unlimited).")
 
 vlc_module_begin();
-    set_shortname( _("Fake") );
-    set_description( _("Fake input") );
+    set_shortname( N_("Fake") );
+    set_description( N_("Fake input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/file.c

@@ -87,8 +87,8 @@ static void Close( vlc_object_t * );
     "value should be set in milliseconds." )
 
 vlc_module_begin();
-    set_description( _("File input") );
-    set_shortname( _("File") );
+    set_description( N_("File input") );
+    set_shortname( N_("File") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );

modules/access/ftp.c

@@ -70,7 +70,7 @@ static void OutClose( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "FTP" );
-    set_description( _("FTP input") );
+    set_description( N_("FTP input") );
     set_capability( "access", 0 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
@@ -87,7 +87,7 @@ vlc_module_begin();
 
     add_submodule();
     set_shortname( "FTP" );
-    set_description( _("FTP upload output") );
+    set_description( N_("FTP upload output") );
     set_capability( "sout access", 0 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );

modules/access/gnomevfs.c

@@ -50,7 +50,7 @@ static void Close( vlc_object_t * );
     "This value should be set in milliseconds." )
 
 vlc_module_begin();
-    set_description( _("GnomeVFS input") );
+    set_description( N_("GnomeVFS input") );
     set_shortname( "GnomeVFS" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );

modules/access/http.c

@@ -86,9 +86,9 @@ static void Close( vlc_object_t * );
 #define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ")
 
 vlc_module_begin();
-    set_description( _("HTTP input") );
+    set_description( N_("HTTP input") );
     set_capability( "access", 0 );
-    set_shortname( _( "HTTP(S)" ) );
+    set_shortname( N_( "HTTP(S)" ) );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/jack.c

@@ -71,9 +71,9 @@ static void Close( vlc_object_t * );
     "Automatically connect VLC input ports to available output ports." )
 
 vlc_module_begin();
-     set_description( _("JACK audio input") );
+     set_description( N_("JACK audio input") );
      set_capability( "access_demux", 0 );
-     set_shortname( _( "JACK Input" ) );
+     set_shortname( N_( "JACK Input" ) );
      set_category( CAT_INPUT );
      set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/mmap.c

@@ -51,8 +51,8 @@ static int Open (vlc_object_t *);
 static void Close (vlc_object_t *);
 
 vlc_module_begin();
-    set_shortname (_("MMap"));
-    set_description (_("Memory-mapped file input"));
+    set_shortname (N_("MMap"));
+    set_description (N_("Memory-mapped file input"));
     set_category (CAT_INPUT);
     set_subcategory (SUBCAT_INPUT_ACCESS);
     set_capability ("access", 52);

modules/access/mms/mms.c

@@ -71,7 +71,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "MMS" );
-    set_description( _("Microsoft Media Server (MMS) input") );
+    set_description( N_("Microsoft Media Server (MMS) input") );
     set_capability( "access", -1 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );

modules/access/pvr.c

@@ -125,8 +125,8 @@ static const char *psz_bitrates_list_text[] = { N_("vbr"), N_("cbr") };
 static int pi_radio_range[2] = { 65000, 108000 };
 
 vlc_module_begin();
-    set_shortname( _("PVR") );
-    set_description( _("IVTV MPEG Encoding cards input") );
+    set_shortname( N_("PVR") );
+    set_description( N_("IVTV MPEG Encoding cards input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     set_capability( "access", 0 );

modules/access/rtmp/access.c

@@ -49,8 +49,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("RTMP input") );
-    set_shortname( _("RTMP") );
+    set_description( N_("RTMP input") );
+    set_shortname( N_("RTMP") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/rtsp/access.c

@@ -49,8 +49,8 @@ static void Close( vlc_object_t * );
     "value should be set in milliseconds." )
 
 vlc_module_begin();
-    set_description( _("Real RTSP") );
-    set_shortname( _("Real RTSP") );
+    set_description( N_("Real RTSP") );
+    set_shortname( N_("Real RTSP") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "realrtsp-caching", 3000, NULL,

modules/access/screen/screen.c

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

modules/access/smb.c

@@ -77,7 +77,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "SMB" );
-    set_description( _("SMB input") );
+    set_description( N_("SMB input") );
     set_capability( "access", 0 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );

modules/access/tcp.c

@@ -47,8 +47,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("TCP") );
-    set_description( _("TCP input") );
+    set_shortname( N_("TCP") );
+    set_description( N_("TCP input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/udp.c

@@ -74,8 +74,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("UDP/RTP" ) );
-    set_description( _("UDP/RTP input") );
+    set_shortname( N_("UDP/RTP" ) );
+    set_description( N_("UDP/RTP input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/v4l.c

@@ -147,8 +147,8 @@ static const char *psz_norm_list_text[] =
     { N_("Automatic"), N_("SECAM"), N_("PAL"),  N_("NTSC") };
 
 vlc_module_begin();
-    set_shortname( _("Video4Linux") );
-    set_description( _("Video4Linux input") );
+    set_shortname( N_("Video4Linux") );
+    set_description( N_("Video4Linux input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/v4l2/v4l2.c

@@ -272,8 +272,8 @@ static const char *psz_tuner_audio_modes_list_text[] =
 #define CFG_PREFIX "v4l2-"
 
 vlc_module_begin();
-    set_shortname( _("Video4Linux2") );
-    set_description( _("Video4Linux2 input") );
+    set_shortname( N_("Video4Linux2") );
+    set_description( N_("Video4Linux2 input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 
@@ -379,7 +379,7 @@ vlc_module_begin();
 
     add_submodule();
     add_shortcut( "v4l2c" );
-    set_description( _("Video4Linux2 Compressed A/V") );
+    set_description( N_("Video4Linux2 Compressed A/V") );
     set_capability( "access", 0 );
     /* use these when open as access_demux fails; VLC will use another demux */
     set_callbacks( AccessOpen, AccessClose );

modules/access/vcd/vcd.c

@@ -49,8 +49,8 @@ static void Close( vlc_object_t * );
     "value should be set in milliseconds." )
 
 vlc_module_begin();
-    set_shortname( _("VCD"));
-    set_description( _("VCD input") );
+    set_shortname( N_("VCD"));
+    set_description( N_("VCD input") );
     set_capability( "access", 60 );
     set_callbacks( Open, Close );
     set_category( CAT_INPUT );

modules/access/vcdx/vcd.c

@@ -98,8 +98,8 @@ int  BlocksPerReadCallback ( vlc_object_t *p_this, const char *psz_name,
  *****************************************************************************/
 
 vlc_module_begin();
-    set_shortname( _("(Super) Video CD"));
-    set_description( _("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") );
+    set_shortname( N_("(Super) Video CD"));
+    set_description( N_("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" );
     set_category( CAT_INPUT );

modules/access_filter/bandwidth.c

@@ -42,8 +42,8 @@ static void Close (vlc_object_t *);
 /* TODO: burst support */
 
 vlc_module_begin ();
-    set_shortname (_("Bandwidth"));
-    set_description (_("Bandwidth limiter"));
+    set_shortname (N_("Bandwidth"));
+    set_description (N_("Bandwidth limiter"));
     set_category (CAT_INPUT);
     set_subcategory (SUBCAT_INPUT_ACCESS_FILTER);
     set_capability ("access_filter", 0);

modules/access_filter/dump.c

@@ -51,8 +51,8 @@ static int  Open (vlc_object_t *);
 static void Close (vlc_object_t *);
 
 vlc_module_begin ();
-    set_shortname (_("Dump"));
-    set_description (_("Dump"));
+    set_shortname (N_("Dump"));
+    set_description (N_("Dump"));
     set_category (CAT_INPUT);
     set_subcategory (SUBCAT_INPUT_ACCESS_FILTER);
     set_capability ("access_filter", 0);

modules/access_filter/record.c

@@ -53,8 +53,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("Record") );
-    set_description( _("Record") );
+    set_shortname( N_("Record") );
+    set_description( N_("Record") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
     set_capability( "access_filter", 0 );

modules/access_filter/timeshift.c

@@ -62,8 +62,8 @@ static void Close( vlc_object_t * );
   "access declares that it can control pace or pause." )
 
 vlc_module_begin();
-    set_shortname( _("Timeshift") );
-    set_description( _("Timeshift") );
+    set_shortname( N_("Timeshift") );
+    set_description( N_("Timeshift") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
     set_capability( "access_filter", 0 );

modules/access_output/dummy.c

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

modules/access_output/file.c

@@ -68,8 +68,8 @@ static void Close( vlc_object_t * );
                             "of replacing it.")
 
 vlc_module_begin();
-    set_description( _("File stream output") );
-    set_shortname( _("File" ));
+    set_description( N_("File stream output") );
+    set_shortname( N_("File" ));
     set_capability( "sout access", 50 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );

modules/access_output/http.c

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

modules/access_output/shout.c

@@ -107,7 +107,7 @@ static void Close( vlc_object_t * );
                            "shoutcast. Requires Ogg streaming for icecast." )
 
 vlc_module_begin();
-    set_description( _("IceCAST output") );
+    set_description( N_("IceCAST output") );
     set_shortname( "Shoutcast" );
     set_capability( "sout access", 50 );
     set_category( CAT_SOUT );

modules/access_output/udp.c

@@ -77,7 +77,7 @@ static void Close( vlc_object_t * );
                           "heavily-loaded systems." )
 
 vlc_module_begin();
-    set_description( _("UDP stream output") );
+    set_description( N_("UDP stream output") );
     set_shortname( "UDP" );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );

modules/audio_filter/channel_mixer/dolby.c

@@ -46,8 +46,8 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Simple decoder for Dolby Surround encoded streams") );
-    set_shortname( _("Dolby Surround decoder") );
+    set_description( N_("Simple decoder for Dolby Surround encoded streams") );
+    set_shortname( N_("Dolby Surround decoder") );