--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: xine-lib.hg\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-07-24 23:32+0100\n"
+"POT-Creation-Date: 2011-11-13 01:50+0000\n"
 "PO-Revision-Date: 2009-01-15 19:04+0000\n"
 "Last-Translator: Not translated <null@example.com>\n"
 "Language-Team: en_US <none>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -147,12 +148,12 @@
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1498 src/audio_out/audio_jack_out.c:742
-#: src/audio_out/audio_oss_out.c:927
+#: src/audio_out/audio_oss_out.c:925
 msgid "speaker arrangement"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1499 src/audio_out/audio_jack_out.c:743
-#: src/audio_out/audio_oss_out.c:928
+#: src/audio_out/audio_oss_out.c:926
 msgid ""
 "Select how your speakers are arranged, this determines which speakers xine "
 "uses for sound output. The individual values are:\n"
@@ -204,19 +205,19 @@
 msgid " 32bit"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:963
+#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:961
 msgid " mono"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1562 src/audio_out/audio_oss_out.c:969
+#: src/audio_out/audio_alsa_out.c:1562 src/audio_out/audio_oss_out.c:967
 msgid " stereo"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1567 src/audio_out/audio_oss_out.c:976
+#: src/audio_out/audio_alsa_out.c:1567 src/audio_out/audio_oss_out.c:974
 msgid " 4-channel"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1570 src/audio_out/audio_oss_out.c:979
+#: src/audio_out/audio_alsa_out.c:1570 src/audio_out/audio_oss_out.c:977
 msgid " (4-channel not enabled in xine config)"
 msgstr ""
 
@@ -228,19 +229,19 @@
 msgid " (4.1-channel not enabled in xine config)"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1583 src/audio_out/audio_oss_out.c:986
+#: src/audio_out/audio_alsa_out.c:1583 src/audio_out/audio_oss_out.c:984
 msgid " 5-channel"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1586 src/audio_out/audio_oss_out.c:989
+#: src/audio_out/audio_alsa_out.c:1586 src/audio_out/audio_oss_out.c:987
 msgid " (5-channel not enabled in xine config)"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1591 src/audio_out/audio_oss_out.c:996
+#: src/audio_out/audio_alsa_out.c:1591 src/audio_out/audio_oss_out.c:994
 msgid " 5.1-channel"
 msgstr ""
 
-#: src/audio_out/audio_alsa_out.c:1594 src/audio_out/audio_oss_out.c:999
+#: src/audio_out/audio_alsa_out.c:1594 src/audio_out/audio_oss_out.c:997
 msgid " (5.1-channel not enabled in xine config)"
 msgstr ""
 
@@ -477,7 +478,7 @@
 msgid "esd audio output latency (adjust a/v sync)"
 msgstr ""
 
-#: src/audio_out/audio_esd_out.c:540 src/audio_out/audio_oss_out.c:869
+#: src/audio_out/audio_esd_out.c:540 src/audio_out/audio_oss_out.c:867
 msgid ""
 "If you experience audio being not in sync with the video, you can enter a "
 "fixed offset here to compensate.\n"
@@ -526,38 +527,38 @@
 msgid "xine dummy audio output plugin"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:196
+#: src/audio_out/audio_oss_out.c:195
 #, c-format
 msgid "audio_oss_out: Opening audio device %s: %s\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:218
+#: src/audio_out/audio_oss_out.c:217
 #, c-format
 msgid ""
 "audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:230
+#: src/audio_out/audio_oss_out.c:229
 #, c-format
 msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:745
+#: src/audio_out/audio_oss_out.c:743
 msgid "OSS audio device name"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:746
+#: src/audio_out/audio_oss_out.c:744
 msgid ""
 "Specifies the base part of the audio device name, to which the OSS device "
 "number is appended to get the full device name.\n"
 "Select \"auto\" if you want xine to auto detect the corret setting."
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:753
+#: src/audio_out/audio_oss_out.c:751
 msgid "OSS audio device number, -1 for none"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:754
+#: src/audio_out/audio_oss_out.c:752
 msgid ""
 "The full audio device name is created by concatenating the OSS device name "
 "and the audio device number.\n"
@@ -567,33 +568,33 @@
 "audio device name is set to \"auto\"."
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:763
+#: src/audio_out/audio_oss_out.c:761
 #, c-format
 msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:766
+#: src/audio_out/audio_oss_out.c:764
 #, c-format
 msgid "audio_oss_out: Auto probe for audio device failed\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:782
+#: src/audio_out/audio_oss_out.c:780
 #, c-format
 msgid "audio_oss_out: using device >%s<\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:788 src/audio_out/audio_oss_out.c:902
+#: src/audio_out/audio_oss_out.c:786 src/audio_out/audio_oss_out.c:900
 #, c-format
 msgid ""
 "audio_oss_out: opening audio device %s failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:809
+#: src/audio_out/audio_oss_out.c:807
 msgid "a/v sync method to use by OSS"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:810
+#: src/audio_out/audio_oss_out.c:808
 msgid ""
 "xine can use different methods to keep audio and video synchronized. Which "
 "setting works best depends on the OSS driver and sound hardware you are "
@@ -623,7 +624,7 @@
 "ioctls and you experience sync errors after long playback"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:861
+#: src/audio_out/audio_oss_out.c:859
 #, c-format
 msgid ""
 "audio_oss_out: Audio driver realtime sync disabled...\n"
@@ -631,11 +632,11 @@
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:868
+#: src/audio_out/audio_oss_out.c:866
 msgid "OSS audio output latency (adjust a/v sync)"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:894
+#: src/audio_out/audio_oss_out.c:892
 #, c-format
 msgid ""
 "audio_oss_out: Audio driver realtime sync disabled...\n"
@@ -643,23 +644,23 @@
 "audio_oss_out: ...there may be audio/video synchronization issues\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:958
+#: src/audio_out/audio_oss_out.c:956
 msgid "audio_oss_out: supported modes are"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:1009
