* 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:

po/en_GB.po

@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-02-03 01:40+0100\n"
+"POT-Creation-Date: 2003-02-08 19:56+0100\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: \n"
@@ -31,44 +31,44 @@ msgid "C"
 msgstr "en_GB"
 
 #. Usage
-#: src/libvlc.c:296 src/libvlc.c:1291
+#: src/libvlc.c:296 src/libvlc.c:1275
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1148 src/misc/configuration.c:916
+#: src/libvlc.c:1132 src/misc/configuration.c:916
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1166 src/misc/configuration.c:901
+#: src/libvlc.c:1150 src/misc/configuration.c:901
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1169 src/misc/configuration.c:908
+#: src/libvlc.c:1153 src/misc/configuration.c:908
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:1175
+#: src/libvlc.c:1159
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:1176
+#: src/libvlc.c:1160
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:1266 src/libvlc.c:1321 src/libvlc.c:1345
+#: src/libvlc.c:1250 src/libvlc.c:1305 src/libvlc.c:1329
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
-#: src/libvlc.c:1294
+#: src/libvlc.c:1278
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1339
+#: src/libvlc.c:1323
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -770,13 +770,13 @@ msgstr ""
 #. Audio options
 #: src/libvlc.h:437 modules/audio_output/file.c:108
 #: modules/gui/gtk/gnome_interface.c:1133 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:303
+#: modules/gui/macosx/intf.m:330
 msgid "Audio"
 msgstr ""
 
 #. Video options
 #: src/libvlc.h:449 modules/gui/gtk/gnome_interface.c:1140
-#: modules/gui/gtk/gtk_interface.c:1337 modules/gui/macosx/intf.m:310
+#: modules/gui/gtk/gtk_interface.c:1337 modules/gui/macosx/intf.m:337
 #: modules/misc/dummy/dummy.c:64 modules/video_output/directx/directx.c:107
 msgid "Video"
 msgstr ""
@@ -798,7 +798,7 @@ msgstr ""
 #. Stream output options
 #: src/libvlc.h:510 modules/gui/gtk/gnome_interface.c:2149
 #: modules/gui/gtk/gtk_interface.c:2468 modules/gui/gtk/gtk_interface.c:3150
-#: modules/gui/macosx/open.m:209 modules/gui/win32/strings.cpp:220
+#: modules/gui/macosx/open.m:209 modules/gui/win32/strings.cpp:221
 msgid "Stream output"
 msgstr ""
 
@@ -811,9 +811,9 @@ msgstr ""
 #: src/libvlc.h:535 modules/gui/gtk/gnome_interface.c:648
 #: modules/gui/gtk/gnome_interface.c:2500
 #: modules/gui/gtk/gnome_interface.c:2525 modules/gui/gtk/gtk_interface.c:752
-#: modules/gui/gtk/gtk_interface.c:2813 modules/gui/macosx/intf.m:249
-#: modules/gui/macosx/intf.m:319 modules/gui/win32/strings.cpp:120
-#: modules/gui/win32/strings.cpp:179
+#: modules/gui/gtk/gtk_interface.c:2813 modules/gui/macosx/intf.m:275
+#: modules/gui/macosx/intf.m:349 modules/gui/win32/strings.cpp:120
+#: modules/gui/win32/strings.cpp:180
 msgid "Playlist"
 msgstr ""
 
@@ -821,7 +821,7 @@ msgstr ""
 #: src/libvlc.h:542 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
-#: modules/demux/mpeg/ts.c:113 modules/gui/familiar/familiar.c:69
+#: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:69
 #: modules/gui/win32/win32.cpp:308 modules/misc/logger/logger.c:85
 #: modules/video_filter/clone.c:58 modules/video_filter/crop.c:61
 #: modules/video_filter/deinterlace/deinterlace.c:81
@@ -860,6 +860,34 @@ msgstr ""
 msgid "boolean"
 msgstr ""
 
