Strings (Refs:#438)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index d4005d382971483f43a2ec10a53e0d221e3eb9d1..23a5235aae9a0d16f8adb931b7e300b53637e476 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -45,7 +45,7 @@
 #define INDEX_TEXT N_("Force index creation")
 #define INDEX_LONGTEXT N_( \
     "Recreate a index for the AVI file. Use this if your AVI file is damaged "\
-    "or incomplete (not seekable)" )
+    "or incomplete (not seekable)." )
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
@@ -1167,8 +1167,8 @@ static int Seek( demux_t *p_demux, mtime_t i_date, int i_percent )
             int64_t i_pos;
 
             /* use i_percent to create a true i_date */
-            msg_Warn( p_demux, "mmh, seeking without index at %d%%"
-                      " work only for interleaved file", i_percent );
+            msg_Warn( p_demux, "seeking without index at %d%%"
+                      " only works for interleaved files", i_percent );
             if( i_percent >= 100 )
             {
                 msg_Warn( p_demux, "cannot seek so far !" );
@@ -2170,7 +2170,8 @@ static void AVI_IndexLoad_indx( demux_t *p_demux )
 
         if( !p_indx )
         {
-            msg_Warn( p_demux, "cannot find indx (misdetect/broken OpenDML file?)" );
+            msg_Warn( p_demux, "cannot find indx (misdetect/broken OpenDML "
+                               "file?)" );
             continue;
         }
 

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index b721429879f32fb9c71a0e3edf3fdbb26a2e98d8..31bcd757fdd4768a6408ec7afe905d0fbd46f582 100644 (file)
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -35,13 +35,12 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define FILE_TEXT N_("Filename of dump")
+#define FILE_TEXT N_("Dump filename")
 #define FILE_LONGTEXT N_( \
-    "Specify a file name to which the raw stream will be dumped." )
-#define APPEND_TEXT N_("Append")
+    "Name of the file to which the raw stream will be dumped." )
+#define APPEND_TEXT N_("Append to existing file")
 #define APPEND_LONGTEXT N_( \
-    "If the file exists and this option is selected, the existing file " \
-    "will not be overwritten." )
+    "If the file already exists, it will not be overwritten." )
 
 static int  Open( vlc_object_t * );
 static void Close ( vlc_object_t * );
@@ -50,7 +49,7 @@ vlc_module_begin();
     set_shortname("Dump");
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("Filedump demuxer") );
+    set_description( _("File dumpper") );
     set_capability( "demux2", 0 );
     add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT,
               FILE_LONGTEXT, VLC_FALSE );

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 3b0f99bd930b79567fbc5d334a5f90675ed57297..333e9c3f35a39487e821de9ea229c4c6a016cf2e 100644 (file)
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -41,12 +41,13 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 #define FPS_TEXT N_("Frames per Second")
-#define FPS_LONGTEXT N_("Allows you to set the desired frame rate when " \
-    "playing from files, use 0 for live.")
+#define FPS_LONGTEXT N_("This is the desired frame rate when " \
+    "playing MJPEG from a file. Use 0 (this is the default value) for a " \
+    "live stream (from the camera).")
 
 vlc_module_begin();
     set_shortname( "MJPEG");
-    set_description( _("JPEG camera demuxer") );
+    set_description( _("M-JPEG camera demuxer") );
     set_capability( "demux2", 5 );
     set_callbacks( Open, Close );
     set_category( CAT_INPUT );

diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 0c14d1bd134352e8d337b62fec984c3e133a5f5d..d1383f233380f7c14445625ef7a57dc3df0a434f 100644 (file)
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -44,6 +44,23 @@
 static int  Open    ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
+#define NOISE_LONGTEXT N_("Enable noise reduction algorithm")
+#define REVERB_LONGTEXT N_("Enable reverberation" )
+#define REVERB_LEVEL_LONGTEXT N_( "Reverberation level (from 0 " \
+                "to 100, default value is 0)." )
+#define REVERB_DELAY_LONGTEXT N_("Reverberation delay, in ms." \
+                " Usual values are from to 40 to 200ms." )
+#define MEGABASS_LONGTEXT N_( "Enable megabass mode" )
+#define MEGABASS_LEVEL_LONGTEXT N_("Megabass mode level (from 0 to 100, " \
+                "default value is 0)." )
+#define MEGABASS_RANGE_LONGTEXT N_("Megabass mode cutoff frequency, in Hz." \
+                "This is the maximum frequency for which the megabass " \
+                "effect applies. Valid values are from 10 to 100 Hz" )
+#define SURROUND_LEVEL_LONGTEXT N_( "Surround effect level (from 0 to 100, " \
+                "default value is 0)." )
+#define SURROUND_DELAY_LONGTEXT N_("Surround delay, in ms. Usual values are " \
+                "from 5 to 40 ms" )
+
 vlc_module_begin();
     set_shortname( "MOD");
     set_description( _("MOD demuxer (libmodplug)" ) );