+#: src/audio_out/audio_oss_out.c:1007
 msgid " a/52 pass-through"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:1012
+#: src/audio_out/audio_oss_out.c:1010
 msgid " (a/52 pass-through not enabled in xine config)"
 msgstr ""
 
+#: src/audio_out/audio_oss_out.c:1026
+msgid "OSS audio mixer number, -1 for none"
+msgstr ""
+
 #: src/audio_out/audio_oss_out.c:1027
-msgid "OSS audio mixer number, -1 for none"
-msgstr ""
-
-#: src/audio_out/audio_oss_out.c:1028
 msgid ""
 "The full mixer device name is created by taking the OSS device name, "
 "replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
@@ -669,24 +670,24 @@
 "audio device name is set to \"auto\"."
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:1082
+#: src/audio_out/audio_oss_out.c:1081
 #, c-format
 msgid "audio_oss_out: open() mixer %s failed: %s\n"
 msgstr ""
 
-#: src/audio_out/audio_oss_out.c:1155
+#: src/audio_out/audio_oss_out.c:1154
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr ""
 
-#: src/audio_out/audio_pulse_out.c:814
+#: src/audio_out/audio_pulse_out.c:879
 msgid "device used for pulseaudio"
 msgstr ""
 
-#: src/audio_out/audio_pulse_out.c:815
+#: src/audio_out/audio_pulse_out.c:880
 msgid "use 'server[:sink]' for setting the pulseaudio sink device."
 msgstr ""
 
-#: src/audio_out/audio_pulse_out.c:898
+#: src/audio_out/audio_pulse_out.c:963
 msgid "xine audio output plugin using pulseaudio sound server"
 msgstr ""
 
@@ -716,71 +717,76 @@
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_audio_decoder.c:82
+#: src/combined/ffmpeg/ff_audio_decoder.c:118
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_audio_decoder.c:125
+#: src/combined/ffmpeg/ff_audio_decoder.c:153
 #, c-format
 msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_audio_decoder.c:262
+#: src/combined/ffmpeg/ff_audio_decoder.c:198
 #, c-format
 msgid "ffmpeg_audio_dec: trying to open null codec\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_audio_decoder.c:271
+#: src/combined/ffmpeg/ff_audio_decoder.c:207
 #, c-format
 msgid "ffmpeg_audio_dec: couldn't open decoder\n"
 msgstr ""
 
+#: src/combined/ffmpeg/ff_audio_decoder.c:479
+#, c-format
+msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n"
+msgstr ""
+
 #: src/combined/ffmpeg/ff_dvaudio_decoder.c:285
 #, c-format
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:175
+#: src/combined/ffmpeg/ff_video_decoder.c:187
 #, c-format
 msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:193
+#: src/combined/ffmpeg/ff_video_decoder.c:205
 #, c-format
 msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:304
+#: src/combined/ffmpeg/ff_video_decoder.c:316
 #, c-format
 msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:331
+#: src/combined/ffmpeg/ff_video_decoder.c:347
 #, c-format
 msgid "ffmpeg_video_dec: couldn't open decoder\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:346
+#: src/combined/ffmpeg/ff_video_decoder.c:362
 #, c-format
 msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:391
+#: src/combined/ffmpeg/ff_video_decoder.c:410
 #, c-format
 msgid "ffmpeg_video_dec: direct rendering enabled\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:840
+#: src/combined/ffmpeg/ff_video_decoder.c:848
 #, c-format
 msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1771
+#: src/combined/ffmpeg/ff_video_decoder.c:1835
 msgid "MPEG-4 postprocessing quality"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1772
+#: src/combined/ffmpeg/ff_video_decoder.c:1836
 msgid ""
 "You can adjust the amount of post processing applied to MPEG-4 video.\n"
 "Higher values result in better quality, but need more CPU. Lower values may "
@@ -789,11 +795,11 @@
 "much."
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1780
+#: src/combined/ffmpeg/ff_video_decoder.c:1844
 msgid "FFmpeg video decoding thread count"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1781
+#: src/combined/ffmpeg/ff_video_decoder.c:1845
 msgid ""
 "You can adjust the number of video decoding threads which FFmpeg may use.\n"
 "Higher values should speed up decoding but it depends on the codec used "
@@ -802,11 +808,11 @@
 "A change of this setting will take effect with playing the next stream."
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1790
+#: src/combined/ffmpeg/ff_video_decoder.c:1854
 msgid "Skip loop filter"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1791
+#: src/combined/ffmpeg/ff_video_decoder.c:1855
 msgid ""
 "You can control for which frames the loop filter shall be skipped after "
 "decoding.\n"
@@ -816,11 +822,11 @@
 "A change of this setting will take effect with playing the next stream."
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1800
+#: src/combined/ffmpeg/ff_video_decoder.c:1864
 msgid "Choose speed over specification compliance"
 msgstr ""
 
-#: src/combined/ffmpeg/ff_video_decoder.c:1801
+#: src/combined/ffmpeg/ff_video_decoder.c:1865
 msgid ""
 "You may want to allow speed cheats which violate codec specification.\n"
 "Cheating may speed up decoding but can also lead to decoding artefacts.\n"
@@ -996,14 +1002,14 @@
 "encrypted (encryption mode %d)\n"
 msgstr ""
 
-#: src/demuxers/demux_mpeg_pes.c:1088
+#: src/demuxers/demux_mpeg_pes.c:1116
 #, c-format
 msgid ""
 "demux_mpeg_pes:Unrecognised private stream 1 0x%02x. Please report this to "
 "xine developers.\n"
 msgstr ""
 
-#: src/demuxers/demux_ogg.c:877
+#: src/demuxers/demux_ogg.c:880
 #, c-format
 msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
 msgstr ""
@@ -1430,25 +1436,25 @@
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr ""
 
-#: src/input/input_cdda.c:2764
+#: src/input/input_cdda.c:2766
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr ""
 