+#: src/audio_output/output.c:72 src/audio_output/output.c:139
+msgid "Reverse stereo"
+msgstr ""
+
+#: src/audio_output/output.c:77 src/audio_output/output.c:103
+#: src/audio_output/output.c:132 modules/audio_output/alsa.c:182
+#: modules/audio_output/alsa.c:333 modules/audio_output/oss.c:208
+#: modules/audio_output/oss.c:317 modules/audio_output/sdl.c:114
+#: modules/audio_output/sdl.c:177 modules/audio_output/sdl.c:188
+#: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:362
+msgid "Stereo"
+msgstr ""
+
+#: src/audio_output/output.c:82 src/audio_output/output.c:105
+#: src/audio_output/output.c:113 src/audio_output/output.c:135
+#: src/audio_output/output.c:145
+msgid "Left"
+msgstr ""
+
+#: src/audio_output/output.c:86 src/audio_output/output.c:107
+#: src/audio_output/output.c:137
+msgid "Right"
+msgstr ""
+
+#: src/audio_output/output.c:90 src/audio_output/output.c:128
+msgid "Dolby Surround"
+msgstr ""
+
 #: include/interface.h:72
 msgid ""
 "\n"
@@ -909,7 +937,7 @@ msgstr ""
 #. ****************************************************************************
 #. * Module descriptor
 #. ****************************************************************************
-#: modules/access/file.c:63 modules/access/http.c:79 modules/access/udp.c:70
+#: modules/access/file.c:63 modules/access/http.c:84 modules/access/udp.c:75
 msgid "caching value in ms"
 msgstr ""
 
@@ -930,42 +958,42 @@ msgstr ""
 #. ****************************************************************************
 #. * Module descriptor
 #. ****************************************************************************
-#: modules/access/http.c:73
+#: modules/access/http.c:78
 msgid "specify an HTTP proxy"
 msgstr ""
 
-#: modules/access/http.c:75
+#: modules/access/http.c:80
 msgid ""
 "Specify an HTTP proxy to use. It must be in the form http://myproxy.mydomain:"
-"myport . If none is specified, the HTTP_PROXYenvironment variable will be "
+"myport. If none is specified, the HTTP_PROXY environment variable will be "
 "tried."
 msgstr ""
 
-#: modules/access/http.c:81
+#: modules/access/http.c:86
 msgid ""
 "Allows you to modify the default caching value for http streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/http.c:85
+#: modules/access/http.c:90
 msgid "http"
 msgstr ""
 
-#: modules/access/http.c:88
+#: modules/access/http.c:93
 msgid "HTTP access module"
 msgstr ""
 
-#: modules/access/udp.c:72
+#: modules/access/udp.c:77
 msgid ""
 "Allows you to modify the default caching value for udp streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/udp.c:76
+#: modules/access/udp.c:81
 msgid "raw UDP access module"
 msgstr ""
 
-#: modules/access/udp.c:77
+#: modules/access/udp.c:82
 msgid "udp"
 msgstr ""
 
@@ -1106,7 +1134,7 @@ msgstr ""
 msgid "Try to use S/PDIF output"
 msgstr ""
 
-#: modules/audio_output/alsa.c:92 modules/audio_output/oss.c:96
+#: modules/audio_output/alsa.c:92 modules/audio_output/oss.c:110
 msgid ""
 "Sometimes we attempt to use the S/PDIF output, even if nothing is connected "
 "to it. Un-checking this option disables this behaviour, and permanently "
@@ -1127,35 +1155,27 @@ msgstr ""
 
 #. Open the device
 #: modules/audio_output/alsa.c:126 modules/audio_output/alsa.c:314
-#: modules/audio_output/oss.c:138 modules/audio_output/oss.c:284
+#: modules/audio_output/oss.c:152 modules/audio_output/oss.c:298
 #: modules/audio_output/waveout.c:208 modules/audio_output/waveout.c:315
 msgid "A/52 over S/PDIF"
 msgstr ""
 
 #: modules/audio_output/alsa.c:177 modules/audio_output/alsa.c:339
