* Fixed misc typos in strings,

* Updated po files,
* New --buggy-psi options, to supports streams which don't update the
continuity counter in their PSI packets (walkenizes #sam).

modules/access/http.c

@@ -2,7 +2,7 @@
  * http.c: HTTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.22 2003/02/07 23:36:55 marcari Exp $
+ * $Id: http.c,v 1.23 2003/02/08 19:10:20 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -78,7 +78,7 @@ static ssize_t Read    ( input_thread_t *, byte_t *, size_t );
 #define PROXY_TEXT N_("specify an HTTP proxy")
 #define PROXY_LONGTEXT N_( \
     "Specify an HTTP proxy to use. It must be in the form " \
-    "http://myproxy.mydomain:myport . If none is specified, the HTTP_PROXY" \
+    "http://myproxy.mydomain:myport. If none is specified, the HTTP_PROXY " \
     "environment variable will be tried." )
 
 #define CACHING_TEXT N_("caching value in ms")

modules/audio_output/file.c

@@ -2,7 +2,7 @@
  * file.c : audio output which writes the samples to a file
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: file.c,v 1.14 2002/11/11 19:16:21 gbazin Exp $
+ * $Id: file.c,v 1.15 2003/02/08 19:10:20 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -80,9 +80,9 @@ static void    Play        ( aout_instance_t * );
  * Module descriptor
  *****************************************************************************/
 #define FORMAT_TEXT N_("output format")
-#define FORMAT_LONGTEXT N_("one of \"u8\", \"s8\", \"u16\", \"s16\"," \
-                        " \"u16_le\", \"s16_le\", \"u16_be\"," \
-                        " \"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
+#define FORMAT_LONGTEXT N_("one of \"u8\", \"s8\", \"u16\", \"s16\", " \
+                        "\"u16_le\", \"s16_le\", \"u16_be\", " \
+                        "\"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
 #define WAV_TEXT N_("add wave header")
 #define WAV_LONGTEXT N_("instead of writing a raw file, you can add a wav " \
                         "header to the file")

modules/codec/ffmpeg/ffmpeg.c

@@ -2,7 +2,7 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.22 2002/12/18 15:03:48 sam Exp $
+ * $Id: ffmpeg.c,v 1.23 2003/02/08 19:10:21 massiot Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -65,7 +65,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
  *****************************************************************************/
 
 #define ERROR_RESILIENCE_LONGTEXT \
-    "ffmpeg can make errors resiliences.          \n"\
+    "ffmpeg can make errors resiliences.          \n" \
     "Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) " \
     "this will produce a lot of errors.\n" \
     "Valid range is -1 to 99 (-1 disable all errors resiliences)."
@@ -78,14 +78,14 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
 #define POSTPROCESSING_Q_LONGTEXT \
     "Quality of post processing\n"\
     "Valid range is 0 to 6\n" \
-    "( Overridden by others setting)"
+    "(Overridden by others setting)"
     
 #define POSTPROCESSING_AQ_LONGTEXT \
-    "Post processing quality is selected upon time left" \
+    "Post processing quality is selected upon time left " \
     "but no more than requested quality\n" \
     "Not yet implemented !"
 
-#define WORAROUND_BUG_LONGTEXT \
+#define WORKAROUND_BUGS_LONGTEXT \
     "Try to fix some bugs\n" \
     "1  autodetect\n" \
     "2  old msmpeg4\n" \
@@ -96,7 +96,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
     "64 Qpel chroma"
 
 vlc_module_begin();
-    add_category_hint( N_("Ffmpeg"), NULL );
+    add_category_hint( N_("ffmpeg"), NULL );
 #if LIBAVCODEC_BUILD >= 4615
     add_bool( "ffmpeg-dr", 0, NULL,
               "direct rendering", 
@@ -106,7 +106,7 @@ vlc_module_begin();
     add_integer ( "ffmpeg-error-resilience", -1, NULL, 
                   "error resilience", ERROR_RESILIENCE_LONGTEXT );
     add_integer ( "ffmpeg-workaround-bugs", 1, NULL, 
-                  "workaround bugs", WORAROUND_BUG_LONGTEXT );
+                  "workaround bugs", WORKAROUND_BUGS_LONGTEXT );
 #endif
     add_bool( "ffmpeg-hurry-up", 0, NULL, "hurry up", HURRY_UP_LONGTEXT );
     

modules/demux/mpeg/system.c

@@ -2,7 +2,7 @@
  * system.c: helper module for TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: system.c,v 1.9 2003/02/04 11:07:45 massiot Exp $