-#: src/input/input_cdda.c:2816
+#: src/input/input_cdda.c:2818
 msgid "device used for CD audio"
 msgstr ""
 
-#: src/input/input_cdda.c:2817
+#: src/input/input_cdda.c:2819
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
 msgstr ""
 
-#: src/input/input_cdda.c:2823
+#: src/input/input_cdda.c:2825
 msgid "query CDDB"
 msgstr ""
 
-#: src/input/input_cdda.c:2823
+#: src/input/input_cdda.c:2825
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1457,11 +1463,11 @@
 "listening habits."
 msgstr ""
 
-#: src/input/input_cdda.c:2831
+#: src/input/input_cdda.c:2833
 msgid "CDDB server name"
 msgstr ""
 
-#: src/input/input_cdda.c:2831
+#: src/input/input_cdda.c:2833
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1469,19 +1475,19 @@
 "malicious replies. Be sure to enter a server you can trust."
 msgstr ""
 
-#: src/input/input_cdda.c:2839
+#: src/input/input_cdda.c:2841
 msgid "CDDB server port"
 msgstr ""
 
-#: src/input/input_cdda.c:2839
+#: src/input/input_cdda.c:2841
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 
-#: src/input/input_cdda.c:2845
+#: src/input/input_cdda.c:2847
 msgid "CDDB cache directory"
 msgstr ""
 
-#: src/input/input_cdda.c:2845
+#: src/input/input_cdda.c:2847
 msgid ""
 "The replies from the CDDB server will be cached in this directory.\n"
 "This setting is security critical, because files with uncontrollable names "
@@ -1489,11 +1495,11 @@
 "used for anything but CDDB caching."
 msgstr ""
 
-#: src/input/input_cdda.c:2853
+#: src/input/input_cdda.c:2855
 msgid "slow down disc drive to this speed factor"
 msgstr ""
 
-#: src/input/input_cdda.c:2854
+#: src/input/input_cdda.c:2856
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1512,160 +1518,160 @@
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2148 src/input/input_dvb.c:2991
+#: src/input/input_dvb.c:2148 src/input/input_dvb.c:2995
 #, c-format
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2784
+#: src/input/input_dvb.c:2788
 #, c-format
 msgid "input_dvb: DVB GUI %s\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2789 src/input/input_dvb.c:3219
+#: src/input/input_dvb.c:2793 src/input/input_dvb.c:3223
 #, c-format
 msgid "input_dvb: cannot open dvb device\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2813
+#: src/input/input_dvb.c:2817
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2824
+#: src/input/input_dvb.c:2828
 #, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2847
+#: src/input/input_dvb.c:2851
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2854
+#: src/input/input_dvb.c:2858
 #, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2867
+#: src/input/input_dvb.c:2871
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2873
+#: src/input/input_dvb.c:2877
 #, c-format
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2881
+#: src/input/input_dvb.c:2885
 #, c-format
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2893
+#: src/input/input_dvb.c:2897
 #, c-format
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2913
+#: src/input/input_dvb.c:2917
 #, c-format
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2936
+#: src/input/input_dvb.c:2940
 #, c-format
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2962
+#: src/input/input_dvb.c:2966
 #, c-format
 msgid ""
 "input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
 "A)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2997
+#: src/input/input_dvb.c:3001
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr ""
 
-#: src/input/input_dvb.c:3020
+#: src/input/input_dvb.c:3024
 #, c-format
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr ""
 
-#: src/input/input_dvb.c:3082
+#: src/input/input_dvb.c:3086
 msgid "use DVB 'center cutout' (zoom)"
 msgstr ""
 
-#: src/input/input_dvb.c:3083
+#: src/input/input_dvb.c:3087
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
 msgstr ""
 
-#: src/input/input_dvb.c:3176
+#: src/input/input_dvb.c:3180
 msgid "DVB (Digital TV) input plugin"
 msgstr ""
 
-#: src/input/input_dvb.c:3308
+#: src/input/input_dvb.c:3311
 msgid "Remember last DVB channel watched"
 msgstr ""
 
-#: src/input/input_dvb.c:3309
+#: src/input/input_dvb.c:3312
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3316
+#: src/input/input_dvb.c:3319
 msgid "Last DVB channel viewed"
 msgstr ""
 
-#: src/input/input_dvb.c:3317
+#: src/input/input_dvb.c:3320
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3322
+#: src/input/input_dvb.c:3325
 msgid "Number of seconds until tuning times out."
 msgstr ""
 
-#: src/input/input_dvb.c:3323
+#: src/input/input_dvb.c:3326
 msgid ""
 "Leave at 0 means try forever. Greater than 0 means wait that many seconds to "
 "get a lock. Minimum is 5 seconds."
 msgstr ""
 
-#: src/input/input_dvb.c:3329
+#: src/input/input_dvb.c:3332
 msgid "Number of dvb card to use."
 msgstr ""
 
-#: src/input/input_dvb.c:3330
+#: src/input/input_dvb.c:3333
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
 
-#: src/input/input_dvb.c:3338
+#: src/input/input_dvb.c:3341
 msgid "Enable the DVB GUI"
 msgstr ""
 
-#: src/input/input_dvb.c:3339
+#: src/input/input_dvb.c:3342
 msgid "Enable the DVB GUI, mouse controlled recording and channel switching."
 msgstr ""
 
-#: src/input/input_dvb.c:3345
+#: src/input/input_dvb.c:3348
 msgid "DVB Channels config file"
 msgstr ""
 
-#: src/input/input_dvb.c:3346
+#: src/input/input_dvb.c:3349
 msgid ""
 "DVB Channels config file to use instead of the ~/.xine/channels.conf file."
 msgstr ""
@@ -1848,19 +1854,19 @@
 msgid "file input plugin"
 msgstr ""
 
-#: src/input/input_file.c:994
+#: src/input/input_file.c:991
 msgid "file browsing start location"
 msgstr ""
 