-#: modules/audio_output/oss.c:213 modules/audio_output/oss.c:309
+#: modules/audio_output/oss.c:227 modules/audio_output/oss.c:323
 #: modules/audio_output/sdl.c:119 modules/audio_output/sdl.c:178
 #: modules/audio_output/sdl.c:190 modules/audio_output/sdl.c:198
 #: modules/audio_output/waveout.c:376
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:182 modules/audio_output/alsa.c:333
-#: modules/audio_output/oss.c:194 modules/audio_output/oss.c:303
-#: modules/audio_output/sdl.c:114 modules/audio_output/sdl.c:177
-#: modules/audio_output/sdl.c:188 modules/audio_output/sdl.c:194
-#: modules/audio_output/waveout.c:362
-msgid "Stereo"
-msgstr ""
-
-#: modules/audio_output/alsa.c:318 modules/audio_output/oss.c:173
-#: modules/audio_output/oss.c:288 modules/audio_output/waveout.c:226
+#: modules/audio_output/alsa.c:318 modules/audio_output/oss.c:187
+#: modules/audio_output/oss.c:302 modules/audio_output/waveout.c:226
 #: modules/audio_output/waveout.c:331
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:326 modules/audio_output/oss.c:182
-#: modules/audio_output/oss.c:296 modules/audio_output/waveout.c:233
+#: modules/audio_output/alsa.c:326 modules/audio_output/oss.c:196
+#: modules/audio_output/oss.c:310 modules/audio_output/waveout.c:233
 #: modules/audio_output/waveout.c:348
 msgid "2 Front 2 Rear"
 msgstr ""
@@ -1208,30 +1228,30 @@ msgstr ""
 #. ****************************************************************************
 #. * Module descriptor
 #. ****************************************************************************
-#: modules/audio_output/oss.c:88
+#: modules/audio_output/oss.c:102
 msgid "try to work around buggy OSS drivers"
 msgstr ""
 
-#: modules/audio_output/oss.c:90
+#: modules/audio_output/oss.c:104
 msgid ""
 "Some buggy OSS drivers just don't like when their internal buffers are "
 "completely filled (the sound gets heavily hashed). If you have one of these "
 "drivers, then you need to enable this option."
 msgstr ""
 
-#: modules/audio_output/oss.c:94
+#: modules/audio_output/oss.c:108
 msgid "try to use S/PDIF output"
 msgstr ""
 
-#: modules/audio_output/oss.c:101
+#: modules/audio_output/oss.c:115
 msgid "OSS"
 msgstr ""
 
-#: modules/audio_output/oss.c:103
+#: modules/audio_output/oss.c:117
 msgid "OSS dsp device"
 msgstr ""
 
-#: modules/audio_output/oss.c:106
+#: modules/audio_output/oss.c:120
 msgid "Linux OSS /dev/dsp module"
 msgstr ""
 
@@ -1288,7 +1308,7 @@ msgid "AAC decoder module (libfaad2)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:99
-msgid "Ffmpeg"
+msgid "ffmpeg"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:113
@@ -1499,11 +1519,21 @@ msgid ""
 "using an old version, select this option."
 msgstr ""
 
+#: modules/demux/mpeg/ts.c:103
+msgid "buggy PSI"
+msgstr ""
+
 #: modules/demux/mpeg/ts.c:105
+msgid ""
+"If you have a stream whose PSI packets do not feature incremented continuity "
+"counters, select this option."
+msgstr ""
+
+#: modules/demux/mpeg/ts.c:110
 msgid "ISO 13818-1 MPEG Transport Stream input"
 msgstr ""
 
-#: modules/demux/mpeg/ts.c:109
+#: modules/demux/mpeg/ts.c:114
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
@@ -1546,7 +1576,7 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:90 modules/gui/macosx/open.m:387
 #: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:584
-#: modules/gui/macosx/open.m:846 modules/gui/macosx/controls.m:524
+#: modules/gui/macosx/open.m:846 modules/gui/macosx/controls.m:573
 msgid "Open"
 msgstr ""
 
@@ -1558,8 +1588,8 @@ msgstr ""
 #. * from modules/gui/win32/preferences.dfm:
 #.
 #: modules/gui/familiar/interface.c:103 modules/gui/familiar/interface.c:104
-#: modules/gui/macosx/intf.m:256 modules/gui/macosx/intf.m:268
-#: modules/gui/macosx/prefs.m:191 modules/gui/win32/strings.cpp:210
+#: modules/gui/macosx/intf.m:282 modules/gui/macosx/intf.m:295
+#: modules/gui/macosx/prefs.m:191 modules/gui/win32/strings.cpp:211
 msgid "Preferences"
 msgstr ""
 
@@ -1573,8 +1603,8 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:131 modules/gui/gtk/gnome_interface.c:607
 #: modules/gui/gtk/gnome_interface.c:1061 modules/gui/gtk/gtk_interface.c:714
