From 3ed086bfd3deca46445b918806f2e0129bb35ab0 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 19 Jul 2010 19:27:50 +0100 Subject: Explicitly report unhandled codecs (in Matroska). --- src/demuxers/demux_matroska.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index edce2039d..0f83c73f8 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -1445,7 +1445,7 @@ static int parse_track_entry(demux_matroska_t *this, matroska_track_t *track) { track->buf_type = BUF_SPU_HDMV; init_codec = init_codec_spu; } else { - lprintf("unknown codec\n"); + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "unknown codec %s\n", track->codec_id); } if (track->buf_type) { -- cgit v1.2.3 From 88682e14a4c89caa499fedad2a3faab316f72dda Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 19 Jul 2010 19:53:14 +0100 Subject: Fix a potential freeing of unallocated memory. --- ChangeLog | 1 + src/demuxers/asfheader.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 218bc0be5..508715ed8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ xine-lib (1.1.19) 2010-??-?? * Fix playback of the first file handled by the modplug demuxer. * Refuse to build with known-broken libmodplug (0.8.8). http://bugs.debian.org/588465 + * Fix a potential freeing of unallocated memory (CVE-2010-xxxx). xine-lib (1.1.18.1) 2010-03-06 * Oops. compat.c (for DXR3 support) was omitted. diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c index e9a36fc29..1482ac982 100644 --- a/src/demuxers/asfheader.c +++ b/src/demuxers/asfheader.c @@ -300,6 +300,9 @@ static int asf_header_parse_stream_properties(asf_header_t *header, uint8_t *buf if (!asf_stream) goto exit_error; + asf_stream->private_data = NULL; + asf_stream->error_correction_data = NULL; + asf_reader_init(&reader, buffer, buffer_len); asf_reader_get_guid(&reader, &guid); -- cgit v1.2.3 From dec217438b63373fefd6f50c85664f57148efe50 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 19 Jul 2010 19:56:48 +0100 Subject: Fix a few small memory leaks. --- src/input/pnm.c | 1 + src/libspucmml/xine_cmml_decoder.c | 11 ++++++----- src/post/goom/gfontlib.c | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/input/pnm.c b/src/input/pnm.c index bf24e5f8f..1bbc93fb6 100644 --- a/src/input/pnm.c +++ b/src/input/pnm.c @@ -712,6 +712,7 @@ pnm_t *pnm_connect(xine_stream_t *stream, const char *mrl) { if (strncmp(mrl,"pnm://",6)) { + free (mrl_ptr); return NULL; } diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index ed7e99ae1..87edcfbfe 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -331,9 +331,9 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { /* how many lines does the anchor text take up? */ this->lines=0; { - int i = 0; - while (*anchor_text) { - if (*anchor_text == '\r' || *anchor_text == '\n') { + int i = 0, index = 0; + while (anchor_text[index]) { + if (anchor_text[index] == '\r' || anchor_text[index] == '\n') { if (i) { /* match a newline and there are chars on the current line ... */ this->text[ this->lines ][i] = '\0'; @@ -342,11 +342,11 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { } } else { /* found a normal (non-line-ending) character */ - this->text[ this->lines ][i] = *anchor_text; + this->text[ this->lines ][i] = anchor_text[index]; if (ilines++; } } + free (anchor_text); /* initialize decoder if needed */ if( !this->cached_width || !this->cached_height || !this->cached_img_duration || !this->osd ) { diff --git a/src/post/goom/gfontlib.c b/src/post/goom/gfontlib.c index 2bc366305..f538aad34 100644 --- a/src/post/goom/gfontlib.c +++ b/src/post/goom/gfontlib.c @@ -127,6 +127,7 @@ void gfont_load (void) { font_chars [32] = 0; small_font_chars [32] = 0; free(font_pos); + free(gfont); } void goom_draw_text (Pixel * buf,int resolx,int resoly, -- cgit v1.2.3 From 58c991b313911b85d323ec78a4d6de9a5e022a68 Mon Sep 17 00:00:00 2001 From: Matthias Drochner Date: Tue, 20 Jul 2010 18:18:32 +0100 Subject: Missing mutex init --- src/post/audio/upmix.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 9cf68b365..76cf8f1b2 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -396,6 +396,8 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs, _x_post_init(&this->post, 1, 0); + pthread_mutex_init(&this->lock, 0); + this->params.cut_off_freq = 100; port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output); -- cgit v1.2.3 From 06d09abeaa81336476845e1cc5db2a474ceaa9ad Mon Sep 17 00:00:00 2001 From: Matthias Drochner Date: Wed, 21 Jul 2010 14:23:25 +0000 Subject: Normalize timeval In demux_loop(), a time value is calculated by adding to the fractional part. In case a second barrier is crossed, the value is not in its canonical form anymore - the fractional part is larger than 10^9-1. It should be normalized for portability. While I haven't found a formal requirement for this in POSIX, NetBSD's libpthread checks for it and complains. --- src/xine-engine/demux.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index bbc130988..68fedbcf4 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -349,6 +349,10 @@ static void *demux_loop (void *stream_gen) { gettimeofday(&tv, NULL); ts.tv_sec = tv.tv_sec; ts.tv_nsec = (tv.tv_usec + 100000) * 1000; + if (ts.tv_nsec >= 1000000000) { + ts.tv_nsec -= 1000000000; + ts.tv_sec += 1; + } pthread_cond_timedwait (&stream->demux_resume, &stream->demux_lock, &ts); } -- cgit v1.2.3 From ba6e40bee872673f4af4e32836d633b28e634997 Mon Sep 17 00:00:00 2001 From: Matthias Drochner Date: Wed, 21 Jul 2010 15:10:23 +0000 Subject: Advance buffer pointer after read In dvd_input.c:file_read(), if the read is not done in a single access, the buffer pointer doesn't get advanced so that the second read overwrites the data of the first. I actually don't remember under which circumstances this could happen, but the flaw in the code is obvious. The patch is from NetBSD's pkgsrc, and this patch is attributed to an "unnamed contributor" in the CVS log. --- src/input/libdvdnav/dvd_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/input/libdvdnav/dvd_input.c b/src/input/libdvdnav/dvd_input.c index 7b35f5eef..8eea51412 100644 --- a/src/input/libdvdnav/dvd_input.c +++ b/src/input/libdvdnav/dvd_input.c @@ -319,6 +319,7 @@ static int file_read(dvd_input_t dev, void *buffer, int blocks, int flags) return (int) (bytes / DVD_VIDEO_LB_LEN); } + buffer += ret; len -= ret; } -- cgit v1.2.3 From e9c4a618fbc47dae2cdd82d4d09ade8ec020bfe1 Mon Sep 17 00:00:00 2001 From: Matthias Drochner Date: Wed, 21 Jul 2010 15:27:33 +0000 Subject: Add _POSIX_THREAD_PRIORITY_SCHEDULING #ifdefs This is optional, and some systems don't support it. POSIX defines the _POSIX_THREAD_PRIORITY_SCHEDULING to tell that support is present. --- src/xine-engine/audio_decoder.c | 4 ++++ src/xine-engine/audio_out.c | 2 ++ src/xine-engine/video_decoder.c | 8 ++++++++ src/xine-engine/video_out.c | 2 ++ 4 files changed, 16 insertions(+) diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index dd15bf696..3d5ef7e6f 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -463,7 +463,9 @@ static void *audio_decoder_loop (void *stream_gen) { int _x_audio_decoder_init (xine_stream_t *stream) { pthread_attr_t pth_attrs; +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING struct sched_param pth_params; +#endif int err; if (stream->audio_out == NULL) { @@ -501,10 +503,12 @@ int _x_audio_decoder_init (xine_stream_t *stream) { */ pthread_attr_init(&pth_attrs); +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING pthread_attr_getschedparam(&pth_attrs, &pth_params); pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); pthread_attr_setschedparam(&pth_attrs, &pth_params); pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); +#endif stream->audio_thread_created = 1; if ((err = pthread_create (&stream->audio_thread, diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 0a141e014..b9738595b 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -2284,7 +2284,9 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, this->audio_loop_running = 1; pthread_attr_init(&pth_attrs); +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); +#endif this->audio_thread_created = 1; if ((err = pthread_create (&this->audio_thread, diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 0756fc5b2..f70bb82bb 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -41,6 +41,10 @@ #define SPU_SLEEP_INTERVAL (90000/2) +#ifndef SCHED_OTHER +#define SCHED_OTHER 0 +#endif + static void update_spu_decoder (xine_stream_t *stream, int type) { @@ -486,7 +490,9 @@ int _x_video_decoder_init (xine_stream_t *stream) { } else { pthread_attr_t pth_attrs; +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING struct sched_param pth_params; +#endif int err, num_buffers; /* The fifo size is based on dvd playback where buffers are filled * with 2k of data. With 500 buffers and a typical video data rate @@ -515,10 +521,12 @@ int _x_video_decoder_init (xine_stream_t *stream) { stream->spu_track_map_entries = 0; pthread_attr_init(&pth_attrs); +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING pthread_attr_getschedparam(&pth_attrs, &pth_params); pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); pthread_attr_setschedparam(&pth_attrs, &pth_params); pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); +#endif stream->video_thread_created = 1; if ((err = pthread_create (&stream->video_thread, diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index cd73233c3..26ad98290 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -1911,7 +1911,9 @@ xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabon this->grab_only = 0; pthread_attr_init(&pth_attrs); +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM); +#endif if ((err = pthread_create (&this->video_thread, &pth_attrs, video_out_loop, this)) != 0) { -- cgit v1.2.3 From 1c9cf7069230ea1016879161d5530fbbd5721d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Merz?= Date: Sun, 18 Jul 2010 14:47:16 +0000 Subject: Fix metronome not getting audio PTS The xine libmad adaptor seemed not to forward the pts to the metronome: It buffers the MPEG audio packets until a threshold is reached (MAD_MIN_SIZE: 2889 bytes) and then has libmad decode the packets which is send to audio out. The pts of the last audio packet is forwarded on to metronome which can then sync video with audio. For the channel4 channels MPEG audio packets have a size of 576 bytes which means it takes five packets to fill the buffer enough for processing. In the stream every fifth audio packet contains a pts. The result of this is: If after a seek, the last audio packet is the one with the pts, video and audio are in sync. If the pts is in any of the four previous ones no pts will reach metronome and video and audio will never be synced before a new seek and even then there's a one in five chance that video and audio are not synced. Other channels did not show this behaviour because e.g. BBC One has an audio packet size of about 750 bytes and send a pts every fifth packet as well. This means that not every pts from the stream gets through to metronome but some do. This also means that syncing after a seek is probably not as quick as it could be but it will sync. My workaround to this problem is to start decoding not only when a the buffer has reached a threshold but also when a pts != 0 arrives. This does mean however that the buffer isn't always filled to the theshold and decoding might not perform as well as it could. --HG-- extra : transplant_source : %EC%90%EB%AA%8A%C7%BD%A4%B7%EE%F5%E9%E8SY%89S%9D0s --- src/libmad/xine_mad_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libmad/xine_mad_decoder.c b/src/libmad/xine_mad_decoder.c index c9067a676..6fb56dbd1 100644 --- a/src/libmad/xine_mad_decoder.c +++ b/src/libmad/xine_mad_decoder.c @@ -190,7 +190,7 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { mad_stream_buffer (&this->stream, this->buffer, this->bytes_in_buffer); - if (this->bytes_in_buffer < MAD_MIN_SIZE) + if (this->bytes_in_buffer < MAD_MIN_SIZE && buf->pts == 0) return; if (!this->needs_more_data) { -- cgit v1.2.3 From 99995e9829efc897518c2cf3265dbcac7149c90d Mon Sep 17 00:00:00 2001 From: Matthias Drochner Date: Wed, 21 Jul 2010 15:46:13 +0000 Subject: Add NetBSD support to the VCD input plugin --HG-- extra : rebase_source : cfee1d5353fa3cacf4df8712fde15cd94e2ee3d4 --- src/input/input_vcd.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 43980bd52..3e65f7203 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #ifdef HAVE_LINUX_CDROM_H @@ -92,7 +93,7 @@ typedef struct { #if defined (__linux__) || defined(__sun) struct cdrom_tochdr tochdr; struct cdrom_tocentry tocent[100]; -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) struct ioc_toc_header tochdr; struct cd_toc_entry *tocent; off_t cur_sec; @@ -117,7 +118,7 @@ typedef struct { int cur_track; -#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306) uint8_t cur_min, cur_sec, cur_frame; #endif @@ -177,7 +178,7 @@ static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { return 0; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { struct ioc_read_toc_entry te; @@ -393,7 +394,7 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen, memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */ return VCDSECTORSIZE; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_read (input_plugin_t *this_gen, char *buf, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; @@ -531,7 +532,7 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */ return buf; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t nlen) { @@ -690,7 +691,7 @@ static off_t vcd_plugin_seek (input_plugin_t *this_gen, return offset ; /* FIXME */ } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { @@ -764,7 +765,7 @@ static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { return (off_t) 0; } -#elif defined (__FreeBSD_kernel__) || defined (__OpenBSD__) +#elif (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; off_t len ; @@ -859,7 +860,7 @@ static int vcd_plugin_open (input_plugin_t *this_gen) { this->cur_min = this->cls->tocent[this->cur_track].cdte_addr.msf.minute; this->cur_sec = this->cls->tocent[this->cur_track].cdte_addr.msf.second; this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame; -#elif defined (__OpenBSD__) +#elif defined (__OpenBSD__) || defined(__NetBSD__) this->cur_min = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.minute; this->cur_sec = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.second; this->cur_frame = this->cls->tocent[this->cur_track + 1 - this->cls->tochdr.starting_track].addr.msf.frame; -- cgit v1.2.3 From 5444a0ac73c01b7dabfce3bb81ac6094c44fb5ab Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 21 Jul 2010 19:32:07 +0100 Subject: =?UTF-8?q?0=20=E2=86=92=20NULL=20for=20consistency.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/post/audio/upmix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 76cf8f1b2..f4ea9544a 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -396,7 +396,7 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs, _x_post_init(&this->post, 1, 0); - pthread_mutex_init(&this->lock, 0); + pthread_mutex_init(&this->lock, NULL); this->params.cut_off_freq = 100; -- cgit v1.2.3 From 7e21b7edcf1cbb074c2d9939e9bf318251822604 Mon Sep 17 00:00:00 2001 From: Lorenzo Desole Date: Wed, 21 Jul 2010 20:51:10 +0200 Subject: Remove duplicate code --- src/xine-engine/demux.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 68fedbcf4..87cc18011 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -343,17 +343,8 @@ static void *demux_loop (void *stream_gen) { /* someone may want to interrupt us */ if( stream->demux_action_pending ) { - struct timeval tv; struct timespec ts; - - gettimeofday(&tv, NULL); - ts.tv_sec = tv.tv_sec; - ts.tv_nsec = (tv.tv_usec + 100000) * 1000; - if (ts.tv_nsec >= 1000000000) { - ts.tv_nsec -= 1000000000; - ts.tv_sec += 1; - } - + ts = _x_compute_interval(100); pthread_cond_timedwait (&stream->demux_resume, &stream->demux_lock, &ts); } } -- cgit v1.2.3 From b3d7900c813f294c02da62068e0f1634ac4cdd41 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 24 Jul 2010 23:33:53 +0100 Subject: Resync. --- po/cs.po | 72 +++++++++++++++++++++++++++++++------------------------ po/de.po | 72 +++++++++++++++++++++++++++++++------------------------ po/en_US.po | 72 +++++++++++++++++++++++++++++++------------------------ po/eo.po | 72 +++++++++++++++++++++++++++++++------------------------ po/es.po | 72 +++++++++++++++++++++++++++++++------------------------ po/eu.po | 72 +++++++++++++++++++++++++++++++------------------------ po/fr.po | 72 +++++++++++++++++++++++++++++++------------------------ po/it.po | 72 +++++++++++++++++++++++++++++++------------------------ po/libxine1.pot | 74 ++++++++++++++++++++++++++++++++------------------------- po/pl.po | 73 ++++++++++++++++++++++++++++++++------------------------ po/pt_BR.po | 72 +++++++++++++++++++++++++++++++------------------------ po/sk.po | 72 +++++++++++++++++++++++++++++++------------------------ po/tr.po | 72 +++++++++++++++++++++++++++++++------------------------ 13 files changed, 535 insertions(+), 404 deletions(-) diff --git a/po/cs.po b/po/cs.po index f3f447101..b38a1dbdb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.0.1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2008-11-10 16:33+0200\n" "Last-Translator: František Dvořák \n" "Language-Team: Czech \n" @@ -801,15 +801,15 @@ msgstr "audio_oss_out: open() mixer %s selhalo: %s\n" msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "výstupní zvukový modul xine použije zvuková zařízení/ovladače OSS" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "zařízení použité pro pulseaudio" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "pro nastavení jímacího zařízení pulseaudia použijte '[server[:sink]]'" -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "modul zvukového výstupu xine použije server pulseaudio" @@ -2602,35 +2602,35 @@ msgstr "zařízení rádia v4l" msgid "The path to your Video4Linux radio device." msgstr "Cesta k vašemu zařízení rádia Video4Linux." -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: Neplatné MRL. Použijte vcdo:/\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: neplatná stopa %d (platný rozsah: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "Vstupní modul pro video CD" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "nelze otevřít %s: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: nelze otevřít %s: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "zařízení použité pro přehrávání VCD" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2733,12 +2733,12 @@ msgstr "" "input_pnm: během čtení proudu dat přišla zpráva ze serveru:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: nelze se připojit k '%s'\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: selhalo nastavení proudu dat\n" @@ -3164,15 +3164,15 @@ msgstr "" "Pokud je povoleno, skryté titulky budou umisťovány doprostřed jednotlivých " "řádků." -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "font externích titulků" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "vertikální posun titulků (vzhledem k velikosti okna)" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "kódování titulků" @@ -5211,11 +5211,11 @@ msgstr "audio_decoder: není k dispozici žádný modul ke zpracování '%s'\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: chyba, neznámý typ bufferu: %08x\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "počet bufferů zvuku" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -5375,7 +5375,7 @@ msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" "Pokud je zakázáno, xine nebude při spuštění měnit žádná nastavení mixeru." -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -5387,40 +5387,50 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "xine-lib: buffer.c: Došlo k fatální chybě: PŘÍLIŠ MNOHO FREE\n" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "Stávající konfigurační soubor byl upraven novější verzí xine." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: selhalo otevření souboru kanálu dvb '%s': %s\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: VAROVÁNÍ: zálohování konfiguračního souboru do %s selhalo\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: VAROVÁNÍ: vaše konfigurace nebude uložena\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: VAROVÁNÍ: zápis konfigurace do %s selhal\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: VAROVÁNÍ: odstraní se pravděpodobně poškozený konfigurační " "soubor %s\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: VAROVÁNÍ: měli byste zkontrolovat záložní soubor %s\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: údaj '%s' nesmí být modifikován z MRL\n" @@ -5825,21 +5835,21 @@ msgstr "" "Paleta on-screen-display a některých formátů titulků, které samy o sobě " "nespecifikují žádnou barvu. Paleta je uvedena ve formě: popředí-okraj-pozadí." -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: není k dispozici žádný modul ke zpracování '%s'\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: chyba, neznámý typ bufferu: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "počet bufferů videa" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5901,7 +5911,7 @@ msgstr "" "Pokud se nezobrazí více než toto procento snímků, protože nebyly včas " "naplánovány k zobrazení, pošle xine hlášení." -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/de.po b/po/de.po index 55cb80d90..cb0b42e0e 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.1.6\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2007-04-18 11:00+0200\n" "Last-Translator: Philipp Hahn \n" "Language-Team: German \n" @@ -796,15 +796,15 @@ msgstr "audio_oss_out: open() Mixer %s schlug fehl: %s\n" msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "xine Soundausgabe benutzt OSS-kompatibles Gerät/Treiber" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "Gerät für Pulse-Audio" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "Benutze 'Server[:Senke]' um das Zeil des Puse-Audio Gerätes zu setzen." -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "xine Soundausgabe benutzt Pulse-Audio Soundserver" @@ -2591,35 +2591,35 @@ msgstr "Pfad zum V4L Radiogerät" msgid "The path to your Video4Linux radio device." msgstr "Pfad zum Video4Linux Radiogerät" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: Ungültige MRL: Benutze vcdo:/\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: Fehlerhafter Track %d (Gültiger Bereich: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "Video-CD Plugin" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "Kann %s nicht öffnen: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: Kann %s nicht öffnen: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "Gerät für VCD Wiedergabe" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2720,12 +2720,12 @@ msgstr "" "input_pnm: Während dem Lesen ist eine Nachricht vom Server eingetroffen:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: Kann keine Verbindung zu '%s' herstellen.\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: Datenstrom konnte nicht eingerichtet werden\n" @@ -3158,15 +3158,15 @@ msgstr "" "Falls aktiviert werden die Zeilen des Untertitels jeweils mittig " "ausgerichtet." -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "Zeichensatz für externe Untertitel" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "Vertikaler Versatz für Untertitel (Relativ zu Fenstergröße)" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "Zeichenkodierung für Untertitel" @@ -5204,11 +5204,11 @@ msgstr "audio_decoder: Kein Plugin verfügbar zur Berhandlung von '%s'\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: Fehler, unbekannter Puffertyp: %08x\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "Anzahl der Audiopuffer" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -5374,7 +5374,7 @@ msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" "Wenn nicht angewählte, lässt xine die Lautstärke beim Starten unverändert." -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -5386,40 +5386,50 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "xine-lib: buffer.c: Fataler Defekt: ZU VIELE FREIGABEN\n" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" "Die Konfigurationsdatei wurde von einer neueren Version von xine modifiziert." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: Öffnen der DVB-Kanaldatei '%s' schlug fehl\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: WARNUNG: Sichern der Konfigurationsdatei nach %s schlug fehl\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: WARNUNG: Ihre Konfigurationsdatei wird nicht gesichert\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: WARNUNG: Schreiben der Konfiguration nach %s schlug fehl\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: WARNUNG: Entferne möglicherweise kaputte Konfigurationsdatei %s\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: WARNUNG: Überprüfen Sie die Sicherheitskopie %s\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: Eintrag '%s' darf nicht per MRL geändert werden\n" @@ -5832,21 +5842,21 @@ msgstr "" "Färbung spezifizieren. Die Paletten sind in der Form Vordergrund-Rand-" "Hintergrund aufgelistst." -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: Kein Plugin gefunden zur Behandlung von '%s'\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: Fehler, unbekannter Puffertyp: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "Anzahl der Videopuffer" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5908,7 +5918,7 @@ msgstr "" "xine zeigt eine Meldung an, wenn mehr Frames als dieser Prozentsatz nicht " "angezeigt werden, weil sie nicht rechtzeitig dargestellt werden konnten." -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/en_US.po b/po/en_US.po index b111b6bec..bc79c1bfc 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib.hg\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2009-01-15 19:04+0000\n" "Last-Translator: Not translated \n" "Language-Team: en_US \n" @@ -678,15 +678,15 @@ msgstr "" msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "" @@ -2207,35 +2207,35 @@ msgstr "" msgid "The path to your Video4Linux radio device." msgstr "" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2332,12 +2332,12 @@ msgid "" "%s\n" msgstr "" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "" @@ -2701,15 +2701,15 @@ msgid "" "individual lines." msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "" @@ -4281,11 +4281,11 @@ msgstr "" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4407,7 +4407,7 @@ msgstr "" msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -4417,37 +4417,47 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4822,21 +4832,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -4885,7 +4895,7 @@ msgid "" "not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/eo.po b/po/eo.po index 5b9243f74..686b9eb55 100644 --- a/po/eo.po +++ b/po/eo.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: eo\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2007-05-24 17:57+0200\n" "Last-Translator: Antonio C. Codazzi \n" "Language-Team: \n" @@ -705,15 +705,15 @@ msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "" "kromaĵo de xine-aŭdligo kiu uzas aŭdajn aparatojn/zorgiloj oss-favorajn" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "aparato uzata por pulsa aŭdo" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "uzu 'server[:sink]' por agordi aparato de pulsa aŭdo." -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "aŭdeliga xine-kromaĵo uzanta sonservilon de pulseaudio" @@ -2311,35 +2311,35 @@ msgstr "v4l radiooaparato" msgid "The path to your Video4Linux radio device." msgstr "Raŭto por radioaparato de Video4Linux" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: difektita MRL. Uzu vcdo:/\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: nevalida trako %d (valida intervalo: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "Eniga kromaĵo por Videa KD (VCD)" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "Mi estas nekapabla malfermi %s: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: mi estas nekapabla malfermi %s: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "aparato uzata por legi/ludi VCD" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2440,12 +2440,12 @@ msgstr "" "input_pnm: mesaĝo el servilo dum lego de datumstrio:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "nput_pnm: malsukcesis konekto '%s'\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: agordado de datumstrio malsukcesis\n" @@ -2813,15 +2813,15 @@ msgid "" "individual lines." msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "tiparo por eksteraj surskribaĵoj" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "vertikala deŝovo de surskribaĵoj (rilata al fenestrogrando)" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "kodo de surskribaĵoj" @@ -4556,11 +4556,11 @@ msgstr "audio_decoder: neniu disponebla kromaĵo por administi '%s'\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: eraro, nekonata speco de bufro: %08x\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "nombro da bufroj de aŭdo" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4687,7 +4687,7 @@ msgstr "" "Se ĝi estas malebligita, xine ne povas ŝanĝi agordojn de miksilo dum " "preparado." -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "audio_out: pardonu, tio ne devus okazi. bonvolu restartigi xine.\n" @@ -4697,39 +4697,49 @@ msgstr "audio_out: pardonu, tio ne devus okazi. bonvolu restartigi xine.\n" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" "La nuna dosiero de agordoj estas modifita far de pli nova versio de xine." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: malsukcesis malfermo de dosiero de dvb-kanalo '%s'\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "configfile: WARNING: reservado de configfile en %s malsukcesis\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: ATENTU: via agordaĵo ne estos konservita\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: ATENTU: skribo de agordaĵo en %s malsukcesis\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: ATENTU: formovovo de probable difektita dosiero de agordoj %s\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: ATENTU: kontrolu restaŭrdosieron %s\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: ero '%s' ne devas esti modifita el MRL\n" @@ -5130,21 +5140,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: neniu disponebla kromaĵo por administi '%s'\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: eraro, nekonata speco de bufro: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "nombro da videobufroj" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5196,7 +5206,7 @@ msgid "" "not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "video_out: pardonu, tio ne devus okazi. bonvolu restartigi xine.\n" diff --git a/po/es.po b/po/es.po index f92d40eb9..a5cfd84c9 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib.hg\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2008-04-02 01:05+0200\n" "Last-Translator: Carlos E. R. M. \n" "Language-Team: Spanish \n" @@ -820,18 +820,18 @@ msgstr "" "compatibles OSS" # Cer: ¿pulseaudio? -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "dispositivo usado para audio a pulsos" # Cer: ¿pulseaudio? Estaba como "polypaudio" pero fuzzy. -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" "use 'server[:sink]' para definir el sumidero del dispositivo audio a pulsos." # Cer: ¿pulseaudio? -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "" "complemento de xine de salida de audio usando servidor de sonido audio a " @@ -2694,35 +2694,35 @@ msgstr "dispositivo audio v4l" msgid "The path to your Video4Linux radio device." msgstr "El camino a su dispositivo de radio Video4Linux." -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: MRL mal formada. Use vcdo:/\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: pista %d no válida (rango válido: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "Complemento de entrada de vídeo CD" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "incapaz de abrir %s: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: incapaz de abrir %s: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "dispositivo usado para reproducción de VCD" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2831,12 +2831,12 @@ msgstr "" "bits:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: falló en conectar '%s'\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: falló en poner el flujo de bits\n" @@ -3278,16 +3278,16 @@ msgstr "" "Cuando se activa, el subtitulado se posicionará en el centro de las lineas " "individuales." -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "tipografía para subtítulos externos" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "" "desplazamiento vertical de los subtítulos (relativo al tamaño de ventana)" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "codificado de los subtítulos" @@ -5422,11 +5422,11 @@ msgstr "audio_decoder: no hay disponible complemento para manejar '%s'\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: error, tipo de tampón desconocido: %08x\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "número de tampones de audio" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -5591,7 +5591,7 @@ msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" "Si se desactiva, xine no modificará ningún ajuste del mezclador al arrancar." -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -5604,42 +5604,52 @@ msgstr "" "xine-lib: buffer.c: Ha ocurrido un error fatal: DEMASIADAS LIBERACIONES DE " "MEMORIA (FREE'S)\n" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" "El fichero actual de configuración ha sido modificado por una versión de " "xine más nueva." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: falló al abrir el fichero de canales'%s': %s\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: AVISO: la copia de seguridad del fichero de configuración a %s " "falló\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: AVISO: su configuración no será guardada\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: AVISO: la escritura de la configuración a %s falló\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: AVISO: eliminando fichero de configuración %s posiblemente roto\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: AVISO: debería comprobar el fichero de respaldo %s\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: la entrada '%s' no debería ser modificada desde MRL\n" @@ -6056,21 +6066,21 @@ msgstr "" "que no especifican ningún coloreado ellos mismos. Las paletas se listan en " "la forma:frente-borde-fondo." -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: no hay complemento disponible para manejar '%s'\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: error, tipo de tampón desconocido: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "número de tampones de vídeo" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -6131,7 +6141,7 @@ msgstr "" "Cuando más de este porcentaje de cuadros no sean mostrados, porque no fueron " "programados para su visualización a tiempo, xine envía una notificación." -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/eu.po b/po/eu.po index 237705016..6cf8b3e74 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib-1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2005-02-17 14:29+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: lubrezale \n" @@ -805,16 +805,16 @@ msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "" "xine audio irteera plugina oss-kompilaturiko audio gailu/kontrolatzailea" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 #, fuzzy msgid "device used for pulseaudio" msgstr "CD audio-k erabiliko duen gailua" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 #, fuzzy msgid "xine audio output plugin using pulseaudio sound server" msgstr "xine audio irteera plugina esound erabiliz" @@ -2495,35 +2495,35 @@ msgstr "v4l irrati gailua" msgid "The path to your Video4Linux radio device." msgstr "Video4Linux irrati gailuaren bidea." -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: gaikieraturiko MRL-a. vcdo:/ erbili\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: %d pista baliogabea (baliozko eremua: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "Bideoa CD sarrera plugina" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "Ezin da %s ireki: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: Ezin da %s ireki: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "VCD erreproduzitzeko erabiliko den gailua" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2625,12 +2625,12 @@ msgstr "" "input_pnm: zerbitzariritik mezua bat jaso da korrontea irakurtzerakoan:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: ezin da '%s' konektatu\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: huts korrotea ezartzerakoan\n" @@ -3030,15 +3030,15 @@ msgstr "" "Gaiturik daudenean, itxitako titulu testua lerro bakoitzean erdiratu egingo " "da." -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "Kanpo azpitituluen letra-tipoa" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "azpititulu kokapen bertikala (panataila tamainaren arabera)" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "Apititulu kodifikatzea" @@ -4723,11 +4723,11 @@ msgstr "audio_decoder: ez dago plugin erabilgarririk '%s' kudeatzeko\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: errorea, buffer mota ezezaguna: %08x\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "audio buffer kopurua" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4852,7 +4852,7 @@ msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" "ezgaiturik badago, xine-k ez ditu nahasle ezarpenak aldatuko abiaraztean." -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -4863,42 +4863,52 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" "Konfigurazio fitxategia xine-ren bertsio berriagobategatik aldatua izan da." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: huts '%s' dvb kanal fitxategia irekitzerakoan\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: ABISUA: %s-en konfigurazio fitxategia segurtasun kopia egiten\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: ABISUA: zure konfigurazioa ezin da gorde\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: ABISUA: huts %s konfigurazioa gordetzerakoan\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: ABISUA: agian apurturiko %s konfigurazio fitxategia ezabatzen\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" "configfile: ABISUA: zuk segurtasun kopia %s fitxategia egiaztatu beharko " "zenuke\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: ¡'%s' sarrera ezin MRL-tik aldatu\n" @@ -5290,21 +5300,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: ez dago pluginik '%s' kudeatzeko\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: errorea, buffer mota ezezaguna: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "bideo buffer kopurua" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5354,7 +5364,7 @@ msgid "" "not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 1c1ef0b7c..7ed2dde3b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.1.9\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2008-01-01 15:18+0100\n" "Last-Translator: Christophe Giraud \n" "Language-Team: french \n" @@ -762,15 +762,15 @@ msgstr "" "plugin de sortie audio xine utilisant les pilotes/périphériques audio " "compatible oss" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "périphérique utilisé pour pulseaudio" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "plugin de sortie audio xine utilisant le serveur de son pulseaudio" @@ -2323,35 +2323,35 @@ msgstr "périphérique radio v4l" msgid "The path to your Video4Linux radio device." msgstr "Le chemin d'accès vers votre périphérique radio Video4Linux" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: MRL mal formée. Utilisez vcdo:/\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: piste %d invalide (limites correctes: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "plugin d'entré Video CD" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "incapable d'ouvrir %s: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: incapable d'ouvrir %s: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "périphérique utilisé pour la lecture des VCD" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2452,12 +2452,12 @@ msgid "" "%s\n" msgstr "" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: impossible de se connecter '%s'\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "" @@ -2821,15 +2821,15 @@ msgid "" "individual lines." msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "" @@ -4412,11 +4412,11 @@ msgstr "" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4538,7 +4538,7 @@ msgstr "" msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -4548,37 +4548,47 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4957,21 +4967,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5020,7 +5030,7 @@ msgid "" "not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/it.po b/po/it.po index a7064c9d7..956b42697 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2007-12-24 16:09+0100\n" "Last-Translator: Diego 'Flameeyes' Pettenò \n" "Language-Team: Italian\n" @@ -810,16 +810,16 @@ msgstr "" "plugin output audio di xine che usa i dispositivi/driver audio compiacenti " "di oss" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "dispositivo utilizzato per PulseAudio" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" "Si usi 'server[:sink]' per impostare il dispositivo sink di PulseAudio." -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "plugin di output audio di xine che usa il server sonoro PulseAudio" @@ -2659,35 +2659,35 @@ msgstr "dispositivo radio v4l" msgid "The path to your Video4Linux radio device." msgstr "Il percorso al proprio dispositivo radio Video4Linux," -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: MRL malformata. Utilizzare vcdo://\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: traccia %d non valida (intervallo valido: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "plugin di input per Video CD" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "impossibile aprire %s: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: impossibile aprire %s: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "dispositivo utilizzato per la riproduzione VCD" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2789,12 +2789,12 @@ msgstr "" "input_pnm: ricevuto messaggio dal server durante la lettura dello stream:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: connessione fallita '%s'\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: impostazione dello stream fallita.\n" @@ -3232,15 +3232,15 @@ msgstr "" "Se abilitato i sottotitoli CC saranno posizionati al centro delle rispettive " "righe." -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "Carattere per sottotitoli esterni" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "Spostamento verticale sottotitolo" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "Codifica dei sottotitoli" @@ -5254,11 +5254,11 @@ msgstr "audio_decoder: nessun plugin disponibile per gestire '%s'\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: errore, tipo di buffer %08x sconosciuto\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "numero di buffer audio" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -5426,7 +5426,7 @@ msgstr "" "Se disabilitato, xine non modificherà alcuna impostazione del mixer " "all'avvio." -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -5438,44 +5438,54 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "xine-lib: buffer.c: C'è stato un errore fatale: TROPPI FREE\n" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" "L'attuale file di configurazione è stato modificato da una nuova versione di " "xine." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: apertura file canali DVB non riuscita '%s': %s\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: ATTENZIONE: copia di backup del file di configurazione in %s " "fallita.\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: ATTENZIONE: la propria configurazione non sarà salvata.\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" "configfile: ATTENZIONE: scrittura della configurazione in %s fallita.\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: ATTENZIONE: rimozione del file di configurazione %s " "possibilmente rovinato.\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: ATTENZIONE: si controlli il file di backup %s.\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: la voce '%s' non deve essere modificata da MRL\n" @@ -5891,21 +5901,21 @@ msgstr "" "sottotitolo ceh non specificano nessuna colorazione. Le palette sono " "elencate nella forma: primo piano - bordo - sfondo." -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: nessun plugin disponibile per gestire '%s'\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: errore, tipo di buffer sconosciuto: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "numero di buffer video" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5965,7 +5975,7 @@ msgstr "" "Quando non è mostrata una percentuale di frame superiore a questa, perché " "non disposti alla visualizzazione in tempo, xine invia una notifica." -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/libxine1.pot b/po/libxine1.pot index 4fe4ce87a..31f86b92d 100644 --- a/po/libxine1.pot +++ b/po/libxine1.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xine-lib 1.1.18.1hg\n" +"Project-Id-Version: xine-lib 1.1.19\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -680,15 +680,15 @@ msgstr "" msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "" @@ -2209,35 +2209,35 @@ msgstr "" msgid "The path to your Video4Linux radio device." msgstr "" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2334,12 +2334,12 @@ msgid "" "%s\n" msgstr "" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "" @@ -2703,15 +2703,15 @@ msgid "" "individual lines." msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "" @@ -4283,11 +4283,11 @@ msgstr "" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4409,7 +4409,7 @@ msgstr "" msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -4419,37 +4419,47 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4824,21 +4834,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -4887,7 +4897,7 @@ msgid "" "not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 0078bc53d..30d14879e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pl_PL\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2003-05-24 12:36+0200\n" "Last-Translator: Bartłomiej Muryn <_4ever_@irc.pl>\n" "Language-Team: Polish \n" @@ -725,18 +725,18 @@ msgstr "" "z oss" # src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927 -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 #, fuzzy msgid "device used for pulseaudio" msgstr "urządzenie użyte do wyjścia 4-kanałowego" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" # src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927 # src/audio_out/audio_esd_out.c:441 -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 #, fuzzy msgid "xine audio output plugin using pulseaudio sound server" msgstr "wtyczka wyjścia dźwięku używająca esound" @@ -2393,41 +2393,41 @@ msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd" msgid "The path to your Video4Linux radio device." msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "" # src/input/input_http.c:640 -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "wtyczka wejścia VCD" # src/input/input_rtp.c:205 -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, fuzzy, c-format msgid "unable to open %s: %s.\n" msgstr "nie mogę znaleźć IP dla '%s'.\n" # src/input/input_net.c:126 -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, fuzzy, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_net: nie mogę znaleźć IP dla '%s'.\n" # src/audio_out/audio_alsa_out.c:181 src/audio_out/audio_alsa_out.c:728 # src/audio_out/audio_alsa_out.c:913 src/audio_out/audio_alsa_out.c:957 -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 #, fuzzy msgid "device used for VCD playback" msgstr "urządzenie użyte w trybie mono" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2531,13 +2531,13 @@ msgid "" msgstr "" # src/input/input_net.c:138 -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, fuzzy, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_net: nie mogę podłączyć się do '%s'.\n" # src/input/input_http.c:98 -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, fuzzy, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_http: otwarcie gniazda zawiodło\n" @@ -2922,19 +2922,19 @@ msgid "" msgstr "" # src/libsputext/xine_decoder.c:1078 -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 #, fuzzy msgid "font for external subtitles" msgstr "fonty dla zewnętrznych napisów" # src/libsputext/xine_decoder.c:1084 -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 #, fuzzy msgid "subtitle vertical offset (relative window size)" msgstr "pionowe wyrównanie napisów (względny rozmiar okna)" # src/libsputext/xine_decoder.c:1078 -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 #, fuzzy msgid "encoding of subtitles" msgstr "kodowanie napisów" @@ -4562,11 +4562,11 @@ msgstr "" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4701,7 +4701,7 @@ msgstr "" "starcie" # src/xine-engine/video_out.c:893 -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, fuzzy, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -4713,37 +4713,48 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +# src/input/input_http.c:98 +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_http: otwarcie gniazda zawiodło\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -5150,21 +5161,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5216,7 +5227,7 @@ msgid "" msgstr "" # src/xine-engine/video_out.c:893 -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index c4c883d9b..131a3c9c8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 0.9.13\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2002-01-22 18:31GMT-3\n" "Last-Translator: Marcelo Roberto Jimenez \n" "Language-Team: Portuguese (Brazilian) \n" @@ -684,15 +684,15 @@ msgstr "input_cda: open(%s) failed: %s.\n" msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 #, fuzzy msgid "xine audio output plugin using pulseaudio sound server" msgstr "http network stream input plugin" @@ -2229,36 +2229,36 @@ msgstr "" msgid "The path to your Video4Linux radio device." msgstr "" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, fuzzy, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: MRL mal formada. Use vcd://\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: trilha invalida %d (faixa valida: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 #, fuzzy msgid "Video CD input plugin" msgstr "http network stream input plugin" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "incapaz de abrir %s: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, fuzzy, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2355,12 +2355,12 @@ msgid "" "%s\n" msgstr "" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, fuzzy, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_net: incapaz de conectar em '%s'.\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, fuzzy, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_http: failed to open socket\n" @@ -2725,15 +2725,15 @@ msgid "" "individual lines." msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "" @@ -4307,11 +4307,11 @@ msgstr "audio decoder plugin achado : %s\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4433,7 +4433,7 @@ msgstr "" msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, fuzzy, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -4445,37 +4445,47 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4864,21 +4874,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, fuzzy, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video decoder plugin achado : %s\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -4929,7 +4939,7 @@ msgid "" "not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, fuzzy, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index 789e52d0e..2073cf9f1 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.0\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2004-09-15 13:53+0100\n" "Last-Translator: \n" "Language-Team: Slovak \n" @@ -721,16 +721,16 @@ msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "" "výstupný xine audio plugin používa oss-compliant audio zariadenia/ovládače" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 #, fuzzy msgid "device used for pulseaudio" msgstr "zariadenie pre cdda mechaniku" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 #, fuzzy msgid "xine audio output plugin using pulseaudio sound server" msgstr "výstupný xine audio plugin používa esound" @@ -2332,36 +2332,36 @@ msgstr "cesta k rádio zariadeniu v4l" msgid "The path to your Video4Linux radio device." msgstr "cesta k rádio zariadeniu v4l" -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: neplatné MRL. Použite vcdo:/<číslo stopy>\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: neplatná stopa %d (platný rozsah: 0..%d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "modul vstupu z Video CD" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "nemožno otvoriť %s: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: nemožno otvoriť %s: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 #, fuzzy msgid "device used for VCD playback" msgstr "zariadenie pre mono výstup" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2461,12 +2461,12 @@ msgstr "" "input_pnm: získaná spáva od servra počas čítania prúdu:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: nemožno sa pripojiť k '%s'\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: zlyhalo nastavenie prúdu dát\n" @@ -2867,17 +2867,17 @@ msgid "" "individual lines." msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 #, fuzzy msgid "font for external subtitles" msgstr "Font pre externé titulky" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 #, fuzzy msgid "subtitle vertical offset (relative window size)" msgstr "Vertikálny posun titulkov (vzhľadom k velkosti okna)" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 #, fuzzy msgid "encoding of subtitles" msgstr "Kódovanie titulkov" @@ -4724,11 +4724,11 @@ msgstr "audio_decoder: žiaden modul nedostupný na spracovanie '%s'\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: chyba, neznámy typ bufferu: %08x\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -4856,7 +4856,7 @@ msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" "ak toto nie je nastavené, xine sa nedotkne pri štarte nastavenia mixéru" -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "audio_out: prepáč, toto sa nemalo stať, prosím reštartuj xine.\n" @@ -4866,37 +4866,47 @@ msgstr "audio_out: prepáč, toto sa nemalo stať, prosím reštartuj xine.\n" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "Aktuálny konfiguračný súbor bol modifikovaný novou verziou xine." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "configfile: VAROVANIE: záloha konf.súboru do %s zlyhala\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: VAROVANIE: vaša konfigurácia nebude uložená\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: VAROVANIE: zápis konfigurácie %s zlyhal\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "configfile: VAROVANIE: odstraňujem možno poškodený konf. súbor %s\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: VAROVANIE: mali by ste skontrolovať záložný súbor %s\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: položka '%s' nesmie byť modifikovaná z MRL\n" @@ -5290,21 +5300,21 @@ msgid "" "foreground-border-background." msgstr "" -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: nedostupný modul na spracovanie '%s'\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: chyba, neznámy typ bufferu: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5355,7 +5365,7 @@ msgid "" "not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "video_out: prepáč, toto sa nemalo stať, reštartuj xine.\n" diff --git a/po/tr.po b/po/tr.po index 86428a433..d2e1f9ac9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: libxine1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-05-02 14:04+0100\n" +"POT-Creation-Date: 2010-07-24 23:32+0100\n" "PO-Revision-Date: 2008-01-05 18:22+0200\n" "Last-Translator: Server Acim \n" "Language-Team: Türkçe \n" @@ -778,15 +778,15 @@ msgstr "audio_oss_out: karıştırıcı() açılması %s başarılamadı: %s\n" msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "xine ses çıkışı eklentisi oss uyumlu aygıtları/sürücüleri kullanıyor" -#: src/audio_out/audio_pulse_out.c:763 +#: src/audio_out/audio_pulse_out.c:814 msgid "device used for pulseaudio" msgstr "pulseaudio için kullanılan aygıt" -#: src/audio_out/audio_pulse_out.c:764 +#: src/audio_out/audio_pulse_out.c:815 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "sesatımı kısma aygıtını ayarlamak için sunucuyu [:kısma] kullanın." -#: src/audio_out/audio_pulse_out.c:845 +#: src/audio_out/audio_pulse_out.c:898 msgid "xine audio output plugin using pulseaudio sound server" msgstr "" "xine ses çıkışı eklentisi sesatımı uyumlu aygıtları/sürücüleri kullanıyor" @@ -2593,35 +2593,35 @@ msgstr "v4l radyo aygıtı" msgid "The path to your Video4Linux radio device." msgstr "Video4Linux radyo aygıtının yolu." -#: src/input/input_vcd.c:847 +#: src/input/input_vcd.c:848 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/\n" msgstr "input_vcd: bozuk MRL. vcdo:/ kullanın\n" -#: src/input/input_vcd.c:853 +#: src/input/input_vcd.c:854 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "input_vcd: geçersiz iz %d (geçerli oran: 0 .. %d)\n" -#: src/input/input_vcd.c:924 +#: src/input/input_vcd.c:925 msgid "Video CD input plugin" msgstr "Video CD girdi eklentisi" -#: src/input/input_vcd.c:978 +#: src/input/input_vcd.c:979 #, c-format msgid "unable to open %s: %s.\n" msgstr "%s açılamadı: %s.\n" -#: src/input/input_vcd.c:1040 +#: src/input/input_vcd.c:1041 #, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "input_vcd: %s açılamadı: %s.\n" -#: src/input/input_vcd.c:1088 +#: src/input/input_vcd.c:1089 msgid "device used for VCD playback" msgstr "VCD oynatmak için kullanılan aygıt" -#: src/input/input_vcd.c:1089 +#: 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." @@ -2722,12 +2722,12 @@ msgstr "" "input_pnm: yayın akışıniı okurken sunucdan mesaj geldi:\n" "%s\n" -#: src/input/pnm.c:752 +#: src/input/pnm.c:753 #, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "input_pnm: '%s' konumuna bağlanılamadı\n" -#: src/input/pnm.c:763 +#: src/input/pnm.c:764 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "input_pnm: akış ayarlaması başarısız oldu\n" @@ -3154,15 +3154,15 @@ msgid "" "individual lines." msgstr "Etkinleştirildiğinde, bireysel satırlar ortalanacaktır." -#: src/libspucmml/xine_cmml_decoder.c:467 +#: src/libspucmml/xine_cmml_decoder.c:468 msgid "font for external subtitles" msgstr "dış altyazılar için yazı tipi" -#: src/libspucmml/xine_cmml_decoder.c:473 +#: src/libspucmml/xine_cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "altyazı dikey konumu (pencere boyutuna göre değişir)" -#: src/libspucmml/xine_cmml_decoder.c:516 +#: src/libspucmml/xine_cmml_decoder.c:517 msgid "encoding of subtitles" msgstr "altyazıların kodlanması" @@ -5235,11 +5235,11 @@ msgstr "audio_decoder: kullanılacak bir eklenti yok '%s'\n" msgid "audio_decoder: error, unknown buffer type: %08x\n" msgstr "audio_decoder: hata, bilinmeyen ön bellek türü: %08x\n" -#: src/xine-engine/audio_decoder.c:486 +#: src/xine-engine/audio_decoder.c:488 msgid "number of audio buffers" msgstr "ses ön belleklerinin sayısı" -#: src/xine-engine/audio_decoder.c:487 +#: src/xine-engine/audio_decoder.c:489 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 " @@ -5399,7 +5399,7 @@ msgstr "" "eğer etkin değilse, xine başlangıçta herhangi bir karşıtırıcı ayarı " "yapmayacaktır." -#: src/xine-engine/audio_out.c:2296 +#: src/xine-engine/audio_out.c:2298 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" @@ -5411,43 +5411,53 @@ msgstr "" msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "xine-lib: buffer.c: Sonlandırıcı bir hata var: TOO MANY FREE's\n" -#: src/xine-engine/configfile.c:938 +#: src/xine-engine/configfile.c:939 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" "Şu anki yapılandırma dosyası xine'nin daha yeni bir uygulaması tarafından " "değiştirilmiş durumdadır." -#: src/xine-engine/configfile.c:1045 +#: src/xine-engine/configfile.c:992 +#, c-format +msgid "Loaded configuration from file '%s'\n" +msgstr "" + +#: src/xine-engine/configfile.c:997 +#, fuzzy, c-format +msgid "Failed to load configuration from file '%s': %s\n" +msgstr "input_dvb: dvb kanal dosyası açılamadı '%s': %s\n" + +#: src/xine-engine/configfile.c:1052 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: UYARI: configfile dosyasının şuraya %s yedeklenmesi " "başarılamadı\n" -#: src/xine-engine/configfile.c:1046 +#: src/xine-engine/configfile.c:1053 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: UYARI: yapılandırmanız kaydedilmeyecektir\n" -#: src/xine-engine/configfile.c:1146 +#: src/xine-engine/configfile.c:1153 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: UYARI: yapılandırmanın şuraya %s yazılması başarılamadı\n" -#: src/xine-engine/configfile.c:1147 +#: src/xine-engine/configfile.c:1154 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: UYARI: büyük ihtimaller bozulmuş olan yapılandırma dosyasını " "kaldırıyor %s\n" -#: src/xine-engine/configfile.c:1148 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: UYARI: yedekleme dosyasını denetlemelisiniz %s\n" -#: src/xine-engine/configfile.c:1283 +#: src/xine-engine/configfile.c:1290 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: girdi '%s' MRL tarafından değiştirilmiş olmamalı\n" @@ -5856,21 +5866,21 @@ msgstr "" "renklendirmelerini belirlemezler. Paletler formda listelenmiştir: ün yüz-" "sınır-arka plan." -#: src/xine-engine/video_decoder.c:387 +#: src/xine-engine/video_decoder.c:391 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "video_decoder: '%s' dosyasını işleyebilmek için uygun eklenti yok\n" -#: src/xine-engine/video_decoder.c:466 +#: src/xine-engine/video_decoder.c:470 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "video_decoder: hata, bilinmeyen tampon bellek türü: %08x\n" -#: src/xine-engine/video_decoder.c:502 +#: src/xine-engine/video_decoder.c:508 msgid "number of video buffers" msgstr "video tamponlarının sayısı" -#: src/xine-engine/video_decoder.c:503 +#: src/xine-engine/video_decoder.c:509 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 " @@ -5932,7 +5942,7 @@ msgstr "" "Bu çerçeve oranlarından daha fazlası gösterilmezse, zamanında " "görüntülenmeleri için programlanmadıklarındandır, xine bir uyarı gönderir." -#: src/xine-engine/video_out.c:1922 +#: src/xine-engine/video_out.c:1924 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" -- cgit v1.2.3 From 4b78d4063f28a08f8ddfcb0e79063ecca1eb1c10 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 25 Jul 2010 15:37:31 +0100 Subject: 1.1.19. --- ChangeLog | 2 +- configure.ac | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 508715ed8..0bb165ed5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.19) 2010-??-?? +xine-lib (1.1.19) 2010-07-25 * Handle odd widths properly (for ffmpeg-decoded video). * Make buildable with current (external) libdvdnav & libdvdread. * Fix V4L2 check. diff --git a/configure.ac b/configure.ac index 78d2ecfda..dc53a73a5 100644 --- a/configure.ac +++ b/configure.ac @@ -17,9 +17,9 @@ dnl XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below dnl XINE_MAJOR=1 XINE_MINOR=1 -XINE_SUB=18 +XINE_SUB=19 dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar -XINE_PATCH=.1 +XINE_PATCH= dnl Release series number (usually $XINE_MAJOR.$XINE_MINOR) XINE_SERIES=1.1 @@ -29,7 +29,7 @@ dnl else XINE_SUBPART=".$XINE_SUB$XINE_PATCH" dnl fi -dnl The libtool version numbers (XINE_LT_*); Don't even think about faking this! +dnl The libtool version numbers (XINE_LT_*). Don't even think about faking this! dnl dnl immediately before every release do: dnl =================================== @@ -46,17 +46,18 @@ dnl } dnl dnl If you want to know more about what you are doing, here are some details: dnl * XINE_LT_CURRENT is the current API version -dnl * XINE_LT_REVISION is an internal revision number which is increased when the API -dnl itself did not change -dnl * XINE_LT_AGE is the number of previous API versions still supported by this library -dnl * libtool has its own numbering scheme, because local library numbering schemes -dnl are platform dependent +dnl * XINE_LT_REVISION is an internal revision number which is increased when +dnl the API itself did not change +dnl * XINE_LT_AGE is the number of previous API versions still supported by +dnl this library +dnl * libtool has its own numbering scheme, because local library numbering +dnl schemes are platform dependent dnl * in Linux, the library will be named dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION -XINE_LT_CURRENT=29 +XINE_LT_CURRENT=30 XINE_LT_REVISION=0 -XINE_LT_AGE=28 +XINE_LT_AGE=29 dnl for a release tarball do "rm .cvsversion" before "make dist" if test -f "${srcdir-.}/.cvsversion"; then -- cgit v1.2.3 From 070ab73cf3ac064f23895cb19b2e67717f42077d Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 25 Jul 2010 16:01:33 +0100 Subject: Added tag 1.1.19 for changeset acba7a8c29cc --- .hgtags | 1 + ChangeLog | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.hgtags b/.hgtags index b5f9dc904..92ff2031e 100644 --- a/.hgtags +++ b/.hgtags @@ -153,3 +153,4 @@ fc1aecbb9d80a32d9c802a5208dfdc012f1ba9d5 1.1.16.3 ff764395a361257b11d73583a0e0851e0f5f2ee5 1.1.17 86395fcaded38aca33facf7c8263d23622eea2bd 1.1.18 8b7c25bfb056ee9b907877b462c132e61112e440 1.1.18.1 +acba7a8c29cca74b112c2c6db4310ddeb1524696 1.1.19 diff --git a/ChangeLog b/ChangeLog index 0bb165ed5..c2208189b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,7 @@ xine-lib (1.1.19) 2010-07-25 * Fix playback of the first file handled by the modplug demuxer. * Refuse to build with known-broken libmodplug (0.8.8). http://bugs.debian.org/588465 - * Fix a potential freeing of unallocated memory (CVE-2010-xxxx). + * Fix a potential freeing of unallocated memory. xine-lib (1.1.18.1) 2010-03-06 * Oops. compat.c (for DXR3 support) was omitted. -- cgit v1.2.3