-#: src/input/input_file.c:995
+#: src/input/input_file.c:992
 msgid "The browser to select the file to play will start at this location."
 msgstr ""
 
-#: src/input/input_file.c:1002
+#: src/input/input_file.c:999
 msgid "list hidden files"
 msgstr ""
 
-#: src/input/input_file.c:1003
+#: src/input/input_file.c:1000
 msgid ""
 "If enabled, the browser to select the file to play will also show hidden "
 "files."
@@ -1983,27 +1989,27 @@
 "TCP is better but you may need HTTP behind a firewall."
 msgstr ""
 
-#: src/input/input_net.c:121 src/input/input_net.c:151
+#: src/input/input_net.c:121 src/input/input_net.c:150
 #, c-format
 msgid "input_net: socket(): %s\n"
 msgstr ""
 
-#: src/input/input_net.c:136 src/input/input_net.c:162
+#: src/input/input_net.c:136 src/input/input_net.c:161
 #, c-format
 msgid "input_net: connect(): %s\n"
 msgstr ""
 
-#: src/input/input_net.c:180 src/input/input_net.c:222
+#: src/input/input_net.c:179 src/input/input_net.c:221
 #, c-format
 msgid "input_net: unable to resolve '%s'.\n"
 msgstr ""
 
-#: src/input/input_net.c:193 src/input/input_net.c:239
+#: src/input/input_net.c:192 src/input/input_net.c:238
 #, c-format
 msgid "input_net: unable to connect to '%s'.\n"
 msgstr ""
 
-#: src/input/input_net.c:524
+#: src/input/input_net.c:523
 msgid "net input plugin as shipped with xine"
 msgstr ""
 
@@ -2011,51 +2017,51 @@
 msgid "pnm streaming input plugin"
 msgstr ""
 
-#: src/input/input_pvr.c:589
+#: src/input/input_pvr.c:581
 #, c-format
 msgid "input_pvr: error creating pvr file (%s)\n"
 msgstr ""
 
-#: src/input/input_pvr.c:746
+#: src/input/input_pvr.c:738
 #, c-format
 msgid "input_pvr: error opening pvr file (%s)\n"
 msgstr ""
 
-#: src/input/input_pvr.c:822
+#: src/input/input_pvr.c:814
 #, c-format
 msgid "input_pvr: read error (%s)\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1161 src/input/input_pvr.c:1421
+#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413
 #, c-format
 msgid "input_pvr: error opening device %s\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1427
+#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419
 #, c-format
 msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1175 src/input/input_pvr.c:1436
+#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428
 #, c-format
 msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1544
+#: src/input/input_pvr.c:1536
 msgid "WinTV-PVR 250/350 input plugin"
 msgstr ""
 
-#: src/input/input_pvr.c:1570
+#: src/input/input_pvr.c:1562
 msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
 msgstr ""
 
-#: src/input/input_pvr.c:1571
+#: src/input/input_pvr.c:1563
 msgid "The path to the device of your WinTV card."
 msgstr ""
 
 #: src/input/input_rtp.c:183
 #, c-format
-msgid "socket(): %s.\n"
+msgid "xine_socket_cloexec(): %s.\n"
 msgstr ""
 
 #: src/input/input_rtp.c:193
@@ -2226,16 +2232,16 @@
 msgid "unable to open %s: %s.\n"
 msgstr ""
 
-#: src/input/input_vcd.c:1041
+#: src/input/input_vcd.c:1040
 #, c-format
 msgid "input_vcd: unable to open %s: %s.\n"
 msgstr ""
 
+#: src/input/input_vcd.c:1088
+msgid "device used for VCD playback"
+msgstr ""
+
 #: src/input/input_vcd.c:1089
-msgid "device used for VCD playback"
-msgstr ""
-
-#: src/input/input_vcd.c:1090
 msgid ""
 "The path to the device, usually a CD or DVD drive, you intend to play your "
 "VideoCDs with."
@@ -2321,7 +2327,7 @@
 msgid "unsupported protocol\n"
 msgstr ""
 
-#: src/input/net_buf_ctrl.c:89
+#: src/input/net_buf_ctrl.c:103
 msgid "Buffering..."
 msgstr ""
 
@@ -2415,69 +2421,69 @@
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1840
 msgid "VCD default type to use on autoplay"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1837
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1851
 msgid "CD-ROM drive used for VCD when none given"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1848
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1858
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "VCD position slider range"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1859
+#: src/input/vcd/xineplug_inp_vcd.c:1863
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1871
 msgid "VCD read-ahead caching?"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1868
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1878
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "automatically advance VCD track/entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1879
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1892
 msgid "show 'rejected' VCD LIDs"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1893
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
 "(*) appended to the MRL."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1900
+#: src/input/vcd/xineplug_inp_vcd.c:1904
 msgid "VCD format string for display banner"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1901
+#: src/input/vcd/xineplug_inp_vcd.c:1905
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2498,11 +2504,11 @@
 " %% : a %\n"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1926
+#: src/input/vcd/xineplug_inp_vcd.c:1930
 msgid "VCD format string for stream comment field"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1931
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2510,11 +2516,11 @@
 "See the help for the title_format for the meanings of these."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1939
+#: src/input/vcd/xineplug_inp_vcd.c:1943
 msgid "VCD debug flag mask"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1940
+#: src/input/vcd/xineplug_inp_vcd.c:1944
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2713,11 +2719,11 @@
 msgid "encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/demux_sputext.c:1479
+#: src/libsputext/demux_sputext.c:1480
 msgid "default duration of subtitle display in seconds"
 msgstr ""
 
-#: src/libsputext/demux_sputext.c:1480
+#: src/libsputext/demux_sputext.c:1481
 msgid ""
 "Some subtitle formats do not explicitly give a duration for each subtitle. "
 "For these, you can set a default duration here. Setting to zero will result "
@@ -3131,7 +3137,7 @@
 "\n"
 msgstr ""
 