-#: modules/gui/gtk/gtk_interface.c:1160 modules/gui/macosx/intf.m:777
-#: modules/gui/macosx/intf.m:778 modules/gui/macosx/intf.m:779
+#: modules/gui/gtk/gtk_interface.c:1160 modules/gui/macosx/intf.m:809
+#: modules/gui/macosx/intf.m:810 modules/gui/macosx/intf.m:811
 #: modules/gui/win32/strings.cpp:102
 msgid "Pause"
 msgstr ""
@@ -1586,11 +1616,11 @@ msgstr ""
 #. dock menu
 #: modules/gui/familiar/interface.c:144 modules/gui/gtk/gnome_interface.c:595
 #: modules/gui/gtk/gnome_interface.c:1054 modules/gui/gtk/gtk_interface.c:703
-#: modules/gui/macosx/intf.m:252 modules/gui/macosx/intf.m:290
-#: modules/gui/macosx/intf.m:331 modules/gui/macosx/intf.m:784
-#: modules/gui/macosx/intf.m:785 modules/gui/macosx/intf.m:786
-#: modules/gui/macosx/playlist.m:101 modules/gui/win32/strings.cpp:100
-#: modules/gui/win32/strings.cpp:203
+#: modules/gui/macosx/intf.m:278 modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:361 modules/gui/macosx/intf.m:816
+#: modules/gui/macosx/intf.m:817 modules/gui/macosx/intf.m:818
+#: modules/gui/macosx/playlist.m:122 modules/gui/win32/strings.cpp:100
+#: modules/gui/win32/strings.cpp:204
 msgid "Play"
 msgstr ""
 
@@ -1600,9 +1630,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:157 modules/gui/gtk/gnome_interface.c:571
 #: modules/gui/gtk/gnome_interface.c:1068 modules/gui/gtk/gtk_interface.c:681
-#: modules/gui/gtk/gtk_interface.c:1168 modules/gui/macosx/intf.m:253
-#: modules/gui/macosx/intf.m:291 modules/gui/macosx/intf.m:332
-#: modules/gui/macosx/controls.m:637 modules/gui/win32/strings.cpp:104
+#: modules/gui/gtk/gtk_interface.c:1168 modules/gui/macosx/intf.m:279
+#: modules/gui/macosx/intf.m:318 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/controls.m:688 modules/gui/win32/strings.cpp:104
 msgid "Stop"
 msgstr ""
 
@@ -1628,7 +1658,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:231 modules/gui/win32/strings.cpp:167
+#: modules/gui/familiar/interface.c:231 modules/gui/win32/strings.cpp:168
 msgid "URL:"
 msgstr ""
 
@@ -1659,12 +1689,12 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:348 modules/gui/gtk/preferences.c:592
 #: modules/gui/gtk/preferences.c:609 modules/gui/macosx/open.m:758
-#: modules/gui/win32/strings.cpp:212
+#: modules/gui/win32/strings.cpp:213
 msgid "Save"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:358 modules/gui/gtk/preferences.c:605
-#: modules/gui/macosx/prefs.m:553 modules/gui/win32/strings.cpp:211
+#: modules/gui/macosx/prefs.m:553 modules/gui/win32/strings.cpp:212
 msgid "Apply"
 msgstr ""
 
@@ -1672,9 +1702,9 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2761 modules/gui/gtk/gtk_interface.c:2992
 #: modules/gui/gtk/gtk_interface.c:3373 modules/gui/gtk/preferences.c:613
 #: modules/gui/macosx/prefs.m:549 modules/gui/macosx/open.m:170
-#: modules/gui/win32/strings.cpp:27 modules/gui/win32/strings.cpp:173
-#: modules/gui/win32/strings.cpp:214 modules/gui/win32/strings.cpp:233
-#: modules/gui/win32/strings.cpp:249
+#: modules/gui/win32/strings.cpp:27 modules/gui/win32/strings.cpp:174
+#: modules/gui/win32/strings.cpp:215 modules/gui/win32/strings.cpp:234
+#: modules/gui/win32/strings.cpp:250
 msgid "Cancel"
 msgstr ""
 