@@ -51,19 +68,29 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
 
-    add_bool( "mod-noisereduction", VLC_TRUE, NULL, N_("Noise reduction"), N_("Noise reduction"), VLC_FALSE );
-
-    add_bool( "mod-reverb", VLC_FALSE, NULL, N_("Reverb"), N_("Reverb"), VLC_FALSE );
-    add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL, N_("Reverb level (0-100)"), N_("Reverb level (0-100 defaults to 0)"), VLC_FALSE );
-    add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL, N_("Reverb delay (ms)"), N_("Reverb delay in ms (usually 40-200ms)"), VLC_FALSE );
-
-    add_bool( "mod-megabass", VLC_FALSE, NULL, N_("Mega bass"), N_("Mega bass"), VLC_FALSE );
-    add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, N_("Mega bass level (0-100)"), N_("Mega bass level (0-100 defaults to 0)"), VLC_FALSE );
-    add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, N_("Mega bass cut off (Hz)"), N_("Mega bass cut off (10-100Hz)"), VLC_FALSE );
-
-    add_bool( "mod-surround", VLC_FALSE, NULL, N_("Surround"), N_("Surround"), VLC_FALSE );
-    add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, N_("Surround level (0-100)"), N_("Surround level (0-100 defaults to 0)"), VLC_FALSE );
-    add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, N_("Surround delay (ms)"), N_("Surround delay in ms (usually 5-40ms)"), VLC_FALSE );
+    add_bool( "mod-noisereduction", VLC_TRUE, NULL, N_("Noise reduction"),
+              NOISE_LONGTEXT, VLC_FALSE );
+
+    add_bool( "mod-reverb", VLC_FALSE, NULL, N_("Reverb"),
+              REVERB_LONGTEXT, VLC_FALSE );
+    add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL,
+             N_("Reverberation level"), REVERB_LEVEL_LONGTEXT, VLC_TRUE );
+    add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL,
+             N_("Reverberation delay"), REVERB_DELAY_LONGTEXT, VLC_TRUE );
+
+    add_bool( "mod-megabass", VLC_FALSE, NULL, N_("Mega bass"),
+                    MEGABASS_LONGTEXT, VLC_FALSE );
+    add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL,
+              N_("Mega bass level"), MEGABASS_LEVEL_LONGTEXT, VLC_TRUE );
+    add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL,
+              N_("Mega bass cutoff"), MEGABASS_RANGE_LONGTEXT, VLC_TRUE );
+
+    add_bool( "mod-surround", VLC_FALSE, NULL, N_("Surround"), N_("Surround"),
+               VLC_FALSE );
+    add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL,
+              N_("Surround level"), SURROUND_LEVEL_LONGTEXT, VLC_TRUE );
+    add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL,
+              N_("Surround delay (ms)"), SURROUND_DELAY_LONGTEXT, VLC_TRUE );
 
     set_callbacks( Open, Close );
     add_shortcut( "mod" );

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index 60081ea06d3cca2b99dc88441c65978d92d7786d..a41fbbc08a2eb3c4c2a1d5264eebe5cb42c847ab 100644 (file)
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -44,7 +44,9 @@
  * Module descriptor
  *****************************************************************************/
 #define REPLAYGAIN_TYPE_TEXT N_("Replay Gain type" )
-#define REPLAYGAIN_TYPE_LONGTEXT N_( "Replay Gain type" )
+#define REPLAYGAIN_TYPE_LONGTEXT N_( "Musepack can have a title-specific " \
+              "replay gain (volume control) or an album-specific one. "  \
+              "Choose which type you want to use" )
 
 static int  Open  ( vlc_object_t * );
 static void Close ( vlc_object_t * );
@@ -54,7 +56,7 @@ static char *ppsz_replaygain_type[] = { N_("None"), N_("Title"), N_("Album") };
 
 vlc_module_begin();
     set_shortname( "MPC" );