-#: src/post/planar/noise.c:404
+#: src/post/planar/noise.c:406
 msgid ""
 "Adds random noise to the video.\n"
 "\n"
@@ -3149,7 +3155,7 @@
 "* mplayer's noise (C) Michael Niedermayer\n"
 msgstr ""
 
-#: src/post/planar/pp.c:115
+#: src/post/planar/pp.c:123
 msgid ""
 "FFmpeg libpostprocess plugin.\n"
 "\n"
@@ -3157,7 +3163,7 @@
 "\n"
 msgstr ""
 
-#: src/post/planar/pp.c:121
+#: src/post/planar/pp.c:129
 msgid ""
 "\n"
 "* libpostprocess (C) Michael Niedermayer\n"
@@ -3199,142 +3205,155 @@
 msgid "xine video output plugin using the Color AsCii Art library"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1337
+#: src/video_out/video_out_directfb.c:1341
 msgid "video layer buffering mode"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1338
+#: src/video_out/video_out_directfb.c:1342
 msgid ""
 "Select the buffering mode of the output layer. Double or triple buffering "
 "give a smoother playback, but consume more video memory."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1345
+#: src/video_out/video_out_directfb.c:1349
 msgid "wait for vertical retrace"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1346
+#: src/video_out/video_out_directfb.c:1350
 msgid ""
 "Enable synchronizing the update of the video image to the repainting of the "
 "entire screen (\"vertical retrace\")."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1353
+#: src/video_out/video_out_directfb.c:1357
 msgid "enable video colour key"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1354
+#: src/video_out/video_out_directfb.c:1358
 msgid ""
 "Enable using a colour key to tell the graphics card where to overlay the "
 "video image."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1360
+#: src/video_out/video_out_directfb.c:1364
 msgid "video colour key"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1361
-#: src/video_out/video_out_vidix.c:1168 src/video_out/video_out_vidix.c:1175
-#: src/video_out/video_out_vidix.c:1182 src/video_out/xv_common.h:25
+#: src/video_out/video_out_directfb.c:1365
+#: src/video_out/video_out_vidix.c:1172 src/video_out/video_out_vidix.c:1179
+#: src/video_out/video_out_vidix.c:1186 src/video_out/xv_common.h:25
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1370
+#: src/video_out/video_out_directfb.c:1374
 msgid "flicker filtering"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1371
+#: src/video_out/video_out_directfb.c:1375
 msgid "Enable Flicker Filetring for a smooth output on an interlaced display."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1378
+#: src/video_out/video_out_directfb.c:1382
 msgid "field parity"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1379
+#: src/video_out/video_out_directfb.c:1383
 msgid ""
 "For an interlaced display, enable controlling the field parity (\"none"
 "\"=disabled)."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1512
+#: src/video_out/video_out_directfb.c:1516
 #, c-format
 msgid "video_out_directfb: using hardware subpicture acceleration.\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1526
+#: src/video_out/video_out_directfb.c:1530
 #, c-format
 msgid "video_out_directfb: layer supports video output.\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1535
+#: src/video_out/video_out_directfb.c:1539
 #, c-format
 msgid "video_out_directfb: layer doesn't support YV12!\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1542
+#: src/video_out/video_out_directfb.c:1546
 #, c-format
 msgid "video_out_directfb: layer doesn't support YUY2!\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1553
+#: src/video_out/video_out_directfb.c:1557
 #, c-format
 msgid ""
 "video_out_directfb:need at least DirectFB 0.9.25 to play on this layer!\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1588
+#: src/video_out/video_out_directfb.c:1592
 #, c-format
 msgid "video_out_directfb: layer doesn't support buffermode %d!\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1594
+#: src/video_out/video_out_directfb.c:1598
 #, c-format
 msgid "video_out_directfb: layer doesn't support options 0x%08x!\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1688
+#: src/video_out/video_out_directfb.c:1692
 #, c-format
 msgid "video_out_directfb: using hardware accelerated image scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1700
+#: src/video_out/video_out_directfb.c:1704
 #, c-format
 msgid ""
 "video_out_directfb: image scaling with deinterlacing is hardware "
 "accelerated.\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1778
+#: src/video_out/video_out_directfb.c:1782
 msgid "video layer id (auto: -1)"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1779
+#: src/video_out/video_out_directfb.c:1783
 msgid "Select the video output layer by its id."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1800
-#: src/video_out/video_out_directfb.c:2010
+#: src/video_out/video_out_directfb.c:1804
+#: src/video_out/video_out_directfb.c:2014
 #, c-format
 msgid "video_out_directfb: using display layer #%d.\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:1884
+#: src/video_out/video_out_directfb.c:1888
 msgid "xine video output plugin using DirectFB."
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:2003
+#: src/video_out/video_out_directfb.c:2007
 #, c-format
 msgid "video_out_directfb: no usable display layer was found!\n"
 msgstr ""
 
-#: src/video_out/video_out_directfb.c:2092
+#: src/video_out/video_out_directfb.c:2096
 msgid "xine video output plugin using DirectFB under XDirectFB."
 msgstr ""
 
-#: src/video_out/video_out_directx.c:1295
+#: src/video_out/video_out_directx.c:1288
+msgid "HW acceleration level"
+msgstr ""
+
+#: src/video_out/video_out_directx.c:1289
+msgid ""
+"Possible values (default full):\n"
+"\n"
+"full: full acceleration\n"
+"scale: disable colorspace conversion (HW scaling only)\n"
+"none: disable all acceleration"
+msgstr ""
+
+#: src/video_out/video_out_directx.c:1322
 msgid "xine video output plugin for win32 using directx"
 msgstr ""
 
@@ -3345,11 +3364,11 @@
 "     Check 'fbset -i' or try 'fbset -depth 16'.\n"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:818 src/video_out/video_out_vidix.c:1248
+#: src/video_out/video_out_fb.c:818 src/video_out/video_out_vidix.c:1252
 msgid "framebuffer device name"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:819 src/video_out/video_out_vidix.c:1249