@@ -1864,31 +1894,31 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:950
 #: modules/gui/gtk/gtk_interface.c:457 modules/gui/gtk/gtk_interface.c:1294
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/controls.m:670
+#: modules/gui/macosx/intf.m:331 modules/gui/macosx/controls.m:721
 msgid "Volume Up"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:957
 #: modules/gui/gtk/gtk_interface.c:464 modules/gui/gtk/gtk_interface.c:1301
-#: modules/gui/macosx/intf.m:305 modules/gui/macosx/controls.m:671
+#: modules/gui/macosx/intf.m:332 modules/gui/macosx/controls.m:722
 msgid "Volume Down"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:964
 #: modules/gui/gtk/gtk_interface.c:471 modules/gui/gtk/gtk_interface.c:1308
-#: modules/gui/macosx/intf.m:306 modules/gui/macosx/controls.m:686
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/controls.m:737
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:972
 #: modules/gui/gtk/gtk_interface.c:486 modules/gui/gtk/gtk_interface.c:1323
-#: modules/gui/macosx/intf.m:307 modules/gui/win32/strings.cpp:81
+#: modules/gui/macosx/intf.m:334 modules/gui/win32/strings.cpp:81
 msgid "Channels"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:979
 #: modules/gui/gtk/gtk_interface.c:493 modules/gui/gtk/gtk_interface.c:1330
-#: modules/gui/macosx/intf.m:308 modules/gui/win32/strings.cpp:80
+#: modules/gui/macosx/intf.m:335 modules/gui/win32/strings.cpp:80
 msgid "Device"
 msgstr ""
 
@@ -1909,14 +1939,14 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:183
 #: modules/gui/gtk/gnome_interface.c:1007 modules/gui/gtk/gtk_interface.c:558
-#: modules/gui/gtk/gtk_interface.c:1390 modules/gui/macosx/intf.m:313
-#: modules/gui/macosx/controls.m:720
+#: modules/gui/gtk/gtk_interface.c:1390 modules/gui/macosx/intf.m:343
+#: modules/gui/macosx/controls.m:774
 msgid "Deinterlace"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:190
 #: modules/gui/gtk/gnome_interface.c:1014 modules/gui/gtk/gtk_interface.c:565
-#: modules/gui/gtk/gtk_interface.c:1397 modules/gui/macosx/intf.m:312
+#: modules/gui/gtk/gtk_interface.c:1397 modules/gui/macosx/intf.m:342
 #: modules/gui/macosx/vout.m:194 modules/gui/win32/strings.cpp:83
 msgid "Screen"
 msgstr ""
@@ -1935,10 +1965,10 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2963 modules/gui/gtk/gtk_interface.c:623
 #: modules/gui/gtk/gtk_interface.c:1932 modules/gui/gtk/gtk_interface.c:2849
 #: modules/gui/gtk/gtk_interface.c:2966 modules/gui/gtk/gtk_interface.c:3218
-#: modules/gui/macosx/intf.m:274 modules/gui/macosx/open.m:172
+#: modules/gui/macosx/intf.m:301 modules/gui/macosx/open.m:172
 #: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:326
 #: modules/gui/macosx/open.m:777 modules/gui/macosx/open.m:811
-#: modules/gui/win32/strings.cpp:93 modules/gui/win32/strings.cpp:225
+#: modules/gui/win32/strings.cpp:93 modules/gui/win32/strings.cpp:226
 msgid "File"
 msgstr ""
 
@@ -2032,10 +2062,10 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:672
 #: modules/gui/gtk/gnome_interface.c:1097 modules/gui/gtk/gtk_interface.c:774
 #: modules/gui/gtk/gtk_interface.c:857 modules/gui/gtk/gtk_interface.c:901
-#: modules/gui/gtk/gtk_interface.c:1207 modules/gui/macosx/intf.m:255
-#: modules/gui/macosx/intf.m:295 modules/gui/macosx/controls.m:645
-#: modules/gui/win32/strings.cpp:114 modules/gui/win32/strings.cpp:134
-#: modules/gui/win32/strings.cpp:138
+#: modules/gui/gtk/gtk_interface.c:1207 modules/gui/macosx/intf.m:281
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/controls.m:696 modules/gui/win32/strings.cpp:114
+#: modules/gui/win32/strings.cpp:134 modules/gui/win32/strings.cpp:138
 msgid "Next"
 msgstr ""
 
@@ -2092,7 +2122,7 @@ msgid "Got directly so specified point"
 msgstr ""