-    set_description( _("MPC demuxer") );
+    set_description( _("MusePack demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 145 );

diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c
index b27c6b013cb4e7620d9fb9b56c7ccaabf9e4b930..03346368989ebeb0eb4f009f278eb346de6bd871 100644 (file)
--- a/modules/demux/mpeg/h264.c
+++ b/modules/demux/mpeg/h264.c
@@ -37,7 +37,7 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 #define FPS_TEXT N_("Frames per Second")
-#define FPS_LONGTEXT N_("Allows you to set the desired frame rate.")
+#define FPS_LONGTEXT N_("Desired frame rate for the H264 stream.")
 
 
 vlc_module_begin();

diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index cf9fc6ae05afac25a8f56230aed53078ce3b4d73..92f78b54dbb185af283d5531ddb3fdc334957af0 100644 (file)
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -43,7 +43,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("MPEG-I/II audio demuxer" ) );
+    set_description( _("MPEG audio / MP3 demuxer" ) );
     set_capability( "demux2", 100 );
     set_callbacks( Open, Close );
     add_shortcut( "mpga" );

diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c
index ca27fb76c2e412e12c075885a891a99a746bb436..b57e3945d79eaf7901ecdb8af8c636059aa5051a 100644 (file)
--- a/modules/demux/nsv.c
+++ b/modules/demux/nsv.c
@@ -154,6 +154,7 @@ static int Demux( demux_t *p_demux )
             msg_Warn( p_demux, "cannot peek" );
             return 0;
         }
+        fprintf( stderr, "4 first bytes Signature %x: %c%c%c%c\n", *(uint32_t*)p_peek ,p_peek[0], p_peek[1], p_peek[2],p_peek[3] );
 
         if( !strncmp( (char *)p_peek, "NSVf", 4 ) )
         {
@@ -172,6 +173,7 @@ static int Demux( demux_t *p_demux )
         }
         else if( GetWLE( p_peek ) == 0xbeef )
         {
+            fprintf( stderr, "Next frame\n");
             /* Next frame of the current NSVs chunk */
             if( stream_Read( p_demux->s, NULL, 2 ) < 2 )
             {
@@ -187,6 +189,7 @@ static int Demux( demux_t *p_demux )
             {
                 return -1;
             }
+            fprintf( stderr, "Resynchronized\n" );
         }
     }
 
@@ -393,14 +396,16 @@ static int ReSynch( demux_t *p_demux )
             return VLC_EGENERIC;
         }
         i_skip = 0;