+#: src/video_out/video_out_fb.c:819 src/video_out/video_out_vidix.c:1253
 msgid ""
 "Specifies the file name for the framebuffer device to be used.\n"
 "This setting is security critical, because when changed to a different file, "
@@ -3442,7 +3461,7 @@
 "Ignored for static render routines.\n"
 msgstr ""
 
-#: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1024
+#: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1028
 #: src/video_out/xv_common.h:46
 msgid "enable double buffering"
 msgstr ""
@@ -3633,7 +3652,7 @@
 msgid ""
 "video_out_syncfb: info. (brightness/contrast control won't be available "
 "because your SyncFB kernel module seems to be outdated. Please refer to "
-"README.syncfb for informations on how to update it.)\n"
+"README.syncfb for information on how to update it.)\n"
 msgstr ""
 
 #: src/video_out/video_out_syncfb.c:1021
@@ -3663,79 +3682,79 @@
 "careful that the value you enter really is a proper framebuffer device."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1002
+#: src/video_out/video_out_vidix.c:1006
 msgid "red intensity"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1002
+#: src/video_out/video_out_vidix.c:1006
 msgid "The intensity of the red colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1007
+#: src/video_out/video_out_vidix.c:1011
 msgid "green intensity"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1007
+#: src/video_out/video_out_vidix.c:1011
 msgid "The intensity of the green colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1012
+#: src/video_out/video_out_vidix.c:1016
 msgid "blue intensity"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1012
+#: src/video_out/video_out_vidix.c:1016
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1025 src/video_out/xv_common.h:47
+#: src/video_out/video_out_vidix.c:1029 src/video_out/xv_common.h:47
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
 "flickering and tearing artifacts, but will use more graphics memory."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1072
+#: src/video_out/video_out_vidix.c:1076
 #, c-format
 msgid "video_out_vidix: adaptor supports the yuy2 format\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1083
+#: src/video_out/video_out_vidix.c:1087
 #, c-format
 msgid "video_out_vidix: adaptor supports the yv12 format\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1099
+#: src/video_out/video_out_vidix.c:1103
 #, c-format
 msgid "video_out_vidix: You have wrong version of VIDIX library\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1107
+#: src/video_out/video_out_vidix.c:1111
 #, c-format
 msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1120
+#: src/video_out/video_out_vidix.c:1124
 #, c-format
 msgid "video_out_vidix: using driver: %s by %s\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1167
+#: src/video_out/video_out_vidix.c:1171
 msgid "video overlay colour key red component"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1174
+#: src/video_out/video_out_vidix.c:1178
 msgid "video overlay colour key green component"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1181
+#: src/video_out/video_out_vidix.c:1185
 msgid "video overlay colour key blue component"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1213
+#: src/video_out/video_out_vidix.c:1217
 msgid "xine video output plugin using libvidix for x11"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1295
+#: src/video_out/video_out_vidix.c:1299
 msgid "xine video output plugin using libvidix for linux frame buffer"
 msgstr ""
 
@@ -3806,23 +3825,23 @@
 "video_out_xcbxv: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1354
+#: src/video_out/video_out_xcbxv.c:1358
 #, c-format
 msgid "video_out_xcbxv: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1381 src/video_out/video_out_xxmc.c:2457
+#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461
 #, c-format
 msgid "%s: could not open Xv port %d - autodetecting\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1397 src/video_out/video_out_xv.c:1440
-#: src/video_out/video_out_xxmc.c:2469
+#: src/video_out/video_out_xcbxv.c:1401 src/video_out/video_out_xv.c:1444
+#: src/video_out/video_out_xxmc.c:2473
 #, c-format
 msgid "%s: no available ports of type \"%s\", defaulting...\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1405
+#: src/video_out/video_out_xcbxv.c:1409
 #, c-format
 msgid ""
 "video_out_xcbxv: Xv extension is present but I couldn't find a usable yuv12 "
@@ -3831,18 +3850,18 @@
 "Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1413
+#: src/video_out/video_out_xcbxv.c:1417
 #, c-format
 msgid ""
 "video_out_xcbxv: using Xv port %d from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1538 src/video_out/video_out_xv.c:1591
+#: src/video_out/video_out_xcbxv.c:1542 src/video_out/video_out_xv.c:1595
 msgid "enable vblank sync"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1539 src/video_out/video_out_xv.c:1592
+#: src/video_out/video_out_xcbxv.c:1543 src/video_out/video_out_xv.c:1596
 msgid ""
 "This option will synchronize the update of the video image to the repainting "
 "of the entire screen (\"vertical retrace\"). This eliminates flickering and "
@@ -3850,23 +3869,23 @@
 "\" and choose which display device to sync to under the XVideo Settings tab"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1583
+#: src/video_out/video_out_xcbxv.c:1587
 #, c-format
 msgid "video_out_xcbxv: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1588
+#: src/video_out/video_out_xcbxv.c:1592
 #, c-format
 msgid "video_out_xcbxv: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1602 src/video_out/video_out_xv.c:1666
-#: src/video_out/video_out_xvmc.c:1535
+#: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670
+#: src/video_out/video_out_xvmc.c:1539
 msgid "deinterlace method (deprecated)"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1603 src/video_out/video_out_xv.c:1667
-#: src/video_out/video_out_xvmc.c:1536
+#: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671
+#: src/video_out/video_out_xvmc.c:1540
 msgid ""
 "This config setting is deprecated. You should use the new deinterlacing post "
 "processing settings instead.\n"
@@ -3904,8 +3923,8 @@
 "with medium CPU usage."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1657 src/video_out/video_out_xv.c:1740
-#: src/video_out/video_out_xxmc.c:2776
+#: src/video_out/video_out_xcbxv.c:1661 src/video_out/video_out_xv.c:1744
+#: src/video_out/video_out_xxmc.c:2780
 msgid "xine video output plugin using the MIT X video extension"
 msgstr ""
 