+ * $Id: system.c,v 1.10 2003/02/08 19:10:21 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -1154,6 +1154,8 @@ static void DemuxTS( input_thread_t * p_input, data_packet_t * p_data,
     es_descriptor_t *   p_es = NULL;
     es_ts_data_t *      p_es_demux = NULL;
     pgrm_ts_data_t *    p_pgrm_demux = NULL;
+    stream_ts_data_t *  p_stream_demux =
+                          (stream_ts_data_t *)p_input->stream.p_demux_data;
 
 #define p (p_data->p_demux_start)
     /* Extract flags values from TS common header. */
@@ -1175,7 +1177,7 @@ static void DemuxTS( input_thread_t * p_input, data_packet_t * p_data,
         }
     }
 
-    p_es= input_FindES( p_input, i_pid );
+    p_es = input_FindES( p_input, i_pid );
 
     if( (p_es != NULL) && (p_es->p_demux_data != NULL) )
     {
@@ -1210,7 +1212,7 @@ static void DemuxTS( input_thread_t * p_input, data_packet_t * p_data,
     /* Don't change the order of the tests : if b_psi then p_pgrm_demux
      * may still be null. Who said it was ugly ?
      * I have written worse. --Meuuh */
-    if( ( p_es  ) &&
+    if( ( p_es ) &&
         ((p_es->p_decoder_fifo != NULL) || b_psi || b_pcr ) )
     {
         p_es->c_packets++;
@@ -1273,7 +1275,7 @@ static void DemuxTS( input_thread_t * p_input, data_packet_t * p_data,
         } /* has adaptation field */
         /* Check the continuity of the stream. */
         i_dummy = ((p[3] & 0x0f) - p_es_demux->i_continuity_counter) & 0x0f;
-        if( i_dummy == 1 )
+        if( i_dummy == 1 || (b_psi && p_stream_demux->b_buggy_psi) )
         {
             /* Everything is ok, just increase our counter */
             (p_es_demux->i_continuity_counter)++;

modules/demux/mpeg/system.h

@@ -2,7 +2,7 @@
  * system.h: MPEG demultiplexing.
  *****************************************************************************
  * Copyright (C) 1999-2002 VideoLAN
- * $Id: system.h,v 1.4 2003/01/08 16:40:29 fenrir Exp $
+ * $Id: system.h,v 1.5 2003/02/08 19:10:21 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -263,8 +263,9 @@ typedef struct pgrm_ts_data_t
  *****************************************************************************/
 typedef struct stream_ts_data_t
 {
-    int i_pat_version;          /* Current version of the PAT */
-    /* libdvbpsi pmt decoder handle */
+    int                     i_pat_version; /* Current version of the PAT */
+    vlc_bool_t              b_buggy_psi;
+    /* libdvbpsi PMT decoder handle */
     void *                  p_pat_handle;
 } stream_ts_data_t;
 

modules/demux/mpeg/ts.c

@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: ts.c,v 1.15 2003/02/04 11:07:45 massiot Exp $
+ * $Id: ts.c,v 1.16 2003/02/08 19:10:21 massiot Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -100,6 +100,11 @@ static void TS_DVBPSI_HandlePMT ( input_thread_t *, dvbpsi_pmt_t * );
     "0.3.x and 0.4. By default VLC assumes you have the latest VLS. In case " \
     "you're using an old version, select this option.")
 
+#define BUGGY_PSI_TEXT N_("buggy PSI")
+#define BUGGY_PSI_LONGTEXT N_( \
+    "If you have a stream whose PSI packets do not feature incremented " \
+    "continuity counters, select this option.")
+
 vlc_module_begin();
 #if defined MODULE_NAME_IS_ts
     set_description( _("ISO 13818-1 MPEG Transport Stream input") );
@@ -113,6 +118,7 @@ vlc_module_begin();
     add_category_hint( N_("Miscellaneous"), NULL );
     add_bool( "vls-backwards-compat", 0, NULL,
               VLS_BACKWARDS_COMPAT_TEXT, VLS_BACKWARDS_COMPAT_LONGTEXT );
+    add_bool( "buggy-psi", 0, NULL, BUGGY_PSI_TEXT, BUGGY_PSI_LONGTEXT );
     set_callbacks( Activate, Deactivate );
 vlc_module_end();
 
@@ -192,6 +198,7 @@ static int Activate( vlc_object_t * p_this )
 
     p_stream_data = (stream_ts_data_t *)p_input->stream.p_demux_data;
     p_stream_data->i_pat_version = PAT_UNINITIALIZED ;
+    p_stream_data->b_buggy_psi = config_GetInt( p_input, "buggy-psi" );
 
 #ifdef MODULE_NAME_IS_ts_dvbpsi
     p_stream_data->p_pat_handle = (dvbpsi_handle *)
@@ -756,20 +763,20 @@ static void TS_DVBPSI_DemuxPSI( input_thread_t  * p_input,
     pgrm_ts_data_t      * p_pgrm_demux_data;
     stream_ts_data_t    * p_stream_demux_data;
 
-    p_es_demux_data = ( es_ts_data_t * ) p_es->p_demux_data;
-    p_stream_demux_data = ( stream_ts_data_t * ) p_input->stream.p_demux_data;
+    p_es_demux_data = (es_ts_data_t *)p_es->p_demux_data;
+    p_stream_demux_data = (stream_ts_data_t *) p_input->stream.p_demux_data;
 
     switch( p_es_demux_data->i_psi_type)
     {
         case PSI_IS_PAT:
             dvbpsi_PushPacket(
-                    ( dvbpsi_handle ) p_stream_demux_data->p_pat_handle,
+                    (dvbpsi_handle)p_stream_demux_data->p_pat_handle,
                     p_data->p_demux_start );
             break;
         case PSI_IS_PMT:
             p_pgrm_demux_data = ( pgrm_ts_data_t * )p_es->p_pgrm->p_demux_data;
             dvbpsi_PushPacket(
-                    ( dvbpsi_handle ) p_pgrm_demux_data->p_pmt_handle,
+                    (dvbpsi_handle)p_pgrm_demux_data->p_pmt_handle,
                     p_data->p_demux_start );
             break;
         default:

modules/demux/util/sub.c

@@ -2,7 +2,7 @@
  * sub.c
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: sub.c,v 1.3 2003/01/23 09:00:36 fenrir Exp $
+ * $Id: sub.c,v 1.4 2003/02/08 19:10:21 massiot Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -60,11 +60,11 @@ static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", NULL };
  *****************************************************************************/
 
 #define SUB_FPS_LONGTEXT \
-    "Override frames per second" \
+    "Override frames per second. " \
     "It will work only with MicroDVD"
 #define SUB_TYPE_LONGTEXT \
-    "One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\"" \
-    "(nothing for autodetection, It should always work)"
+    "One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\" " \
+    "(nothing for autodetection, it should always work)"
 
 vlc_module_begin();
     set_description( _("text subtitle demux") );

modules/gui/macosx/controls.m

@@ -2,7 +2,7 @@
  * controls.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: controls.m,v 1.22 2003/02/08 17:26:00 massiot Exp $
+ * $Id: controls.m,v 1.23 2003/02/08 19:10:21 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -569,7 +569,7 @@
         NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
         
         [o_open_panel setAllowsMultipleSelection: NO];
-        [o_open_panel setTitle: _NS("Open subtitlefile")];
+        [o_open_panel setTitle: _NS("Open subtitle file")];
         [o_open_panel setPrompt: _NS("Open")];
     
         if( [o_open_panel runModalForDirectory: nil 

modules/gui/win32/strings.cpp

@@ -152,6 +152,7 @@
 
   Caption = _( "Messages" );
     Caption = _( "OK" );
+      Caption = _( "&Copy text" );
 
 /*
  * from modules/gui/win32/network.dfm:

src/libvlc.h

@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.40 2003/02/02 00:29:29 sam Exp $
+ * $Id: libvlc.h,v 1.41 2003/02/08 19:10:22 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -323,12 +323,12 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
 
 #define THREE_DN_TEXT N_("enable CPU 3D Now! support")
 #define THREE_DN_LONGTEXT N_( \
-    "If your processor supports the 3D Now! instructions set, VLC can take "\
+    "If your processor supports the 3D Now! instructions set, VLC can take " \
     "advantage of them.")
 
 #define MMXEXT_TEXT N_("enable CPU MMX EXT support")
 #define MMXEXT_LONGTEXT N_( \
-    "If your processor supports the MMX EXT instructions set, VLC can take "\
+    "If your processor supports the MMX EXT instructions set, VLC can take " \
     "advantage of them.")
 
 #define SSE_TEXT N_("enable CPU SSE support")
@@ -338,7 +338,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
 
 #define ALTIVEC_TEXT N_("enable CPU AltiVec support")
 #define ALTIVEC_LONGTEXT N_( \
-    "If your processor supports the AltiVec instructions set, VLC can take "\
+    "If your processor supports the AltiVec instructions set, VLC can take " \
     "advantage of them.")
 
 #define RANDOM_TEXT N_("play files randomly forever")