-
+        fprintf( stderr, "Poke %i resync bytes\n", i_peek );
         while( i_skip < i_peek - 4 )
         {
             if( !strncmp( (char *)p_peek, "NSVf", 4 )
                     || !strncmp( (char *)p_peek, "NSVs", 4 ) )
             {
+                fprintf( stderr, "Found NSVx chunk after %i\n", i_skip );
                 if( i_skip > 0 )
                 {
+                    fprintf( stderr, "Skipping %i bytes\n", i_skip );
                     stream_Read( p_demux->s, NULL, i_skip );
                 }
                 return VLC_SUCCESS;

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 42f74b734c530f8d5ab7395456423c44a9cdd11d..5e42ad572dd1bb15e8ef0e12d56501a39ace65bb 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -40,7 +40,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Ogg stream demuxer" ) );
+    set_shortname ( "OGG" );
+    set_description( _("OGG demuxer" ) );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 50 );

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index b594be22a825dee9bb56e437808836903e5aa1b5..13cff3be9d29606b371da35700b0357a14d86345 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -34,16 +34,16 @@
  * Module descriptor
  *****************************************************************************/
 #define AUTOSTART_TEXT N_( "Auto start" )
-#define AUTOSTART_LONGTEXT N_( "Automatically start the playlist when " \
-    "it's loaded.\n" )
+#define AUTOSTART_LONGTEXT N_( "Automatically start playing the playlist " \
+                "content once it's loaded.\n" )
 
 vlc_module_begin();
     add_shortcut( "playlist" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
 
-    add_bool( "playlist-autostart", 1, NULL, AUTOSTART_TEXT, AUTOSTART_LONGTEXT,
-              VLC_FALSE );
+    add_bool( "playlist-autostart", 1, NULL,
+              AUTOSTART_TEXT, AUTOSTART_LONGTEXT, VLC_FALSE );
 
     set_shortname( _("Playlist") );
     set_description( _("Playlist") );
@@ -80,7 +80,7 @@ vlc_module_begin();
         set_capability( "demux2", 10 );
         set_callbacks( E_(Import_DVB), E_(Close_DVB) );
     add_submodule();
-        set_description( _("Podcast playlist import") );
+        set_description( _("Podcast parser") );
         add_shortcut( "podcast" );
         set_capability( "demux2", 10 );
         set_callbacks( E_(Import_podcast), E_(Close_podcast) );

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index aefb3bbe5b8cdf41de38b183dad7460c6e195f31..40fd3e517df4e8a58b3fc68bf29719e9312ad1df 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -44,7 +44,7 @@ static int  OpenAlt( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("PS demuxer") );
+    set_description( _("MPEG-PS demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 1 );
@@ -52,7 +52,7 @@ vlc_module_begin();
     add_shortcut( "ps" );
 
     add_submodule();
-    set_description( _("PS demuxer") );
+    set_description( _("MPEG-PS demuxer") );
     set_capability( "demux2", 9 );
     set_callbacks( OpenAlt, Close );
 vlc_module_end();

diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c
index 8ce5c8557b0760f81c99888c278f3cf7688278c2..7743ece444423d49b8daa1373d11df0813cbd1e2 100644 (file)
--- a/modules/demux/rawdv.c
+++ b/modules/demux/rawdv.c
@@ -36,7 +36,8 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("raw DV demuxer") );
+    set_shortname( "DV" );
+    set_description( _("DV (Digital Video) demuxer") );
     set_capability( "demux2", 2 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );

diff --git a/modules/demux/sgimb.c b/modules/demux/sgimb.c
index 69fbc67fd42cd3530a5655216ec6b9966cabe976..0f0eb04a5b9c019a60405358aaa3f4287975f87d 100644 (file)
--- a/modules/demux/sgimb.c
+++ b/modules/demux/sgimb.c
@@ -110,7 +110,7 @@ static int  Activate  ( vlc_object_t * );
 static void Deactivate( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Kasenna MediaBase metademux") );
+    set_description( _("Kasenna MediaBase parser") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 170 );

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 4f5f4683aa1b9ab5ed6f914e81ebe0081823c057..1988e26074dadd81c6b8f9303b3901c47b52e307 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -44,13 +44,15 @@ static int  Open ( vlc_object_t *p_this );
 static void Close( vlc_object_t *p_this );
 
 #define SUB_DELAY_LONGTEXT \
-    "Delay subtitles (in 1/10s)"
+    "Apply a delay to all subtitles (in 1/10s, eg 100 means 10s)."
 #define SUB_FPS_LONGTEXT \
-    "Override frames per second. " \
-    "It will only work with MicroDVD subtitles."
+    "Override the normal frames per second settings. " \
+    "This will only work with MicroDVD and SubRIP (SRT) subtitles."
 #define SUB_TYPE_LONGTEXT \
-    "One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \
-    "\"sami\", \"dvdsubtitle\" (auto for autodetection, it should always work)."
+    "Force the subtiles format. Valid values are : \"microdvd\", \"subrip\"," \
+    "\"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \
+    "\"sami\", \"dvdsubtitle\" and \"auto\" (meaning autodetection, this " \
+    "should always work)."
 static char *ppsz_sub_type[] =
 {
     "auto", "microdvd", "subrip", "subviewer", "ssa1",
@@ -59,7 +61,7 @@ static char *ppsz_sub_type[] =
 
 vlc_module_begin();
     set_shortname( _("Subtitles"));
-    set_description( _("Text subtitles demux") );
+    set_description( _("Text subtitles parser") );
     set_capability( "demux2", 0 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
@@ -69,7 +71,7 @@ vlc_module_begin();
     add_integer( "sub-delay", 0, NULL,
                N_("Subtitles delay"),
                SUB_DELAY_LONGTEXT, VLC_TRUE );
-    add_string( "sub-type", "auto", NULL, "Subtitles fileformat",
+    add_string( "sub-type", "auto", NULL, N_("Subtitles format"),
                 SUB_TYPE_LONGTEXT, VLC_TRUE );
         change_string_list( ppsz_sub_type, 0, 0 );
     set_callbacks( Open, Close );

diff --git a/modules/demux/util/id3tag.c b/modules/demux/util/id3tag.c
index 15ad5f3d41cd414a4eba2b7c46a19ba010a90626..a7169392b138e00ccfdc40933dd217d34c4233f2 100644 (file)
--- a/modules/demux/util/id3tag.c
+++ b/modules/demux/util/id3tag.c
@@ -47,9 +47,9 @@ static int  ParseID3Tags ( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-set_description( _("ID3 tag parser using libid3tag" ) );
-set_capability( "id3", 70 );
-set_callbacks( ParseID3Tags, NULL );
+    set_description( _("ID3 tags parser" ) );
+    set_capability( "id3", 70 );
+    set_callbacks( ParseID3Tags, NULL );
 vlc_module_end();
 
 /*****************************************************************************

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 91f3dee15dc83ab76ac7ee976ce6c74c8269e8aa..c8faad910cb91b43d6017864f9e7448047c9f26b 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -45,11 +45,11 @@ static int  Open ( vlc_object_t *p_this );
 static void Close( vlc_object_t *p_this );
 
 vlc_module_begin();
-    set_description( _("Vobsub subtitles demux") );
+    set_description( _("Vobsub subtitles parser") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 1 );
-    
+
     set_callbacks( Open, Close );
 
     add_shortcut( "vobsub" );