@@ -3975,17 +3994,17 @@
 "video_out_xv: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1403
+#: src/video_out/video_out_xv.c:1407
 #, c-format
 msgid "video_out_xv: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1428
+#: src/video_out/video_out_xv.c:1432
 #, c-format
 msgid "%s: could not open Xv port %<PRId32> - autodetecting\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1447
+#: src/video_out/video_out_xv.c:1451
 #, c-format
 msgid ""
 "video_out_xv: Xv extension is present but I couldn't find a usable yuv12 "
@@ -3993,62 +4012,62 @@
 "              Looks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1456
+#: src/video_out/video_out_xv.c:1460
 #, c-format
 msgid ""
 "video_out_xv: using Xv port %ld from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1633
+#: src/video_out/video_out_xv.c:1637
 #, c-format
 msgid "video_out_xv: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1638
+#: src/video_out/video_out_xv.c:1642
 #, c-format
 msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1604
+#: src/video_out/video_out_xvmc.c:1608
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1646
+#: src/video_out/video_out_xvmc.c:1650
 #, c-format
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1744
+#: src/video_out/video_out_xvmc.c:1748
 #, c-format
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1757
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colour space conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1758
+#: src/video_out/video_out_xvmc.c:1762
 #, c-format
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1760
+#: src/video_out/video_out_xvmc.c:1764
 #, c-format
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1762
+#: src/video_out/video_out_xvmc.c:1766
 #, c-format
 msgid "                no XvMC support \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1763
+#: src/video_out/video_out_xvmc.c:1767
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
@@ -4081,12 +4100,12 @@
 "video_out_xxmc: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_xxmc.c:2436
 #, c-format
 msgid "video_out_xxmc: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2476
+#: src/video_out/video_out_xxmc.c:2480
 #, c-format
 msgid ""
 "video_out_xxmc: Xv extension is present but I couldn't find a usable yuv12 "
@@ -4094,80 +4113,80 @@
 "              Looks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2485
+#: src/video_out/video_out_xxmc.c:2489
 #, c-format
 msgid ""
 "video_out_xxmc: using Xv port %ld from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2654
+#: src/video_out/video_out_xxmc.c:2658
 #, c-format
 msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2659
+#: src/video_out/video_out_xxmc.c:2663
 #, c-format
 msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2687
+#: src/video_out/video_out_xxmc.c:2691
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2688
+#: src/video_out/video_out_xxmc.c:2692
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2694
+#: src/video_out/video_out_xxmc.c:2698
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2695
+#: src/video_out/video_out_xxmc.c:2699
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2701
+#: src/video_out/video_out_xxmc.c:2705
 msgid "Fix buggy NVIDIA XvMC subpicture colours"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2702
+#: src/video_out/video_out_xxmc.c:2706
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colours\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2707
+#: src/video_out/video_out_xxmc.c:2711
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2708
+#: src/video_out/video_out_xxmc.c:2712
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "alternate between top and bottom field at double the frame rate.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2714
+#: src/video_out/video_out_xxmc.c:2718
 msgid "Don't use bob deinterlacing for progressive frames."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2715
+#: src/video_out/video_out_xxmc.c:2719
 msgid ""
 "Progressive frames don't need deinterlacing, so disabling it on\n"
 "demand should result in a better picture.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2721
+#: src/video_out/video_out_xxmc.c:2725
 msgid "Don't use bob deinterlacing while a scaled OSD is active."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2722
+#: src/video_out/video_out_xxmc.c:2726
 msgid ""
 "Bob deinterlacing adds some noise to horizontal lines, so disabling it\n"
 "on demand should result in a better OSD picture.\n"
@@ -4271,21 +4290,21 @@
 "but the CPU usage will be decreased as well."
 msgstr ""
 
-#: src/xine-engine/audio_decoder.c:367
+#: src/xine-engine/audio_decoder.c:370
 #, c-format
 msgid "audio_decoder: no plugin available to handle '%s'\n"
 msgstr ""
 
-#: src/xine-engine/audio_decoder.c:384
+#: src/xine-engine/audio_decoder.c:387
 #, c-format
 msgid "audio_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/audio_decoder.c:488
+#: src/xine-engine/audio_decoder.c:491
 msgid "number of audio buffers"
 msgstr ""
 
-#: src/xine-engine/audio_decoder.c:489
+#: src/xine-engine/audio_decoder.c:492
 msgid ""
 "The number of audio buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
@@ -4832,70 +4851,114 @@
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:391
+#: src/xine-engine/video_decoder.c:135
+msgid "disable decoder flush at discontinuity"
+msgstr ""
+
+#: src/xine-engine/video_decoder.c:136
+msgid ""
+"when watching live tv a discontinuity happens for example about every 26.5 "
+"hours due to a pts wrap.\n"
+"flushing the decoder at that time causes decoding errors for images after "
+"the pts wrap.\n"
+"to avoid the decoding errors, decoder flush at discontinuity should be "
+"disabled.\n"
+"\n"
+"WARNING: as the flush was introduced to fix some issues when playing DVD "
+"still images, it is\n"
+"likely that these issues may reappear in case they haven't been fixed "
+"differently meanwhile.\n"
+msgstr ""
+
+#: src/xine-engine/video_decoder.c:419
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:470
+#: src/xine-engine/video_decoder.c:498
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:508
+#: src/xine-engine/video_decoder.c:536
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:509
+#: src/xine-engine/video_decoder.c:537
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:666
+#: src/xine-engine/video_out.c:670
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:839
+#: src/xine-engine/video_out.c:845
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
 "(diff : %<PRId64>).\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1823
+#: src/xine-engine/video_out.c:872
+#, c-format
+msgid "video_out: just discarded first frame after seek\n"
+msgstr ""
+
+#: src/xine-engine/video_out.c:1172
+msgid "disable decoder flush from video out"
+msgstr ""
+
+#: src/xine-engine/video_out.c:1173
+msgid ""
+"video out causes a decoder flush when video out runs out of frames for "
+"displaying,\n"
+"because the decoder hasn't deliverd new frames for quite a while.\n"
+"flushing the decoder causes decoding errors for images decoded after the "
+"flush.\n"
+"to avoid the decoding errors, decoder flush at video out should be "
+"disabled.\n"
+"\n"
+"WARNING: as the flush was introduced to fix some issues when playing DVD "
+"still images, it is\n"
+"likely that these issues may reappear in case they haven't been fixed "
+"differently meanwhile.\n"
+msgstr ""
+
+#: src/xine-engine/video_out.c:1860
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1824
+#: src/xine-engine/video_out.c:1861
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1881
+#: src/xine-engine/video_out.c:1918
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1882
+#: src/xine-engine/video_out.c:1919
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1887
+#: src/xine-engine/video_out.c:1924
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1888
+#: src/xine-engine/video_out.c:1925
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1924
+#: src/xine-engine/video_out.c:1961
 #, c-format
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
@@ -4939,145 +5002,145 @@
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:936
-#: src/xine-engine/xine.c:976 src/xine-engine/xine.c:1012
-#: src/xine-engine/xine.c:1024 src/xine-engine/xine.c:1037
-#: src/xine-engine/xine.c:1050 src/xine-engine/xine.c:1063
-#: src/xine-engine/xine.c:1089 src/xine-engine/xine.c:1114
-#: src/xine-engine/xine.c:1151
+#: src/xine-engine/xine.c:816 src/xine-engine/xine.c:937
+#: src/xine-engine/xine.c:977 src/xine-engine/xine.c:1013
+#: src/xine-engine/xine.c:1025 src/xine-engine/xine.c:1038
+#: src/xine-engine/xine.c:1051 src/xine-engine/xine.c:1064
+#: src/xine-engine/xine.c:1090 src/xine-engine/xine.c:1115
+#: src/xine-engine/xine.c:1152
 #, c-format
 msgid "xine: error while parsing mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:874
+#: src/xine-engine/xine.c:875
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:890
+#: src/xine-engine/xine.c:891
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:899
+#: src/xine-engine/xine.c:900
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:925
+#: src/xine-engine/xine.c:926
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:962
+#: src/xine-engine/xine.c:963
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:969
+#: src/xine-engine/xine.c:970
 #, c-format
 msgid "xine: error opening rip input plugin instance\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1000
+#: src/xine-engine/xine.c:1001
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1029
+#: src/xine-engine/xine.c:1030
 #, c-format
 msgid "ignoring video\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1042
+#: src/xine-engine/xine.c:1043
 #, c-format
 msgid "ignoring audio\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1056
 #, c-format
 msgid "ignoring subpicture\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1068
+#: src/xine-engine/xine.c:1069
 #, c-format
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1141
+#: src/xine-engine/xine.c:1142
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1145
+#: src/xine-engine/xine.c:1146
 #, c-format
 msgid "xine: error opening subtitle mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1177
+#: src/xine-engine/xine.c:1178
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1184
+#: src/xine-engine/xine.c:1185
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1215
+#: src/xine-engine/xine.c:1216
 #, c-format
 msgid "xine: couldn't load plugin-specified demux %s for >%s<\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1225
+#: src/xine-engine/xine.c:1226
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1241
+#: src/xine-engine/xine.c:1242
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1262
+#: src/xine-engine/xine.c:1263
 #, c-format
 msgid "xine: demuxer is already done. that was fast!\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1264
+#: src/xine-engine/xine.c:1265
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1330
+#: src/xine-engine/xine.c:1331
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1401
+#: src/xine-engine/xine.c:1402
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1677
+#: src/xine-engine/xine.c:1684
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1682
+#: src/xine-engine/xine.c:1689
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 
-#: src/xine-engine/xine.c:1714
+#: src/xine-engine/xine.c:1720
 #, c-format
 msgid "xine: locale not supported by C library\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1723
+#: src/xine-engine/xine.c:1729
 msgid "media format detection strategy"
 msgstr ""
 
-#: src/xine-engine/xine.c:1724
+#: src/xine-engine/xine.c:1730
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -5095,11 +5158,11 @@
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1742
+#: src/xine-engine/xine.c:1748
 msgid "directory for saving streams"
 msgstr ""
 
-#: src/xine-engine/xine.c:1743
+#: src/xine-engine/xine.c:1749
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -5109,11 +5172,11 @@
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1754
+#: src/xine-engine/xine.c:1760
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1755
+#: src/xine-engine/xine.c:1761
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -5123,26 +5186,26 @@
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1769
+#: src/xine-engine/xine.c:1775
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1770
+#: src/xine-engine/xine.c:1776
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:2227
+#: src/xine-engine/xine.c:2233
 msgid "messages"
 msgstr ""
 
-#: src/xine-engine/xine.c:2228
+#: src/xine-engine/xine.c:2234
 msgid "plugin"
 msgstr ""
 
-#: src/xine-engine/xine.c:2229
+#: src/xine-engine/xine.c:2235
 msgid "trace"
 msgstr ""
 
@@ -5198,18 +5261,18 @@
 msgid "File is empty:"
 msgstr ""
 
-#: src/xine-utils/memcpy.c:479
+#: src/xine-utils/memcpy.c:481
 msgid "memcopy method used by xine"
 msgstr ""
 
-#: src/xine-utils/memcpy.c:480
+#: src/xine-utils/memcpy.c:482
 msgid ""
 "The copying of large memory blocks is one of the most expensive operations "
 "on todays computers. Therefore xine provides various tuned methods to do "
 "this copying. Usually, the best method is detected automatically."
 msgstr ""
 
-#: src/xine-utils/memcpy.c:507
+#: src/xine-utils/memcpy.c:509
 #, c-format
 msgid "Benchmarking memcpy methods (smaller is better):\n"
 msgstr ""