frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 2.1.10

Browse Source 
VDR developer version 2.1.10 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.10.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.9-2.1.10.diff

MD5 checksums:

889f053463e2720f1ad6517cc19e82f6  vdr-2.1.10.tar.bz2
c126fb89a79db55867ae9d9a869569aa  vdr-2.1.9-2.1.10.diff

Approaching version 2.2.0:
==========================

I have decided to release one more developer version because there were
complaints about missing functionality from the "jumpingseconds" and
"binary skip" patches regarding the Green/Yellow and Prev/Next keys, and
I didn't want to cause another "patch frenzy" in this newly refurbished
area of VDR. The other (more important) reason for this additional
developer release was the change in the return value of cOsd::RenderPixmaps(),
which is very important for plugins that implement their own version of
cPixmap, e.g. for use with fast graphics hardware.

If there are no more serious bug reports, the final version 2.2.0 of VDR
shall be released on February 19, 2015, which marks the 15th anniversary
of VDR.
So please test this developer version intensely and report any problems
you might encounter as soon as possible.

The following language files still have the given number of untranslated texts:

ar.po: 54
ca_ES.po: 54
cs_CZ.po: 54
da_DK.po: 187
el_GR.po: 250
es_ES.po: 54
et_EE.po: 3
fi_FI.po: 3
hr_HR.po: 187
hu_HU.po: 4
it_IT.po: 3
lt_LT.po: 3
mk_MK.po: 3
nn_NO.po: 315
pl_PL.po: 54
pt_PT.po: 82
ro_RO.po: 3
ru_RU.po: 54
sk_SK.po: 54
sl_SI.po: 55
sr_RS.po: 54
sv_SE.po: 54
tr_TR.po: 187
uk_UA.po: 3
zh_CN.po: 54

If nobody takes care of these, they will remain untranslated in version 2.2.0.

DEADLINE FOR SUBMITTING TRANSLATIONS IS WEDNESDAY, FEBRUARY 18!

From the HISTORY file:
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Added "#REMOTE=LIRC" to Make.config.template (suggested by Martin Dauskardt).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Increased the width of the left text column in the Setup menus to avoid cutting
  off German texts.
- Added an empty target to the Makefile to make sure the sub-make for libsi is always
  called (thanks to Sören Moch).
- Updated the Italian OSD texts (thanks to Diego Pierotto and Nino Gerbino).
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- The new options "Setup/Replay/Skip distance with Green/Yellow keys" and
  "Setup/Replay/Skip distance with Green/Yellow keys in repeat" can be used to
  configure the number of seconds to skip when pressing these keys once or pressing
  and holding them (based on a patch from Matthias Senzel, originally from Tobias
  Faust).
- The new option "Setup/Replay/Use Prev/Next keys for adaptive skipping" can be used
  to change the behavior of these keys during replay. They normally jump between
  editing marks, but with this option set to 'yes' they will do adaptive skipping.
- The new command line option --chartab can be used to set the default character
  table to use for strings in the DVB data stream that don't begin with a proper
  character table indicator (suggested by Christopher Reimer). The old mechanism
  of using the environment variable VDR_CHARSET_OVERRIDE still works, but is now
  deprecated and may be removed in a future version. The value given in the --chartab
  option takes precedence over that in VDR_CHARSET_OVERRIDE.
- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
  (suggested by Thomas Reufer). This is necessary to allow plugins with derived
  cPixmap implementations to use this function. Plugins that use this function
  with cPixmapMemory now need to add a dynamic cast to the call, as in

    cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));

  They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
  the resulting pixmap after use.
  The dvbhddevice plugin has been modified accordingly.
- A cPixmap with a negative layer no longer marks any portion of the OSD's view port
  as "dirty" when drawing on it. This may improve performance when drawing on a
  hidden pixmap, because it avoids unnecessary refreshes of the OSD.
- Added a missing initialization of "panning" to the constructor of cPixmapMemory.
- Updated the Dutch OSD texts (thanks to Erik Oomen).
- Updated the French OSD texts (thanks to Régis Bossut).
- Fixed the German translation of "Zap timeout".
This commit is contained in:
Klaus Schmidinger 2015-02-11 12:15:00 +01:00 committed by Dieter Hametner
parent bb4ef3b380
commit f82cdfed40
50 changed files with 767 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CONTRIBUTORS
View File

@ -787,9 +787,10 @@ Peter Seyringer <e9425234@student.tuwien.ac.at>
Stefan Schluenss <dxr3_osd@schluenss.de> Stefan Schluenss <dxr3_osd@schluenss.de>
for reporting a bug where PID handles were not closed correctly for reporting a bug where PID handles were not closed correctly
Régis Bossut <rbossut@auchan.com> Régis Bossut <famille.bossut@wanadoo.fr>
for pointing out that with some providers the channels can only be distinguished for pointing out that with some providers the channels can only be distinguished
through the RID through the RID
for translating OSD texts to the French language
Andreas Kool <akool@akool.de> Andreas Kool <akool@akool.de>
for his help in keeping 'channels.conf.cable' up to date for his help in keeping 'channels.conf.cable' up to date
@ -1703,6 +1704,7 @@ Martin Dauskardt <md001@gmx.de>
cDevice::TrickSpeed() cDevice::TrickSpeed()
for renaming 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR for renaming 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR
in 'make install' in 'make install'
for suggesting to add "#REMOTE=LIRC" to Make.config.template
Maynard Cedric <maynard.cedric@wanadoo.fr> Maynard Cedric <maynard.cedric@wanadoo.fr>
for reporting a problem in handling the color button texts in cMenuEditStrItem for reporting a problem in handling the color button texts in cMenuEditStrItem
@ -2961,6 +2963,7 @@ Christopher Reimer <vdr@creimer.net>
for reverting the change from version 1.5.7 that made all logging go to LOG_ERR for reverting the change from version 1.5.7 that made all logging go to LOG_ERR
for reporting a possible crash in the OSD demo for reporting a possible crash in the OSD demo
for adding support for systemd for adding support for systemd
for suggesting to replace VDR_CHARSET_OVERRIDE with a command line option
Stefan Huskamp <coca_cola1@gmx.de> Stefan Huskamp <coca_cola1@gmx.de>
for suggesting to make entering characters via the number keys for suggesting to make entering characters via the number keys
@ -3181,6 +3184,8 @@ S
ci.c to no longer compile with older versions of gcc ci.c to no longer compile with older versions of gcc
for suggesting to make the "Select folder" menu add the folder names of all existing for suggesting to make the "Select folder" menu add the folder names of all existing
recordings to any names that have been predefined in "folders.conf" recordings to any names that have been predefined in "folders.conf"
for adding an empty target to the Makefile to make sure the sub-make for libsi is
always called
Peter Münster <pmlists@free.fr> Peter Münster <pmlists@free.fr>
for fixing 'make install' to not overwrite existing configuration files for fixing 'make install' to not overwrite existing configuration files
@ -3230,6 +3235,7 @@ Matthias Senzel <matthias.senzel@t-online.de>
for fixing the German translation of "Binary skip timeout (s)" for fixing the German translation of "Binary skip timeout (s)"
for reporting a bug in switching channels in the Schedule menu after going through for reporting a bug in switching channels in the Schedule menu after going through
various Now and Schedule menus for different channels various Now and Schedule menus for different channels
for the "jumpingseconds" patch
Marek Nazarko <mnazarko@gmail.com> Marek Nazarko <mnazarko@gmail.com>
for translating OSD texts to the Polish language for translating OSD texts to the Polish language
@ -3303,6 +3309,8 @@ Thomas Reufer <thomas@reufer.ch>
for adding cOsdProvider::OsdSizeChanged() for adding cOsdProvider::OsdSizeChanged()
for suggesting to change the German translations if the texts related to "binary for suggesting to change the German translations if the texts related to "binary
skipping" skipping"
for suggesting to change the return value of cOsd::RenderPixmaps() from cPixmapMemory
to cPixmap
Eike Sauer <EikeSauer@t-online.de> Eike Sauer <EikeSauer@t-online.de>
for reporting a problem with channels that need more than 5 TS packets for detecting for reporting a problem with channels that need more than 5 TS packets for detecting
@ -3363,5 +3371,14 @@ Martin Schirrmacher <schirrmie@gmail.com>
Mario Fenneis <admin@mediastreambox.at> Mario Fenneis <admin@mediastreambox.at>
for translating OSD texts to the Hungarian language for translating OSD texts to the Hungarian language
Clemens Brauers <vdr@admin-cb.de>
for modifying runvdr.template to improve compatibility with the "bash" and "dash" shells
Stefan Herdler <herdler@gmx.de> Stefan Herdler <herdler@gmx.de>
for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd() for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
Tobias Faust <tobias.faust@gmx.de>
for the original "jumpingseconds" patch
Erik Oomen <oomen.e@gmail.com>
for translating OSD texts to the Dutch language

49
HISTORY
View File

@ -8497,7 +8497,8 @@ Video Disk Recorder Revision History
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed the German translations of "latitude" and "longitude" (they were swapped). - Fixed the German translations of "latitude" and "longitude" (they were swapped).
- Updated the Hungarian OSD texts (thanks to Mario Fenneis). - Updated the Hungarian OSD texts (thanks to Mario Fenneis).
- Modified runvdr.template to improve compatibility with the "bash" and "dash" shells. - Modified runvdr.template to improve compatibility with the "bash" and "dash" shells
(thanks to Clemens Brauers).
- Changed the German translations if the texts related to "binary skipping" (based - Changed the German translations if the texts related to "binary skipping" (based
on a suggestion by Thomas Reufer). on a suggestion by Thomas Reufer).
- Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in - Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
@ -8521,3 +8522,49 @@ Video Disk Recorder Revision History
that it is initialized to 'true' and will only be set to 'false' if the entire that it is initialized to 'true' and will only be set to 'false' if the entire
copy process has been successful (problem reported by Christoph Haubrich). copy process has been successful (problem reported by Christoph Haubrich).
- Added the UPDATE-2.2.0 file. - Added the UPDATE-2.2.0 file.
2015-02-11: Version 2.1.10
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Updated the Macedonian OSD texts (thanks to Dimitar Petrovski).
- Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Added "#REMOTE=LIRC" to Make.config.template (suggested by Martin Dauskardt).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Increased the width of the left text column in the Setup menus to avoid cutting
off German texts.
- Added an empty target to the Makefile to make sure the sub-make for libsi is always
called (thanks to Sören Moch).
- Updated the Italian OSD texts (thanks to Diego Pierotto and Nino Gerbino).
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- The new options "Setup/Replay/Skip distance with Green/Yellow keys" and
"Setup/Replay/Skip distance with Green/Yellow keys in repeat" can be used to
configure the number of seconds to skip when pressing these keys once or pressing
and holding them (based on a patch from Matthias Senzel, originally from Tobias
Faust).
- The new option "Setup/Replay/Use Prev/Next keys for adaptive skipping" can be used
to change the behavior of these keys during replay. They normally jump between
editing marks, but with this option set to 'yes' they will do adaptive skipping.
- The new command line option --chartab can be used to set the default character
table to use for strings in the DVB data stream that don't begin with a proper
character table indicator (suggested by Christopher Reimer). The old mechanism
of using the environment variable VDR_CHARSET_OVERRIDE still works, but is now
deprecated and may be removed in a future version. The value given in the --chartab
option takes precedence over that in VDR_CHARSET_OVERRIDE.
- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
(suggested by Thomas Reufer). This is necessary to allow plugins with derived
cPixmap implementations to use this function. Plugins that use this function
with cPixmapMemory now need to add a dynamic cast to the call, as in
cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));
They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
the resulting pixmap after use.
The dvbhddevice plugin has been modified accordingly.
- A cPixmap with a negative layer no longer marks any portion of the OSD's view port
as "dirty" when drawing on it. This may improve performance when drawing on a
hidden pixmap, because it avoids unnecessary refreshes of the OSD.
- Added a missing initialization of "panning" to the constructor of cPixmapMemory.
- Updated the Dutch OSD texts (thanks to Erik Oomen).
- Updated the French OSD texts (thanks to Régis Bossut).
- Fixed the German translation of "Zap timeout".

2
INSTALL
View File

@ -141,7 +141,7 @@ According to "ETSI EN 300 468" the default character set fo SI data is
ISO6937. But unfortunately some broadcasters actually use ISO-8859-9 or ISO6937. But unfortunately some broadcasters actually use ISO-8859-9 or
other encodings, but fail to correctly announce that. other encodings, but fail to correctly announce that.
Users who want to set the default character set to something different can Users who want to set the default character set to something different can
do this by setting the environment variable VDR_CHARSET_OVERRIDE to something do this by using the command line option --chartab with something
like ISO-8859-9. like ISO-8859-9.
Start script with automatic restart in case of hangups: Start script with automatic restart in case of hangups:

17
MANUAL
View File

@ -1026,6 +1026,23 @@ Version 2.0
halved if the direction actually changes. That way, even if halved if the direction actually changes. That way, even if
you missed the target point, you can still back up to it. you missed the target point, you can still back up to it.
Use Prev/Next keys for adaptive skipping = no
Normally the Prev/Next keys jump between editing marks (or
the beginning/end of the recording). You can set this option
to 'yes' if you want to use these keys for adaptive skipping
instead.
Skip distance with Green/Yellow keys (s) = 60
Defines the number of seconds to skip in either direction
when pressing the "Green" or "Yellow" key, respectively.
The valid range is 5...600.
Skip distance with Green/Yellow keys in repeat (s) = 60
Defines the number of seconds to skip in either direction
when pressing and holding the "Green" or "Yellow" key,
respectively.
The valid range is 5...600.
Resume ID = 0 Defines an additional ID that can be used in a multi user Resume ID = 0 Defines an additional ID that can be used in a multi user
environment, so that every user has his/her own resume environment, so that every user has his/her own resume
files for each recording. The valid range is 0...99, with files for each recording. The valid range is 0...99, with

5
Make.config.template
View File

@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Make.config.template 3.3 2015/02/02 09:07:07 kls Exp $ # $Id: Make.config.template 3.4 2015/02/09 09:58:45 kls Exp $
### The C compiler and options: ### The C compiler and options:
@ -69,6 +69,9 @@ endif
### The remote control: ### The remote control:
LIRC_DEVICE = /var/run/lirc/lircd LIRC_DEVICE = /var/run/lirc/lircd
### Define if you always want to use LIRC, independent of the --lirc option:
#REMOTE=LIRC
### Define if you don't want keyboard remote control: ### Define if you don't want keyboard remote control:
#NO_KBD = 1 #NO_KBD = 1

7
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Makefile 3.5 2015/02/02 14:47:24 kls Exp $ # $Id: Makefile 3.6 2015/02/09 12:28:24 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -139,8 +139,9 @@ vdr: $(OBJS) $(SILIB)
# The libsi library: # The libsi library:
$(SILIB): $(SILIB): make-libsi
$(MAKE) --no-print-directory -C $(LSIDIR) CXXFLAGS="$(CXXFLAGS)" DEFINES="$(CDEFINES)" all @$(MAKE) --no-print-directory -C $(LSIDIR) CXXFLAGS="$(CXXFLAGS)" DEFINES="$(CDEFINES)" all
make-libsi: # empty rule makes sure the sub-make for libsi is always called
# pkg-config file: # pkg-config file:

4
PLUGINS/src/dvbhddevice/HISTORY
View File

@ -98,3 +98,7 @@ VDR Plugin 'dvbhddevice' Revision History
- The function cDevice::GetVideoSystem() has been deprecated. - The function cDevice::GetVideoSystem() has been deprecated.
- Removed old-style video format setting functions. - Removed old-style video format setting functions.
2015-02-11: Version 2.1.7
- Adapted to the new return value of cOsd::RenderPixmaps().

2
PLUGINS/src/dvbhddevice/dvbhddevice.c
View File

@ -10,7 +10,7 @@
#include "menu.h" #include "menu.h"
#include "setup.h" #include "setup.h"
static const char *VERSION = "2.1.6"; static const char *VERSION = "2.1.7";
static const char *DESCRIPTION = trNOOP("HD Full Featured DVB device"); static const char *DESCRIPTION = trNOOP("HD Full Featured DVB device");
static const char *MAINMENUENTRY = "dvbhddevice"; static const char *MAINMENUENTRY = "dvbhddevice";

4
PLUGINS/src/dvbhddevice/hdffosd.c
View File

@ -681,7 +681,7 @@ void cHdffOsdRaw::Flush(void)
return; return;
} }
LOCK_PIXMAPS; LOCK_PIXMAPS;
while (cPixmapMemory *pm = RenderPixmaps()) while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()))
{ {
int w = pm->ViewPort().Width(); int w = pm->ViewPort().Width();
int h = pm->ViewPort().Height(); int h = pm->ViewPort().Height();
@ -736,7 +736,7 @@ void cHdffOsdRaw::Flush(void)
HDFF_COLOR_TYPE_ARGB4444, HDFF_INVALID_HANDLE); HDFF_COLOR_TYPE_ARGB4444, HDFF_INVALID_HANDLE);
} }
} }
delete pm; DestroyPixmap(pm);
render = true; render = true;
} }
if (buffer) if (buffer)

7
PLUGINS/src/dvbhddevice/po/it_IT.po
View File

@ -9,16 +9,15 @@ msgstr ""
"Project-Id-Version: vdr-dvbhddevice 0.0.4\n" "Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-09-21 14:01+0200\n" "POT-Creation-Date: 2014-09-21 14:01+0200\n"
"PO-Revision-Date: 2013-09-19 00:00+0100\n" "PO-Revision-Date: 2015-02-08 19:48+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <see README>\n" "Language-Team: <see README>\n"
"Language: it\n" "Language: it\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
"X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SourceCharset: utf-8\n"
"X-Generator: Poedit 1.5.4\n"
msgid "HD Full Featured DVB device" msgid "HD Full Featured DVB device"
msgstr "Scheda DVB HD Full Featured" msgstr "Scheda DVB HD Full Featured"
@ -126,7 +125,7 @@ msgid "Allow True Color OSD"
msgstr "Permetti OSD True Color" msgstr "Permetti OSD True Color"
msgid "True Color format" msgid "True Color format"
msgstr "" msgstr "Formato True Color"
msgid "Hide mainmenu entry" msgid "Hide mainmenu entry"
msgstr "Nascondi voce menu principale" msgstr "Nascondi voce menu principale"

33
UPDATE-2.2.0
View File

@ -127,6 +127,15 @@ Plugins:
- Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device - Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device
can call to signal a change in the OSD that requires a redraw of the currently can call to signal a change in the OSD that requires a redraw of the currently
displayed object. displayed object.
- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
This is necessary to allow plugins with derived cPixmap implementations to use this
function. Plugins that use this function with cPixmapMemory now need to add
a dynamic cast to the call, as in
cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));
They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
the resulting pixmap after use.
Skins: Skins:
@ -220,6 +229,15 @@ OSD:
is unexpected at this point. You can still navigate to is unexpected at this point. You can still navigate to
the last replayed recording (if any) by pressing Ok repeatedly in the Recordings the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
menu. menu.
- cOsd::RenderPixmaps() now returns a pointer to cPixmap instead of cPixmapMemory
This is necessary to allow plugins with derived cPixmap implementations to use this
function. Plugins that use this function with cPixmapMemory now need to add
a dynamic cast to the call, as in
cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()));
They also need to call DestroyPixmap(pm) instead of "delete pm" to properly release
the resulting pixmap after use.
Channels: Channels:
@ -329,6 +347,13 @@ Replay:
to make adaptive skipping only halve the skip distance when the direction changes. to make adaptive skipping only halve the skip distance when the direction changes.
That way you can reach the desired point in a recording even if you make one too That way you can reach the desired point in a recording even if you make one too
many skips in a certain direction (see MANUAL for details). many skips in a certain direction (see MANUAL for details).
- The new options "Setup/Replay/Skip distance with Green/Yellow keys" and
"Setup/Replay/Skip distance with Green/Yellow keys in repeat" can be used to
configure the number of seconds to skip when pressing these keys once or pressing
and holding them.
- The new option "Setup/Replay/Use Prev/Next keys for adaptive skipping" can be used
to change the behavior of these keys during replay. They normally jump between
editing marks, but with this option set to 'yes' they will do adaptive skipping.
SVDRP: SVDRP:
@ -378,7 +403,7 @@ Misc:
"Mo.Di.Mi.Do.Fr.Sa.So.". "Mo.Di.Mi.Do.Fr.Sa.So.".
- Added the channel name to log messages that reference a channel. - Added the channel name to log messages that reference a channel.
- Added ARGSDIR to the ONEDIR section of Make.config.template. - Added ARGSDIR to the ONEDIR section of Make.config.template.
- Added SDNOTIFY, NO_KBD and BIDI to Make.config.template. - Added SDNOTIFY, NO_KBD, BIDI and REMOTE to Make.config.template.
- Modified runvdr.template to improve compatibility with the "bash" and "dash" shells. - Modified runvdr.template to improve compatibility with the "bash" and "dash" shells.
- Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in - Updated sources.conf to reflect the fact that Astra 4A and SES5 are actually in
two separate positions. two separate positions.
@ -386,3 +411,9 @@ Misc:
functions is now exacly as described in the header file. Editing marks that are functions is now exacly as described in the header file. Editing marks that are
placed at exactly the same offset in a recording are now preserved in the cutting placed at exactly the same offset in a recording are now preserved in the cutting
process. process.
- The new command line option --chartab can be used to set the default character
table to use for strings in the DVB data stream that don't begin with a proper
character table indicator. The old mechanism of using the environment variable
VDR_CHARSET_OVERRIDE still works, but is now deprecated and may be removed in a
future version. The value given in the --chartab option takes precedence over
that in VDR_CHARSET_OVERRIDE.

11
config.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.c 3.8 2015/02/06 10:10:22 kls Exp $ * $Id: config.c 3.10 2015/02/10 12:24:13 kls Exp $
*/ */
#include "config.h" #include "config.h"
@ -476,6 +476,9 @@ cSetup::cSetup(void)
AdaptiveSkipInitial = 120; AdaptiveSkipInitial = 120;
AdaptiveSkipTimeout = 3; AdaptiveSkipTimeout = 3;
AdaptiveSkipAlternate = 0; AdaptiveSkipAlternate = 0;
AdaptiveSkipPrevNext = 0;
SkipSeconds = 60;
SkipSecondsRepeat = 60;
ResumeID = 0; ResumeID = 0;
CurrentChannel = -1; CurrentChannel = -1;
CurrentVolume = MAXVOLUME; CurrentVolume = MAXVOLUME;
@ -695,6 +698,9 @@ bool cSetup::Parse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "AdaptiveSkipInitial")) AdaptiveSkipInitial= atoi(Value); else if (!strcasecmp(Name, "AdaptiveSkipInitial")) AdaptiveSkipInitial= atoi(Value);
else if (!strcasecmp(Name, "AdaptiveSkipTimeout")) AdaptiveSkipTimeout= atoi(Value); else if (!strcasecmp(Name, "AdaptiveSkipTimeout")) AdaptiveSkipTimeout= atoi(Value);
else if (!strcasecmp(Name, "AdaptiveSkipAlternate")) AdaptiveSkipAlternate = atoi(Value); else if (!strcasecmp(Name, "AdaptiveSkipAlternate")) AdaptiveSkipAlternate = atoi(Value);
else if (!strcasecmp(Name, "AdaptiveSkipPrevNext")) AdaptiveSkipPrevNext = atoi(Value);
else if (!strcasecmp(Name, "SkipSeconds")) SkipSeconds = atoi(Value);
else if (!strcasecmp(Name, "SkipSecondsRepeat")) SkipSecondsRepeat = atoi(Value);
else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value); else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value); else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value); else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
@ -818,6 +824,9 @@ bool cSetup::Save(void)
Store("AdaptiveSkipInitial",AdaptiveSkipInitial); Store("AdaptiveSkipInitial",AdaptiveSkipInitial);
Store("AdaptiveSkipTimeout",AdaptiveSkipTimeout); Store("AdaptiveSkipTimeout",AdaptiveSkipTimeout);
Store("AdaptiveSkipAlternate", AdaptiveSkipAlternate); Store("AdaptiveSkipAlternate", AdaptiveSkipAlternate);
Store("AdaptiveSkipPrevNext", AdaptiveSkipPrevNext);
Store("SkipSeconds", SkipSeconds);
Store("SkipSecondsRepeat", SkipSecondsRepeat);
Store("ResumeID", ResumeID); Store("ResumeID", ResumeID);
Store("CurrentChannel", CurrentChannel); Store("CurrentChannel", CurrentChannel);
Store("CurrentVolume", CurrentVolume); Store("CurrentVolume", CurrentVolume);

13
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 3.17 2015/02/06 09:53:50 kls Exp $ * $Id: config.h 3.20 2015/02/10 14:29:27 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "2.1.9" #define VDRVERSION "2.1.10"
#define VDRVERSNUM 20109 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 20110 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:
#define APIVERSION "2.1.9" #define APIVERSION "2.1.10"
#define APIVERSNUM 20109 // Version * 10000 + Major * 100 + Minor #define APIVERSNUM 20110 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which // When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to // may be smaller than VDRVERSION in case there have been no changes to
@ -340,6 +340,9 @@ public:
int AdaptiveSkipInitial; int AdaptiveSkipInitial;
int AdaptiveSkipTimeout; int AdaptiveSkipTimeout;
int AdaptiveSkipAlternate; int AdaptiveSkipAlternate;
int AdaptiveSkipPrevNext;
int SkipSeconds;
int SkipSecondsRepeat;
int ResumeID; int ResumeID;
int CurrentChannel; int CurrentChannel;
int CurrentVolume; int CurrentVolume;

3
libsi/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a libsi # Makefile for a libsi
# #
# $Id: Makefile 3.0 2012/12/18 13:35:54 kls Exp $ # $Id: Makefile 3.1 2015/02/11 10:24:54 kls Exp $
### The archiver options: ### The archiver options:
@ -32,6 +32,7 @@ $(DEPFILE): Makefile
### Targets: ### Targets:
all: libsi.a all: libsi.a
@:
libsi.a : $(OBJS) libsi.a : $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)

15
libsi/si.c
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* $Id: si.c 3.2 2015/02/01 14:55:27 kls Exp $ * $Id: si.c 3.3 2015/02/10 13:42:41 kls Exp $
* * * *
***************************************************************************/ ***************************************************************************/
@ -319,6 +319,14 @@ bool systemCharacterTableIsSingleByte(void)
return SystemCharacterTableIsSingleByte; return SystemCharacterTableIsSingleByte;
} }
static char *OverrideCharacterTable = NULL;
void SetOverrideCharacterTable(const char *CharacterTable)
{
free(OverrideCharacterTable);
OverrideCharacterTable = CharacterTable ? strdup(CharacterTable) : NULL;
}
bool SetSystemCharacterTable(const char *CharacterTable) { bool SetSystemCharacterTable(const char *CharacterTable) {
if (CharacterTable) { if (CharacterTable) {
for (unsigned int i = 0; i < NumEntries(CharacterTables1); i++) { for (unsigned int i = 0; i < NumEntries(CharacterTables1); i++) {
@ -348,9 +356,8 @@ const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *i
// Workaround for broadcaster stupidity: according to // Workaround for broadcaster stupidity: according to
// "ETSI EN 300 468" the default character set is ISO6937. But unfortunately some // "ETSI EN 300 468" the default character set is ISO6937. But unfortunately some
// broadcasters actually use ISO-8859-9, but fail to correctly announce that. // broadcasters actually use ISO-8859-9, but fail to correctly announce that.
static const char *CharsetOverride = getenv("VDR_CHARSET_OVERRIDE"); if (OverrideCharacterTable)
if (CharsetOverride) cs = OverrideCharacterTable;
cs = CharsetOverride;
if (isSingleByte) if (isSingleByte)
*isSingleByte = false; *isSingleByte = false;
if (length <= 0) if (length <= 0)

5
libsi/si.h
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* $Id: si.h 3.3 2015/02/01 14:55:27 kls Exp $ * $Id: si.h 3.4 2015/02/10 13:54:28 kls Exp $
* * * *
***************************************************************************/ ***************************************************************************/
@ -522,6 +522,9 @@ protected:
void decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion); void decodeText(char *buffer, char *shortVersion, int sizeBuffer, int sizeShortVersion);
}; };
// Set the character table to use for strings that do not begin with a character
// table indicator. Call with NULL to turn this off.
void SetOverrideCharacterTable(const char *CharacterTable);
// Call this function to set the system character table. CharacterTable is a string // Call this function to set the system character table. CharacterTable is a string
// like "iso8859-15" or "utf-8" (case insensitive). // like "iso8859-15" or "utf-8" (case insensitive).
// Returns true if the character table was recognized. // Returns true if the character table was recognized.

23
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 3.46 2015/02/07 15:56:26 kls Exp $ * $Id: menu.c 3.48 2015/02/10 12:37:06 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -3730,6 +3730,9 @@ cMenuSetupReplay::cMenuSetupReplay(void)
Add(new cMenuEditIntItem( tr("Setup.Replay$Initial duration for adaptive skipping (s)"), &data.AdaptiveSkipInitial, 10, 600)); Add(new cMenuEditIntItem( tr("Setup.Replay$Initial duration for adaptive skipping (s)"), &data.AdaptiveSkipInitial, 10, 600));
Add(new cMenuEditIntItem( tr("Setup.Replay$Reset timeout for adaptive skipping (s)"), &data.AdaptiveSkipTimeout, 0, 10)); Add(new cMenuEditIntItem( tr("Setup.Replay$Reset timeout for adaptive skipping (s)"), &data.AdaptiveSkipTimeout, 0, 10));
Add(new cMenuEditBoolItem(tr("Setup.Replay$Alternate behavior for adaptive skipping"), &data.AdaptiveSkipAlternate)); Add(new cMenuEditBoolItem(tr("Setup.Replay$Alternate behavior for adaptive skipping"), &data.AdaptiveSkipAlternate));
Add(new cMenuEditBoolItem(tr("Setup.Replay$Use Prev/Next keys for adaptive skipping"), &data.AdaptiveSkipPrevNext));
Add(new cMenuEditIntItem( tr("Setup.Replay$Skip distance with Green/Yellow keys (s)"), &data.SkipSeconds, 5, 600));
Add(new cMenuEditIntItem( tr("Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"), &data.SkipSecondsRepeat, 5, 600));
Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99)); Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
} }
@ -5583,9 +5586,11 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
case kRight: Forward(); break; case kRight: Forward(); break;
case kRed: TimeSearch(); break; case kRed: TimeSearch(); break;
case kGreen|k_Repeat: case kGreen|k_Repeat:
case kGreen: SkipSeconds(-60); break; SkipSeconds(-Setup.SkipSecondsRepeat); break;
case kGreen: SkipSeconds(-Setup.SkipSeconds); break;
case kYellow|k_Repeat: case kYellow|k_Repeat:
case kYellow: SkipSeconds( 60); break; SkipSeconds(Setup.SkipSecondsRepeat); break;
case kYellow: SkipSeconds(Setup.SkipSeconds); break;
case kStop: case kStop:
case kBlue: Hide(); case kBlue: Hide();
Stop(); Stop();
@ -5596,11 +5601,19 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
// Editing: // Editing:
case kMarkToggle: MarkToggle(); break; case kMarkToggle: MarkToggle(); break;
case kPrev|k_Repeat: case kPrev|k_Repeat:
case kPrev: case kPrev: if (Setup.AdaptiveSkipPrevNext) {
MarkMove(-adaptiveSkipper.GetValue(RAWKEY(Key)), false);
break;
}
// fall through...
case kMarkJumpBack|k_Repeat: case kMarkJumpBack|k_Repeat:
case kMarkJumpBack: MarkJump(false); break; case kMarkJumpBack: MarkJump(false); break;
case kNext|k_Repeat: case kNext|k_Repeat:
case kNext: case kNext: if (Setup.AdaptiveSkipPrevNext) {
MarkMove(+adaptiveSkipper.GetValue(RAWKEY(Key)), false);
break;
}
// fall through...
case kMarkJumpForward|k_Repeat: case kMarkJumpForward|k_Repeat:
case kMarkJumpForward: MarkJump(true); break; case kMarkJumpForward: MarkJump(true); break;
case kMarkMoveBack|k_Repeat: case kMarkMoveBack|k_Repeat:

4
menuitems.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menuitems.c 3.2 2013/11/03 14:48:21 kls Exp $ * $Id: menuitems.c 3.3 2015/02/09 11:53:10 kls Exp $
*/ */
#include "menuitems.h" #include "menuitems.h"
@ -1168,7 +1168,7 @@ eOSState cMenuEditMapItem::ProcessKey(eKeys Key)
// --- cMenuSetupPage -------------------------------------------------------- // --- cMenuSetupPage --------------------------------------------------------
cMenuSetupPage::cMenuSetupPage(void) cMenuSetupPage::cMenuSetupPage(void)
:cOsdMenu("", 33) :cOsdMenu("", 36)
{ {
SetMenuCategory(mcSetup); SetMenuCategory(mcSetup);
plugin = NULL; plugin = NULL;

62
osd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: osd.c 3.4 2015/01/15 11:20:56 kls Exp $ * $Id: osd.c 3.5 2015/02/11 09:48:02 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -984,12 +984,13 @@ cPixmap::cPixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort)
void cPixmap::MarkViewPortDirty(const cRect &Rect) void cPixmap::MarkViewPortDirty(const cRect &Rect)
{ {
dirtyViewPort.Combine(Rect.Intersected(viewPort)); if (layer >= 0)
dirtyViewPort.Combine(Rect.Intersected(viewPort));
} }
void cPixmap::MarkViewPortDirty(const cPoint &Point) void cPixmap::MarkViewPortDirty(const cPoint &Point)
{ {
if (viewPort.Contains(Point)) if (layer >= 0 && viewPort.Contains(Point))
dirtyViewPort.Combine(Point); dirtyViewPort.Combine(Point);
} }
@ -1025,11 +1026,18 @@ void cPixmap::SetLayer(int Layer)
esyslog("ERROR: pixmap layer %d limited to %d", Layer, MAXPIXMAPLAYERS - 1); esyslog("ERROR: pixmap layer %d limited to %d", Layer, MAXPIXMAPLAYERS - 1);
Layer = MAXPIXMAPLAYERS - 1; Layer = MAXPIXMAPLAYERS - 1;
} }
if (Layer != layer) { // The sequence here is important, because the view port is only marked as dirty
if (Layer > 0 || layer > 0) // if the layer is >= 0:
MarkViewPortDirty(viewPort); if (layer >= 0) {
MarkViewPortDirty(viewPort); // the pixmap is visible and may or may not become invisible
layer = Layer; layer = Layer;
} }
else if (Layer >= 0) {
layer = Layer;
MarkViewPortDirty(viewPort); // the pixmap was invisible and has become visible
}
else
layer = Layer; // the pixmap was invisible and remains so
Unlock(); Unlock();
} }
@ -1141,6 +1149,7 @@ cPixmapMemory::cPixmapMemory(int Layer, const cRect &ViewPort, const cRect &Draw
:cPixmap(Layer, ViewPort, DrawPort) :cPixmap(Layer, ViewPort, DrawPort)
{ {
data = MALLOC(tColor, this->DrawPort().Width() * this->DrawPort().Height()); data = MALLOC(tColor, this->DrawPort().Width() * this->DrawPort().Height());
panning = false;
} }
cPixmapMemory::~cPixmapMemory() cPixmapMemory::~cPixmapMemory()
@ -1714,7 +1723,8 @@ void cOsd::DestroyPixmap(cPixmap *Pixmap)
LOCK_PIXMAPS; LOCK_PIXMAPS;
for (int i = 1; i < pixmaps.Size(); i++) { // begin at 1 - don't let the background pixmap be destroyed! for (int i = 1; i < pixmaps.Size(); i++) { // begin at 1 - don't let the background pixmap be destroyed!
if (pixmaps[i] == Pixmap) { if (pixmaps[i] == Pixmap) {
pixmaps[0]->MarkViewPortDirty(Pixmap->ViewPort()); if (Pixmap->Layer() >= 0)
pixmaps[0]->MarkViewPortDirty(Pixmap->ViewPort());
delete Pixmap; delete Pixmap;
pixmaps[i] = NULL; pixmaps[i] = NULL;
return; return;
@ -1737,9 +1747,9 @@ cPixmap *cOsd::AddPixmap(cPixmap *Pixmap)
return Pixmap; return Pixmap;
} }
cPixmapMemory *cOsd::RenderPixmaps(void) cPixmap *cOsd::RenderPixmaps(void)
{ {
cPixmapMemory *Pixmap = NULL; cPixmap *Pixmap = NULL;
if (isTrueColor) { if (isTrueColor) {
LOCK_PIXMAPS; LOCK_PIXMAPS;
// Collect overlapping dirty rectangles: // Collect overlapping dirty rectangles:
@ -1762,25 +1772,27 @@ cPixmapMemory *cOsd::RenderPixmaps(void)
d.Combine(OldDirty); d.Combine(OldDirty);
OldDirty = NewDirty; OldDirty = NewDirty;
#endif #endif
Pixmap = new cPixmapMemory(0, d); Pixmap = CreatePixmap(-1, d);
Pixmap->Clear(); if (Pixmap) {
// Render the individual pixmaps into the resulting pixmap: Pixmap->Clear();
for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) { // Render the individual pixmaps into the resulting pixmap:
for (int i = 0; i < pixmaps.Size(); i++) { for (int Layer = 0; Layer < MAXPIXMAPLAYERS; Layer++) {
if (cPixmap *pm = pixmaps[i]) { for (int i = 0; i < pixmaps.Size(); i++) {
if (pm->Layer() == Layer) if (cPixmap *pm = pixmaps[i]) {
Pixmap->DrawPixmap(pm, d); if (pm->Layer() == Layer)
Pixmap->DrawPixmap(pm, d);
}
} }
} }
}
#ifdef DebugDirty #ifdef DebugDirty
cPixmapMemory DirtyIndicator(7, NewDirty); cPixmapMemory DirtyIndicator(7, NewDirty);
static tColor DirtyIndicatorColors[] = { 0x7FFFFF00, 0x7F00FFFF }; static tColor DirtyIndicatorColors[] = { 0x7FFFFF00, 0x7F00FFFF };
static int DirtyIndicatorIndex = 0; static int DirtyIndicatorIndex = 0;
DirtyIndicator.Fill(DirtyIndicatorColors[DirtyIndicatorIndex]); DirtyIndicator.Fill(DirtyIndicatorColors[DirtyIndicatorIndex]);
DirtyIndicatorIndex = 1 - DirtyIndicatorIndex; DirtyIndicatorIndex = 1 - DirtyIndicatorIndex;
Pixmap->Render(&DirtyIndicator, DirtyIndicator.DrawPort(), DirtyIndicator.ViewPort().Point().Shifted(-Pixmap->ViewPort().Point())); Pixmap->Render(&DirtyIndicator, DirtyIndicator.DrawPort(), DirtyIndicator.ViewPort().Point().Shifted(-Pixmap->ViewPort().Point()));
#endif #endif
}
} }
} }
return Pixmap; return Pixmap;

14
osd.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: osd.h 3.5 2015/01/15 11:23:52 kls Exp $ * $Id: osd.h 3.6 2015/02/11 09:48:02 kls Exp $
*/ */
#ifndef __OSD_H #ifndef __OSD_H
@ -763,12 +763,13 @@ protected:
///< the pixmap could not be added to the list. ///< the pixmap could not be added to the list.
///< A derived class that implements its own cPixmap class must call AddPixmap() ///< A derived class that implements its own cPixmap class must call AddPixmap()
///< in order to add a newly created pixmap to the OSD's list of pixmaps. ///< in order to add a newly created pixmap to the OSD's list of pixmaps.
cPixmapMemory *RenderPixmaps(void); cPixmap *RenderPixmaps(void);
///< Renders the dirty part of all pixmaps into a resulting pixmap that ///< Renders the dirty part of all pixmaps into a resulting pixmap that
///< shall be displayed on the OSD. The returned pixmap's view port is ///< shall be displayed on the OSD. The returned pixmap's view port is
///< set to the location of the rectangle on the OSD that needs to be ///< set to the location of the rectangle on the OSD that needs to be
///< refreshed; its draw port's origin is at (0, 0), and it has the same ///< refreshed; its draw port's origin is at (0, 0), and it has the same
///< size as the view port. ///< size as the view port.
///< Only pixmaps with a non-negative layer value are rendered.
///< If there are several non-overlapping dirty rectangles from different pixmaps, ///< If there are several non-overlapping dirty rectangles from different pixmaps,
///< they are returned separately in order to avoid re-rendering large parts ///< they are returned separately in order to avoid re-rendering large parts
///< of the OSD that haven't changed at all. The caller must therefore call ///< of the OSD that haven't changed at all. The caller must therefore call
@ -778,7 +779,7 @@ protected:
///< by putting a LOCK_PIXMAPS into the scope of the operation). ///< by putting a LOCK_PIXMAPS into the scope of the operation).
///< If there are no dirty pixmaps, or if this is not a true color OSD, ///< If there are no dirty pixmaps, or if this is not a true color OSD,
///< this function returns NULL. ///< this function returns NULL.
///< The caller must delete the returned pixmap after use. ///< The caller must call DestroyPixmap() for the returned pixmap after use.
public: public:
virtual ~cOsd(); virtual ~cOsd();
///< Shuts down the OSD. ///< Shuts down the OSD.
@ -930,13 +931,16 @@ public:
///< pixmaps, the Flush() function should basically do something like this: ///< pixmaps, the Flush() function should basically do something like this:
///< ///<
///< LOCK_PIXMAPS; ///< LOCK_PIXMAPS;
///< while (cPixmapMemory *pm = RenderPixmaps()) { ///< while (cPixmapMemory *pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps())) {
///< int w = pm->ViewPort().Width(); ///< int w = pm->ViewPort().Width();
///< int h = pm->ViewPort().Height(); ///< int h = pm->ViewPort().Height();
///< int d = w * sizeof(tColor); ///< int d = w * sizeof(tColor);
///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d); ///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d);
///< delete pm; ///< DestroyPixmap(pm);
///< } ///< }
///<
///< If a plugin uses a derived cPixmap implementation, it needs to use that
///< type instead of cPixmapMemory.
}; };
#define MAXOSDIMAGES 64 #define MAXOSDIMAGES 64

11
po/ar.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2008-10-16 11:16-0400\n" "PO-Revision-Date: 2008-10-16 11:16-0400\n"
"Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n" "Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
"Language-Team: Arabic <ar@li.org>\n" "Language-Team: Arabic <ar@li.org>\n"
@ -1257,6 +1257,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "رقم المواصلة" msgstr "رقم المواصلة"

11
po/ca_ES.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n" "Language-Team: Catalan <vdr@linuxtv.org>\n"
@ -1256,6 +1256,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID de Continuar" msgstr "ID de Continuar"

11
po/cs_CZ.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2010-05-06 11:00+0200\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n"
"Last-Translator: Aleš Juřík <ajurik@quick.cz>\n" "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n" "Language-Team: Czech <vdr@linuxtv.org>\n"
@ -1256,6 +1256,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID obnovení" msgstr "ID obnovení"

11
po/da_DK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish <vdr@linuxtv.org>\n" "Language-Team: Danish <vdr@linuxtv.org>\n"
@ -1253,6 +1253,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Genoptagelses ID" msgstr "Genoptagelses ID"

15
po/de_DE.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2010-01-16 16:46+0100\n" "PO-Revision-Date: 2015-02-10 13:45+0100\n"
"Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n" "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n" "Language-Team: German <vdr@linuxtv.org>\n"
"Language: de\n" "Language: de\n"
@ -1253,6 +1253,15 @@ msgstr "Zeitlimit beim Halbieren der Sprungweite (s)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Sprungweite nur bei Richtungswechsel halbieren" msgstr "Sprungweite nur bei Richtungswechsel halbieren"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr "Zurück/Vorwärts-Tasten halbieren Sprungweite"
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr "Sprungweite mit Taste Grün/Gelb (s)"
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "Sprungweite mit Taste Grün/Gelb bei Wiederh. (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Wiedergabe-ID" msgstr "Wiedergabe-ID"
@ -1269,7 +1278,7 @@ msgid "Setup.Miscellaneous$SVDRP timeout (s)"
msgstr "SVDRP trennen bei Inaktivität (s)" msgstr "SVDRP trennen bei Inaktivität (s)"
msgid "Setup.Miscellaneous$Zap timeout (s)" msgid "Setup.Miscellaneous$Zap timeout (s)"
msgstr "Mindestzeit für Kanalhistorie (s)" msgstr "Mindestzeit für vorherigen Kanal (s)"
msgid "Setup.Miscellaneous$Channel entry timeout (ms)" msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
msgstr "Zeitlimit für Kanaleingabe (ms)" msgstr "Zeitlimit für Kanaleingabe (ms)"

11
po/el_GR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek <vdr@linuxtv.org>\n" "Language-Team: Greek <vdr@linuxtv.org>\n"
@ -1253,6 +1253,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID áíáìåôÜäïóçò" msgstr "ID áíáìåôÜäïóçò"

11
po/es_ES.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n" "Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n"
@ -1254,6 +1254,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID de continuación" msgstr "ID de continuación"

45
po/et_EE.po
View File

@ -1,13 +1,13 @@
# VDR language source file. # VDR language source file.
# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de> # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
# This file is distributed under the same license as the VDR package. # This file is distributed under the same license as the VDR package.
# Arthur Konovalov <artlov@gmail.com>, 2004-2013 # Arthur Konovalov <artlov@gmail.com>, 2004-2013, 2015
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n" "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n" "Language-Team: Estonian <vdr@linuxtv.org>\n"
@ -483,7 +483,7 @@ msgid "Key$Channels"
msgstr "Kanalid" msgstr "Kanalid"
msgid "Key$Timers" msgid "Key$Timers"
msgstr "Taimer" msgstr "Taimerid"
msgid "Key$Recordings" msgid "Key$Recordings"
msgstr "Salvestused" msgstr "Salvestused"
@ -676,7 +676,7 @@ msgid "Select folder"
msgstr "Kausta valik" msgstr "Kausta valik"
msgid "Timers" msgid "Timers"
msgstr "Taimer" msgstr "Taimerid"
msgid "Button$On/Off" msgid "Button$On/Off"
msgstr "On/Off" msgstr "On/Off"
@ -700,7 +700,7 @@ msgid "Button$Record"
msgstr "Salvestada" msgstr "Salvestada"
msgid "Button$Switch" msgid "Button$Switch"
msgstr "Valida" msgstr "Vali"
msgid "What's on now?" msgid "What's on now?"
msgstr "Hetkel eetris" msgstr "Hetkel eetris"
@ -794,10 +794,10 @@ msgid "Edited version already exists - overwrite?"
msgstr "Redigeeritud versioon juba olemas - kirjutada üle?" msgstr "Redigeeritud versioon juba olemas - kirjutada üle?"
msgid "Error while queueing recording for cutting!" msgid "Error while queueing recording for cutting!"
msgstr "Salvestuse lõikamiseks lisamine ebaõnnestus!" msgstr "Salvestuse lisamine lõikamiseks ebaõnnestus!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Nimetada salvestuse nimi kaustaks?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "Kustutada selle salvestuse markerid?" msgstr "Kustutada selle salvestuse markerid?"
@ -839,7 +839,7 @@ msgid "Recording commands"
msgstr "Salvestuse käsud" msgstr "Salvestuse käsud"
msgid "never" msgid "never"
msgstr "ei" msgstr "ealeski"
msgid "skin dependent" msgid "skin dependent"
msgstr "kestast sõltuv" msgstr "kestast sõltuv"
@ -878,7 +878,7 @@ msgid "Setup.OSD$Use small font"
msgstr "Väikese fondi kasutus" msgstr "Väikese fondi kasutus"
msgid "Setup.OSD$Anti-alias" msgid "Setup.OSD$Anti-alias"
msgstr "Fondi silumine" msgstr "Fondi sakitõrje"
msgid "Setup.OSD$Default font" msgid "Setup.OSD$Default font"
msgstr "Vaikefont" msgstr "Vaikefont"
@ -1018,7 +1018,7 @@ msgid "Setup.DVB$Primary DVB interface"
msgstr "Esmane DVB seade" msgstr "Esmane DVB seade"
msgid "Setup.DVB$Standard compliance" msgid "Setup.DVB$Standard compliance"
msgstr "Standardivastavavus" msgstr "Standardivastavus"
msgid "Setup.DVB$Video format" msgid "Setup.DVB$Video format"
msgstr "TV külgsuhe" msgstr "TV külgsuhe"
@ -1100,7 +1100,7 @@ msgid "East"
msgstr "itta (E)" msgstr "itta (E)"
msgid "Setup.LNB$Max. positioner swing (degrees)" msgid "Setup.LNB$Max. positioner swing (degrees)"
msgstr "Positsioneerija max pöördeulatus (°)" msgstr "Positsioneerija pöördeulatus (°)"
msgid "Setup.LNB$Positioner speed (degrees/s)" msgid "Setup.LNB$Positioner speed (degrees/s)"
msgstr "Positsioneerija kiirus (°/s)" msgstr "Positsioneerija kiirus (°/s)"
@ -1179,7 +1179,7 @@ msgid "Setup.Recording$Default lifetime (d)"
msgstr "Salvestuse eluiga (päevi)" msgstr "Salvestuse eluiga (päevi)"
msgid "Setup.Recording$Pause key handling" msgid "Setup.Recording$Pause key handling"
msgstr "Pausi klahvi käsitsemine" msgstr "Pausi klahvi käsitlemine"
msgid "Setup.Recording$Pause priority" msgid "Setup.Recording$Pause priority"
msgstr "Pausi prioriteet" msgstr "Pausi prioriteet"
@ -1221,7 +1221,7 @@ msgid "Replay"
msgstr "Taasesitus" msgstr "Taasesitus"
msgid "Setup.Replay$Multi speed mode" msgid "Setup.Replay$Multi speed mode"
msgstr "Mitme kiiruse režiim" msgstr "Mitmikkiiruse režiim"
msgid "Setup.Replay$Show replay mode" msgid "Setup.Replay$Show replay mode"
msgstr "Korduse režiimi kuvamine" msgstr "Korduse režiimi kuvamine"
@ -1245,12 +1245,21 @@ msgid "Setup.Replay$Pause replay at last mark"
msgstr "Paus viimasel markeril" msgstr "Paus viimasel markeril"
msgid "Setup.Replay$Initial duration for adaptive skipping (s)" msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
msgstr "" msgstr "Adaptiivse hüppe kestuse algväärtus (s)"
msgid "Setup.Replay$Reset timeout for adaptive skipping (s)" msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
msgstr "" msgstr "Adaptiivse hüppe lähtestamise viide (s)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Adaptiivse hüppe vaheldumine käitumine"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "" msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
@ -1365,10 +1374,10 @@ msgid "No free DVB device to record!"
msgstr "Puudub vaba DVB seade salvestamiseks!" msgstr "Puudub vaba DVB seade salvestamiseks!"
msgid "Pausing live video..." msgid "Pausing live video..."
msgstr "Otseülekande peatamine..." msgstr "Otseedastuse peatamine..."
msgid "Delete timeshift recording?" msgid "Delete timeshift recording?"
msgstr "Kustutada ajanihke salvestus?" msgstr "Kustutada ajanihke salvestust?"
#. TRANSLATORS: note the trailing blank! #. TRANSLATORS: note the trailing blank!
msgid "Jump: " msgid "Jump: "
@ -1378,7 +1387,7 @@ msgid "No editing marks defined!"
msgstr "Redigeerimise markerid puuduvad!" msgstr "Redigeerimise markerid puuduvad!"
msgid "No editing sequences defined!" msgid "No editing sequences defined!"
msgstr "Redigeerimise järjestus puudub!" msgstr "Redigeerimise järjestus määramata!"
msgid "Can't start editing process!" msgid "Can't start editing process!"
msgstr "Redigeerimise start ebaõnnestus!" msgstr "Redigeerimise start ebaõnnestus!"

13
po/fi_FI.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n" "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n"
@ -801,7 +801,7 @@ msgid "Error while queueing recording for cutting!"
msgstr "Tallenteen lisääminen leikkausjonoon epäonnistui!" msgstr "Tallenteen lisääminen leikkausjonoon epäonnistui!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Nimeä tallenne kansion mukaan?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "Poistetaanko muokkausmerkinnät tallenteelta?" msgstr "Poistetaanko muokkausmerkinnät tallenteelta?"
@ -1257,6 +1257,15 @@ msgstr "Mukautuvan hypyn nollausviive (s)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Käytä vaihtoehtoista mukautuvaa hyppyä" msgstr "Käytä vaihtoehtoista mukautuvaa hyppyä"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Tallenteen paluutunniste" msgstr "Tallenteen paluutunniste"

148
po/fr_FR.po
View File

@ -12,14 +12,15 @@
# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013 # Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
# Peter Münster <pmlists@free.fr>, 2013 # Peter Münster <pmlists@free.fr>, 2013
# Dominique Plu <dplu@free.fr>, 2013 # Dominique Plu <dplu@free.fr>, 2013
# Régis Bossut <famille.bossut@wanadoo.fr>, 2015
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-11 11:02+0100\n"
"PO-Revision-Date: 2013-02-24 12:56+0100\n" "PO-Revision-Date: 2015-02-10 17:16+0100\n"
"Last-Translator: Dominique Plu <dplu@free.fr>\n" "Last-Translator: Régis Bossut <famille.bossut@wanadoo.fr>\n"
"Language-Team: French <vdr@linuxtv.org>\n" "Language-Team: French <vdr@linuxtv.org>\n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -30,7 +31,7 @@ msgid "*** Invalid Channel ***"
msgstr "*** Chaîne invalide ! ***" msgstr "*** Chaîne invalide ! ***"
msgid "CAM activated!" msgid "CAM activated!"
msgstr "" msgstr "CAM activée !"
msgid "Channel not available!" msgid "Channel not available!"
msgstr "Chaîne non disponible !" msgstr "Chaîne non disponible !"
@ -90,13 +91,13 @@ msgid "StreamId"
msgstr "StreamId" msgstr "StreamId"
msgid "Pilot" msgid "Pilot"
msgstr "" msgstr "Pilote"
msgid "T2SystemId" msgid "T2SystemId"
msgstr "" msgstr "ID système T2"
msgid "SISO/MISO" msgid "SISO/MISO"
msgstr "" msgstr "SISO/MISO"
msgid "Starting EPG scan" msgid "Starting EPG scan"
msgstr "Mise à jour du guide des programmes" msgstr "Mise à jour du guide des programmes"
@ -340,7 +341,7 @@ msgstr "Direct"
#, c-format #, c-format
msgid "ParentalRating$from %d" msgid "ParentalRating$from %d"
msgstr "À partir de %d" msgstr "à partir de %d ans"
msgid "No title" msgid "No title"
msgstr "Sans titre" msgstr "Sans titre"
@ -354,7 +355,7 @@ msgid "LanguageCode$eng"
msgstr "fra" msgstr "fra"
msgid "Phase 1: Detecting RC code type" msgid "Phase 1: Detecting RC code type"
msgstr "Phase 1: Détection du type de télécommande" msgstr "Phase 1 : Détection du type de télécommande"
msgid "Press any key on the RC unit" msgid "Press any key on the RC unit"
msgstr "Appuyer sur une touche de la télécommande" msgstr "Appuyer sur une touche de la télécommande"
@ -366,7 +367,7 @@ msgid "Do not press any key..."
msgstr "N'appuyer sur aucune touche..." msgstr "N'appuyer sur aucune touche..."
msgid "Phase 2: Learning specific key codes" msgid "Phase 2: Learning specific key codes"
msgstr "Phase 2: Apprentissage des touches" msgstr "Phase 2 : Apprentissage des touches"
#, c-format #, c-format
msgid "Press key for '%s'" msgid "Press key for '%s'"
@ -391,7 +392,7 @@ msgid "Learning Remote Control Keys"
msgstr "Apprentissage des touches de la télécommande" msgstr "Apprentissage des touches de la télécommande"
msgid "Phase 3: Saving key codes" msgid "Phase 3: Saving key codes"
msgstr "Phase 3: Sauvegarde des touches" msgstr "Phase 3 : Sauvegarde des touches"
msgid "Press 'Up' to save, 'Down' to cancel" msgid "Press 'Up' to save, 'Down' to cancel"
msgstr "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler" msgstr "Appuyer sur 'Haut' pour sauvegarder, 'Bas' pour annuler"
@ -538,7 +539,7 @@ msgid "Free To Air"
msgstr "En clair" msgstr "En clair"
msgid "encrypted" msgid "encrypted"
msgstr "Crypté" msgstr "crypté"
msgid "Edit channel" msgid "Edit channel"
msgstr "Modifier la chaîne" msgstr "Modifier la chaîne"
@ -586,13 +587,13 @@ msgid "Sid"
msgstr "Sid" msgstr "Sid"
msgid "Nid" msgid "Nid"
msgstr "" msgstr "Nid"
msgid "Tid" msgid "Tid"
msgstr "" msgstr "Tid"
msgid "Channel settings are not unique!" msgid "Channel settings are not unique!"
msgstr "Cette chaîne n'est pas unique !" msgstr "Les paramètres de cette chaîne ne sont pas uniques !"
msgid "Channels" msgid "Channels"
msgstr "Chaînes" msgstr "Chaînes"
@ -622,7 +623,7 @@ msgid "New folder"
msgstr "Nouveau dossier" msgstr "Nouveau dossier"
msgid "Sub folder" msgid "Sub folder"
msgstr "Sous dossier" msgstr "Sous-dossier"
msgid "Folder name already exists!" msgid "Folder name already exists!"
msgstr "Ce nom de dossier existe déjà !" msgstr "Ce nom de dossier existe déjà !"
@ -635,7 +636,7 @@ msgid "Button$Open"
msgstr "Ouvrir" msgstr "Ouvrir"
msgid "Delete folder and all sub folders?" msgid "Delete folder and all sub folders?"
msgstr "Supprimer le dossier et tous les sous dossiers ?" msgstr "Supprimer le dossier et tous les sous-dossiers ?"
msgid "Delete folder?" msgid "Delete folder?"
msgstr "Supprimer le dossier ?" msgstr "Supprimer le dossier ?"
@ -689,7 +690,7 @@ msgid "Timers"
msgstr "Programmations" msgstr "Programmations"
msgid "Button$On/Off" msgid "Button$On/Off"
msgstr "Marche/Arr" msgstr "Marche/Arrêt"
msgid "Button$Info" msgid "Button$Info"
msgstr "Info" msgstr "Info"
@ -736,13 +737,13 @@ msgstr "Programme - %s"
#, c-format #, c-format
msgid "This event - %s" msgid "This event - %s"
msgstr "Cet événement - %s" msgstr "Cet évènement - %s"
msgid "This event - all channels" msgid "This event - all channels"
msgstr "Cet événement - toutes les chaînes" msgstr "Cet évènement - toutes les chaînes"
msgid "All events - all channels" msgid "All events - all channels"
msgstr "Tous les événements - toutes les chaînes" msgstr "Tous les évènements - toutes les chaînes"
#, c-format #, c-format
msgid "Please enter %d digits!" msgid "Please enter %d digits!"
@ -752,74 +753,74 @@ msgid "CAM not responding!"
msgstr "Pas de réponse du CAM" msgstr "Pas de réponse du CAM"
msgid "Edit path" msgid "Edit path"
msgstr "" msgstr "Éditer le chemin"
msgid "Folder" msgid "Folder"
msgstr "" msgstr "Dossier"
msgid "This folder is currently in use - no changes are possible!" msgid "This folder is currently in use - no changes are possible!"
msgstr "" msgstr "Ce dossier est en cours d'utilisation - pas de modification possible !"
#, c-format #, c-format
msgid "Move entire folder containing %d recordings?" msgid "Move entire folder containing %d recordings?"
msgstr "" msgstr "Déplacer tout le dossier contenant %d enregistrements ?"
msgid "Error while moving folder!" msgid "Error while moving folder!"
msgstr "" msgstr "Erreur lors du déplacement du dossier !"
msgid "Edit recording" msgid "Edit recording"
msgstr "" msgstr "Éditer l'enregistrement"
msgid "This recording is currently in use - no changes are possible!" msgid "This recording is currently in use - no changes are possible!"
msgstr "" msgstr "Cet enregistrement est en cours d'utilisation - pas de modification possible !"
msgid "Button$Cancel cutting" msgid "Button$Cancel cutting"
msgstr "" msgstr "Annuler la coupe"
msgid "Button$Stop cutting" msgid "Button$Stop cutting"
msgstr "" msgstr "Arrêter la coupe"
msgid "Button$Cancel moving" msgid "Button$Cancel moving"
msgstr "" msgstr "Annuler le déplacement"
msgid "Button$Stop moving" msgid "Button$Stop moving"
msgstr "" msgstr "Arrêter le déplacement"
msgid "Button$Cancel copying" msgid "Button$Cancel copying"
msgstr "" msgstr "Annuler la copie"
msgid "Button$Stop copying" msgid "Button$Stop copying"
msgstr "" msgstr "Arrêter la copie"
msgid "Button$Cut" msgid "Button$Cut"
msgstr "" msgstr "Couper"
msgid "Button$Delete marks" msgid "Button$Delete marks"
msgstr "" msgstr "Supprimer les marqueurs"
msgid "Recording vanished!" msgid "Recording vanished!"
msgstr "" msgstr "Enregistrement disparu !"
msgid "Edited version already exists - overwrite?" msgid "Edited version already exists - overwrite?"
msgstr "" msgstr "La version éditée existe déjà - écraser ?"
msgid "Error while queueing recording for cutting!" msgid "Error while queueing recording for cutting!"
msgstr "" msgstr "Erreur lors de la mise en file d'attente pour la coupe !"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Modifier le nom du dossier des enregistrements ?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "" msgstr "Supprimer les marqueurs d'édition de cet enregistrement ?"
msgid "Error while deleting editing marks!" msgid "Error while deleting editing marks!"
msgstr "" msgstr "Erreur pendant la suppression des marqueurs d'édition !"
msgid "Error while changing priority/lifetime!" msgid "Error while changing priority/lifetime!"
msgstr "" msgstr "Erreur pendant le changement de priorité et/ou durée de vie !"
msgid "Error while changing folder/name!" msgid "Error while changing folder/name!"
msgstr "" msgstr "Erreur pendant le changement de dossier et/ou nom !"
msgid "Recording info" msgid "Recording info"
msgstr "Infos sur l'enregistrement" msgstr "Infos sur l'enregistrement"
@ -1089,31 +1090,31 @@ msgid "Setup.LNB$own"
msgstr "Propriétaire" msgstr "Propriétaire"
msgid "Setup.LNB$Use dish positioner" msgid "Setup.LNB$Use dish positioner"
msgstr "" msgstr "Utiliser le positionneur de parabole"
msgid "Setup.LNB$Site latitude (degrees)" msgid "Setup.LNB$Site latitude (degrees)"
msgstr "" msgstr "Latitude du site (°)"
msgid "South" msgid "South"
msgstr "" msgstr "Sud"
msgid "North" msgid "North"
msgstr "" msgstr "Nord"
msgid "Setup.LNB$Site longitude (degrees)" msgid "Setup.LNB$Site longitude (degrees)"
msgstr "" msgstr "Longitude du site (°)"
msgid "West" msgid "West"
msgstr "" msgstr "Ouest"
msgid "East" msgid "East"
msgstr "" msgstr "Est"
msgid "Setup.LNB$Max. positioner swing (degrees)" msgid "Setup.LNB$Max. positioner swing (degrees)"
msgstr "" msgstr "Course max. du positionneur (°)"
msgid "Setup.LNB$Positioner speed (degrees/s)" msgid "Setup.LNB$Positioner speed (degrees/s)"
msgstr "" msgstr "Vitesse du positionneur (°/s)"
msgid "CAM reset" msgid "CAM reset"
msgstr "CAM réinitialisé" msgstr "CAM réinitialisé"
@ -1126,16 +1127,16 @@ msgstr "CAM prêt"
#. TRANSLATORS: note the leading blank! #. TRANSLATORS: note the leading blank!
msgid " (activating)" msgid " (activating)"
msgstr "" msgstr " (activation en cours)"
msgid "CAM" msgid "CAM"
msgstr "CAM" msgstr "CAM"
msgid "Button$Cancel activation" msgid "Button$Cancel activation"
msgstr "" msgstr "Annuler l'activation"
msgid "Button$Activate" msgid "Button$Activate"
msgstr "" msgstr "Activer"
msgid "Button$Menu" msgid "Button$Menu"
msgstr "Menu" msgstr "Menu"
@ -1150,7 +1151,7 @@ msgid "Can't open CAM menu!"
msgstr "Impossible d'ouvrir le menu CAM !" msgstr "Impossible d'ouvrir le menu CAM !"
msgid "Can't activate CAM!" msgid "Can't activate CAM!"
msgstr "" msgstr "Impossible d'activer le CAM !"
msgid "CAM is in use - really reset?" msgid "CAM is in use - really reset?"
msgstr "CAM en cours d'utilisation - confirmer réinitialisation ?" msgstr "CAM en cours d'utilisation - confirmer réinitialisation ?"
@ -1243,25 +1244,34 @@ msgid "Setup.Replay$Progress display time (s)"
msgstr "Afficher la barre de progression (s)" msgstr "Afficher la barre de progression (s)"
msgid "Setup.Replay$Pause replay when setting mark" msgid "Setup.Replay$Pause replay when setting mark"
msgstr "Arrêt lecture si ajout marqueur" msgstr "Arrêt lecture pendant ajout marqueur"
msgid "Setup.Replay$Pause replay when jumping to a mark" msgid "Setup.Replay$Pause replay when jumping to a mark"
msgstr "" msgstr "Arrêt lecture après saut vers un marqueur"
msgid "Setup.Replay$Skip edited parts" msgid "Setup.Replay$Skip edited parts"
msgstr "" msgstr "Sauter les parties éditées"
msgid "Setup.Replay$Pause replay at last mark" msgid "Setup.Replay$Pause replay at last mark"
msgstr "" msgstr "Arrêt lecture au dernier marqueur"
msgid "Setup.Replay$Initial duration for adaptive skipping (s)" msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
msgstr "" msgstr "Durée initiale pour le saut adaptatif (s)"
msgid "Setup.Replay$Reset timeout for adaptive skipping (s)" msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
msgstr "" msgstr "Timeout du reset pour le saut adaptatif (s)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr "Réduire le saut adaptatif uniquement si changement de sens"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr "Utiliser les touches Préc./Suiv. pour le saut adaptatif"
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr "Distance de saut pour les touches Verte/Jaune (s)"
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "Distance de saut pour les touches Verte/Jaune en répétition (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID de reprise" msgstr "ID de reprise"
@ -1270,7 +1280,7 @@ msgid "Miscellaneous"
msgstr "Divers" msgstr "Divers"
msgid "Setup.Miscellaneous$Min. event timeout (min)" msgid "Setup.Miscellaneous$Min. event timeout (min)"
msgstr "Temps mini entre événements (min)" msgstr "Temps mini entre évènements (min)"
msgid "Setup.Miscellaneous$Min. user inactivity (min)" msgid "Setup.Miscellaneous$Min. user inactivity (min)"
msgstr "Inactivité de l'utilisateur (min)" msgstr "Inactivité de l'utilisateur (min)"
@ -1300,10 +1310,10 @@ msgid "Setup.Miscellaneous$Initial volume"
msgstr "Volume initial" msgstr "Volume initial"
msgid "Setup.Miscellaneous$Volume steps" msgid "Setup.Miscellaneous$Volume steps"
msgstr "" msgstr "Pas du changement de volume"
msgid "Setup.Miscellaneous$Volume linearize" msgid "Setup.Miscellaneous$Volume linearize"
msgstr "" msgstr "Correction de la courbe"
msgid "Setup.Miscellaneous$Channels wrap" msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Affichage circulaire des chaînes" msgstr "Affichage circulaire des chaînes"
@ -1385,7 +1395,7 @@ msgid "Jump: "
msgstr "Accès direct : " msgstr "Accès direct : "
msgid "No editing marks defined!" msgid "No editing marks defined!"
msgstr "Pas de marques d'édition définies !" msgstr "Pas de marqueurs d'édition définis !"
msgid "No editing sequences defined!" msgid "No editing sequences defined!"
msgstr "Aucune séquence d'édition définie !" msgstr "Aucune séquence d'édition définie !"
@ -1491,7 +1501,7 @@ msgstr "LECTURE"
#, c-format #, c-format
msgid "Moving dish to %.1f..." msgid "Moving dish to %.1f..."
msgstr "" msgstr "Orientation de la parabole vers %.1f..."
msgid "ST:TNG Panels" msgid "ST:TNG Panels"
msgstr "Consoles ST:TNG" msgstr "Consoles ST:TNG"

11
po/hr_HR.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2008-03-17 19:00+0100\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n"
"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n" "Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
"Language-Team: Croatian <vdr@linuxtv.org>\n" "Language-Team: Croatian <vdr@linuxtv.org>\n"
@ -1255,6 +1255,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID nastavka" msgstr "ID nastavka"

14
po/hu_HU.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-01-30 13:14+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2015-02-03 11:35+0200\n" "PO-Revision-Date: 2015-02-03 11:35+0200\n"
"Last-Translator: István Füley <ifuley@tigercomp.ro>\n" "Last-Translator: István Füley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n" "Language-Team: Hungarian <vdr@linuxtv.org>\n"
@ -801,6 +801,9 @@ msgstr "A szerkesztett változat már létezik - felülírjam?"
msgid "Error while queueing recording for cutting!" msgid "Error while queueing recording for cutting!"
msgstr "Hiba a felvétel vágásra előkészítése közben!" msgstr "Hiba a felvétel vágásra előkészítése közben!"
msgid "Rename recording to folder name?"
msgstr ""
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "Töröljem a felvétel vágópontjait?" msgstr "Töröljem a felvétel vágópontjait?"
@ -1255,6 +1258,15 @@ msgstr "Felezett ugrás időkorláta (mp)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Felezett ugrás csak irányváltoztatásnál" msgstr "Felezett ugrás csak irányváltoztatásnál"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Lejátszás azonosító" msgstr "Lejátszás azonosító"

35
po/it_IT.po
View File

@ -11,8 +11,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2015-02-05 00:09+0100\n" "PO-Revision-Date: 2015-02-09 20:26+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n" "Language-Team: Italian <vdr@linuxtv.org>\n"
"Language: it\n" "Language: it\n"
@ -32,7 +32,7 @@ msgid "Channel not available!"
msgstr "Canale non disponibile!" msgstr "Canale non disponibile!"
msgid "Can't start Transfer Mode!" msgid "Can't start Transfer Mode!"
msgstr "Impossibile avviare mod. trasferimento!" msgstr "Impossibile avviare modalità trasferimento!"
msgid "off" msgid "off"
msgstr "off" msgstr "off"
@ -803,7 +803,7 @@ msgid "Error while queueing recording for cutting!"
msgstr "Errore durante l'accodamento della registrazione per il taglio!" msgstr "Errore durante l'accodamento della registrazione per il taglio!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Rinominare registrazione come nome cartella?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "Eliminare i marcatori di modifica della registrazione?" msgstr "Eliminare i marcatori di modifica della registrazione?"
@ -1155,7 +1155,7 @@ msgid "Can't reset CAM!"
msgstr "Impossibile reimpostare il modulo CAM!" msgstr "Impossibile reimpostare il modulo CAM!"
msgid "do not pause live video" msgid "do not pause live video"
msgstr "non pausare video dal vivo" msgstr "non mettere in pausa il video dal vivo"
msgid "confirm pause live video" msgid "confirm pause live video"
msgstr "conferma pausa video dal vivo" msgstr "conferma pausa video dal vivo"
@ -1203,13 +1203,13 @@ msgid "Setup.Recording$VPS margin (s)"
msgstr "Margine VPS (s)" msgstr "Margine VPS (s)"
msgid "Setup.Recording$Mark instant recording" msgid "Setup.Recording$Mark instant recording"
msgstr "Segna reg. immediata" msgstr "Segna registrazione immediata"
msgid "Setup.Recording$Name instant recording" msgid "Setup.Recording$Name instant recording"
msgstr "Nome reg. immediata" msgstr "Nome registrazione immediata"
msgid "Setup.Recording$Instant rec. time (min)" msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Durata reg. immediata (min)" msgstr "Durata registrazione immediata (min)"
msgid "Setup.Recording$present event" msgid "Setup.Recording$present event"
msgstr "evento attuale" msgstr "evento attuale"
@ -1251,12 +1251,21 @@ msgid "Setup.Replay$Pause replay at last mark"
msgstr "Pausa riproduzione all'ultimo marcatore" msgstr "Pausa riproduzione all'ultimo marcatore"
msgid "Setup.Replay$Initial duration for adaptive skipping (s)" msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
msgstr "" msgstr "Durata iniziale per spostamenti adattivi (s)"
msgid "Setup.Replay$Reset timeout for adaptive skipping (s)" msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
msgstr "" msgstr "Reimposta scadenza per spostamenti adattivi (s)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Comportamento alternativo per spostamenti adattivi"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "" msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
@ -1471,10 +1480,10 @@ msgid "DISK"
msgstr "DISCO" msgstr "DISCO"
msgid "LOAD" msgid "LOAD"
msgstr "CARICA" msgstr "USO"
msgid "TIMERS" msgid "TIMERS"
msgstr "TIMER" msgstr "TIMERS"
msgid "DEVICES" msgid "DEVICES"
msgstr "SCHEDE" msgstr "SCHEDE"
@ -1487,7 +1496,7 @@ msgstr "RIPRODUCI"
#, c-format #, c-format
msgid "Moving dish to %.1f..." msgid "Moving dish to %.1f..."
msgstr "Muovi antenna verso %.1f..." msgstr "Spostamento antenna verso %.1f..."
msgid "ST:TNG Panels" msgid "ST:TNG Panels"
msgstr "Consolle ST:TNG" msgstr "Consolle ST:TNG"

19
po/lt_LT.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2010-10-30 11:55+0200\n" "PO-Revision-Date: 2015-02-09 17:08+0100\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
"Language: lt\n" "Language: lt\n"
@ -797,7 +797,7 @@ msgid "Error while queueing recording for cutting!"
msgstr "Klaida sustatant įrašus į karpymo eilę!" msgstr "Klaida sustatant įrašus į karpymo eilę!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Priskirti įrašui katalogo pavadinimą?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "Ar tikrai ištrinti šio įrašo koregavimo žymes?" msgstr "Ar tikrai ištrinti šio įrašo koregavimo žymes?"
@ -1245,12 +1245,21 @@ msgid "Setup.Replay$Pause replay at last mark"
msgstr "Setup.Replay$Pristabdyti pakartojimą pasiekus paskutinę žymę" msgstr "Setup.Replay$Pristabdyti pakartojimą pasiekus paskutinę žymę"
msgid "Setup.Replay$Initial duration for adaptive skipping (s)" msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
msgstr "" msgstr "Setup.Replay$Adaptyvaus peršokimo trukmė (s)"
msgid "Setup.Replay$Reset timeout for adaptive skipping (s)" msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
msgstr "" msgstr "Setup.Replay$Adaptyvaus peršokimo perkrovimo užlaikymas(s)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Setup.Replay$Adaptyvaus peršokimo galima elgsena"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "" msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"

115
po/mk_MK.po
View File

@ -1,14 +1,14 @@
# VDR language source file. # VDR language source file.
# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de> # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
# This file is distributed under the same license as the VDR package. # This file is distributed under the same license as the VDR package.
# Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013 # Dimitar Petrovski <dimeptr@gmail.com>, 2009, 2012, 2013, 2015
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2012-11-19 15:18+0100\n" "PO-Revision-Date: 2015-02-08 15:18+0100\n"
"Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n" "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
"Language-Team: Macedonian <en@li.org>\n" "Language-Team: Macedonian <en@li.org>\n"
"Language: mk\n" "Language: mk\n"
@ -21,7 +21,7 @@ msgid "*** Invalid Channel ***"
msgstr "*** Невалиден Канал ***" msgstr "*** Невалиден Канал ***"
msgid "CAM activated!" msgid "CAM activated!"
msgstr "" msgstr "CAM активиран!"
msgid "Channel not available!" msgid "Channel not available!"
msgstr "Каналот е недостапен!" msgstr "Каналот е недостапен!"
@ -81,13 +81,13 @@ msgid "StreamId"
msgstr "StreamId" msgstr "StreamId"
msgid "Pilot" msgid "Pilot"
msgstr "" msgstr "Пилот"
msgid "T2SystemId" msgid "T2SystemId"
msgstr "" msgstr "Т2СистемИд"
msgid "SISO/MISO" msgid "SISO/MISO"
msgstr "" msgstr "СИСО/МИСО"
msgid "Starting EPG scan" msgid "Starting EPG scan"
msgstr "Започнувам скенирање на EPG" msgstr "Започнувам скенирање на EPG"
@ -577,10 +577,10 @@ msgid "Sid"
msgstr "Sid" msgstr "Sid"
msgid "Nid" msgid "Nid"
msgstr "" msgstr "Nid"
msgid "Tid" msgid "Tid"
msgstr "" msgstr "Tid"
msgid "Channel settings are not unique!" msgid "Channel settings are not unique!"
msgstr "Уредбите на каналот не се уникатни!" msgstr "Уредбите на каналот не се уникатни!"
@ -743,74 +743,74 @@ msgid "CAM not responding!"
msgstr "CAM не одговара!" msgstr "CAM не одговара!"
msgid "Edit path" msgid "Edit path"
msgstr "" msgstr "Уреди патека"
msgid "Folder" msgid "Folder"
msgstr "" msgstr "Папка"
msgid "This folder is currently in use - no changes are possible!" msgid "This folder is currently in use - no changes are possible!"
msgstr "" msgstr "Оваа папка е моментално во употреба - промени не се возможни!"
#, c-format #, c-format
msgid "Move entire folder containing %d recordings?" msgid "Move entire folder containing %d recordings?"
msgstr "" msgstr "Помести цела папка со %d снимки?"
msgid "Error while moving folder!" msgid "Error while moving folder!"
msgstr "" msgstr "Грешка при поместување папка!"
msgid "Edit recording" msgid "Edit recording"
msgstr "" msgstr "Уреди снимка"
msgid "This recording is currently in use - no changes are possible!" msgid "This recording is currently in use - no changes are possible!"
msgstr "" msgstr "Оваа снимка е моментално во употреба - промени не се возможни!"
msgid "Button$Cancel cutting" msgid "Button$Cancel cutting"
msgstr "" msgstr "Откажи сечење"
msgid "Button$Stop cutting" msgid "Button$Stop cutting"
msgstr "" msgstr "Запри сечење"
msgid "Button$Cancel moving" msgid "Button$Cancel moving"
msgstr "" msgstr "Откажи преместување"
msgid "Button$Stop moving" msgid "Button$Stop moving"
msgstr "" msgstr "Запри преместување"
msgid "Button$Cancel copying" msgid "Button$Cancel copying"
msgstr "" msgstr "Откажи копирање"
msgid "Button$Stop copying" msgid "Button$Stop copying"
msgstr "" msgstr "Запри копирање"
msgid "Button$Cut" msgid "Button$Cut"
msgstr "" msgstr "Сечи"
msgid "Button$Delete marks" msgid "Button$Delete marks"
msgstr "" msgstr "Избриши ознаки"
msgid "Recording vanished!" msgid "Recording vanished!"
msgstr "" msgstr "Снимката исчезна!"
msgid "Edited version already exists - overwrite?" msgid "Edited version already exists - overwrite?"
msgstr "" msgstr "Уредена верзија веќе постои - пребриши?"
msgid "Error while queueing recording for cutting!" msgid "Error while queueing recording for cutting!"
msgstr "" msgstr "Грешка при редење на снимка за сечење!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Преименувај ја снимката како името на папката?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "" msgstr "Бриши ознаки за уредување за оваа снимка?"
msgid "Error while deleting editing marks!" msgid "Error while deleting editing marks!"
msgstr "" msgstr "Грешка при бришење на ознака за уредување!"
msgid "Error while changing priority/lifetime!" msgid "Error while changing priority/lifetime!"
msgstr "" msgstr "Грешка при промена на приоритет/траење!"
msgid "Error while changing folder/name!" msgid "Error while changing folder/name!"
msgstr "" msgstr "Грешка при промена на папка/име!"
msgid "Recording info" msgid "Recording info"
msgstr "Детали на снимката" msgstr "Детали на снимката"
@ -1080,31 +1080,31 @@ msgid "Setup.LNB$own"
msgstr "свој" msgstr "свој"
msgid "Setup.LNB$Use dish positioner" msgid "Setup.LNB$Use dish positioner"
msgstr "" msgstr "Користи позиционер за чинија"
msgid "Setup.LNB$Site latitude (degrees)" msgid "Setup.LNB$Site latitude (degrees)"
msgstr "" msgstr "Латидута на локацијата (степени)"
msgid "South" msgid "South"
msgstr "" msgstr "Југ"
msgid "North" msgid "North"
msgstr "" msgstr "Север"
msgid "Setup.LNB$Site longitude (degrees)" msgid "Setup.LNB$Site longitude (degrees)"
msgstr "" msgstr "Лонгитуда на локацијата (степени)"
msgid "West" msgid "West"
msgstr "" msgstr "Запад"
msgid "East" msgid "East"
msgstr "" msgstr "Исток"
msgid "Setup.LNB$Max. positioner swing (degrees)" msgid "Setup.LNB$Max. positioner swing (degrees)"
msgstr "" msgstr "Максимален од на позиционерот (степени)"
msgid "Setup.LNB$Positioner speed (degrees/s)" msgid "Setup.LNB$Positioner speed (degrees/s)"
msgstr "" msgstr "Брзина на позиционерот (степени/сек)"
msgid "CAM reset" msgid "CAM reset"
msgstr "Рестартирај CAM" msgstr "Рестартирај CAM"
@ -1117,16 +1117,16 @@ msgstr "CAM спремен"
#. TRANSLATORS: note the leading blank! #. TRANSLATORS: note the leading blank!
msgid " (activating)" msgid " (activating)"
msgstr "" msgstr " (активирање)"
msgid "CAM" msgid "CAM"
msgstr "CAM" msgstr "CAM"
msgid "Button$Cancel activation" msgid "Button$Cancel activation"
msgstr "" msgstr "Откажи активација"
msgid "Button$Activate" msgid "Button$Activate"
msgstr "" msgstr "Активирај"
msgid "Button$Menu" msgid "Button$Menu"
msgstr "Мени" msgstr "Мени"
@ -1141,7 +1141,7 @@ msgid "Can't open CAM menu!"
msgstr "Неуспешно отварање на CAM менито!" msgstr "Неуспешно отварање на CAM менито!"
msgid "Can't activate CAM!" msgid "Can't activate CAM!"
msgstr "" msgstr "Неуспешно активирање на CAM!"
msgid "CAM is in use - really reset?" msgid "CAM is in use - really reset?"
msgstr "CAM е во употреба - рестартирај?" msgstr "CAM е во употреба - рестартирај?"
@ -1237,21 +1237,30 @@ msgid "Setup.Replay$Pause replay when setting mark"
msgstr "Паузирај репродукција кога се внесува ознака" msgstr "Паузирај репродукција кога се внесува ознака"
msgid "Setup.Replay$Pause replay when jumping to a mark" msgid "Setup.Replay$Pause replay when jumping to a mark"
msgstr "" msgstr "Паузирај репродукција кога се скока до ознака"
msgid "Setup.Replay$Skip edited parts" msgid "Setup.Replay$Skip edited parts"
msgstr "" msgstr "Прескокни ги уредуваните делови"
msgid "Setup.Replay$Pause replay at last mark" msgid "Setup.Replay$Pause replay at last mark"
msgstr "" msgstr "Паузирај репродукција на последанта ознака"
msgid "Setup.Replay$Initial duration for adaptive skipping (s)" msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
msgstr "" msgstr "Почетно траење на адаптабилно скокање (сек)"
msgid "Setup.Replay$Reset timeout for adaptive skipping (s)" msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
msgstr "" msgstr "Време на ресетирање за адаптабилно скокање (сек)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Алтернативно однесување за адаптабилно скокање"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "" msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
@ -1291,10 +1300,10 @@ msgid "Setup.Miscellaneous$Initial volume"
msgstr "Почетна јачина на звук" msgstr "Почетна јачина на звук"
msgid "Setup.Miscellaneous$Volume steps" msgid "Setup.Miscellaneous$Volume steps"
msgstr "" msgstr "Чекори на јачина на звук"
msgid "Setup.Miscellaneous$Volume linearize" msgid "Setup.Miscellaneous$Volume linearize"
msgstr "" msgstr "Линеаризациај на јачина на звук"
msgid "Setup.Miscellaneous$Channels wrap" msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Премотување канали" msgstr "Премотување канали"
@ -1482,7 +1491,7 @@ msgstr "ПУШТИ"
#, c-format #, c-format
msgid "Moving dish to %.1f..." msgid "Moving dish to %.1f..."
msgstr "" msgstr "Движење на чинијата кон %.1f..."
msgid "ST:TNG Panels" msgid "ST:TNG Panels"
msgstr "ST:TNG Панели" msgstr "ST:TNG Панели"

120
po/nl_NL.po
View File

@ -7,14 +7,15 @@
# Carel Willemse <carel@nekanali.nl>, 2008, 2013 # Carel Willemse <carel@nekanali.nl>, 2008, 2013
# Johan Schuring <johan.schuring@vetteblei.nl>, 2008 # Johan Schuring <johan.schuring@vetteblei.nl>, 2008
# Cedric Dewijs <cedric.dewijs@telfort.nl>, 2013 # Cedric Dewijs <cedric.dewijs@telfort.nl>, 2013
# Erik Oomen <oomen.e@gmail.com>, 2015
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-11 10:51+0100\n"
"PO-Revision-Date: 2008-02-26 17:20+0100\n" "PO-Revision-Date: 2015-02-10 19:43+0100\n"
"Last-Translator: Cedric Dewijs <cedric.dewijs@telfort.nl>\n" "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n" "Language-Team: Dutch <vdr@linuxtv.org>\n"
"Language: nl\n" "Language: nl\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -25,7 +26,7 @@ msgid "*** Invalid Channel ***"
msgstr "*** Ongeldig kanaal ***" msgstr "*** Ongeldig kanaal ***"
msgid "CAM activated!" msgid "CAM activated!"
msgstr "" msgstr "CAM geactiveerd!"
msgid "Channel not available!" msgid "Channel not available!"
msgstr "Kanaal niet beschikbaar" msgstr "Kanaal niet beschikbaar"
@ -85,13 +86,13 @@ msgid "StreamId"
msgstr "StreamId" msgstr "StreamId"
msgid "Pilot" msgid "Pilot"
msgstr "" msgstr "Piloot"
msgid "T2SystemId" msgid "T2SystemId"
msgstr "" msgstr "T2SystemId"
msgid "SISO/MISO" msgid "SISO/MISO"
msgstr "" msgstr "SISO/MISO"
msgid "Starting EPG scan" msgid "Starting EPG scan"
msgstr "Bezig met starten EPG scan" msgstr "Bezig met starten EPG scan"
@ -581,10 +582,10 @@ msgid "Sid"
msgstr "Sid" msgstr "Sid"
msgid "Nid" msgid "Nid"
msgstr "" msgstr "Nid"
msgid "Tid" msgid "Tid"
msgstr "" msgstr "Tid"
msgid "Channel settings are not unique!" msgid "Channel settings are not unique!"
msgstr "Kanaalinstellingen zijn niet uniek!" msgstr "Kanaalinstellingen zijn niet uniek!"
@ -747,74 +748,74 @@ msgid "CAM not responding!"
msgstr "CAM reageert niet!" msgstr "CAM reageert niet!"
msgid "Edit path" msgid "Edit path"
msgstr "" msgstr "Pad bewerken"
msgid "Folder" msgid "Folder"
msgstr "" msgstr "Map"
msgid "This folder is currently in use - no changes are possible!" msgid "This folder is currently in use - no changes are possible!"
msgstr "" msgstr "Deze map is momenteel in gebruik - geen wijzigingen zijn mogelijk!"
#, c-format #, c-format
msgid "Move entire folder containing %d recordings?" msgid "Move entire folder containing %d recordings?"
msgstr "" msgstr "Verplaats hele map met %d -opnames?"
msgid "Error while moving folder!" msgid "Error while moving folder!"
msgstr "" msgstr "Fout tijdens het verplaatsen van de map!"
msgid "Edit recording" msgid "Edit recording"
msgstr "" msgstr "Opname bewerken"
msgid "This recording is currently in use - no changes are possible!" msgid "This recording is currently in use - no changes are possible!"
msgstr "" msgstr "Deze opname is momenteel in gebruik - geen wijzigingen zijn mogelijk!"
msgid "Button$Cancel cutting" msgid "Button$Cancel cutting"
msgstr "" msgstr "Knippen afbreken"
msgid "Button$Stop cutting" msgid "Button$Stop cutting"
msgstr "" msgstr "Knippen stoppen"
msgid "Button$Cancel moving" msgid "Button$Cancel moving"
msgstr "" msgstr "Verplaatsen afbreken"
msgid "Button$Stop moving" msgid "Button$Stop moving"
msgstr "" msgstr "Stoppen met verplaatsen"
msgid "Button$Cancel copying" msgid "Button$Cancel copying"
msgstr "" msgstr "Kopiëren afbreken"
msgid "Button$Stop copying" msgid "Button$Stop copying"
msgstr "" msgstr "Stop kopiëren"
msgid "Button$Cut" msgid "Button$Cut"
msgstr "" msgstr "Knip"
msgid "Button$Delete marks" msgid "Button$Delete marks"
msgstr "" msgstr "Verwijder markeringen"
msgid "Recording vanished!" msgid "Recording vanished!"
msgstr "" msgstr "Opname verdwenen!"
msgid "Edited version already exists - overwrite?" msgid "Edited version already exists - overwrite?"
msgstr "" msgstr "Bewerkte versie bestaat al - overschrijven?"
msgid "Error while queueing recording for cutting!" msgid "Error while queueing recording for cutting!"
msgstr "" msgstr "Kan opname voor knippen niet in wachtrij plaatsen!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Opname hernoemen naar mapnaam?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "" msgstr "Verwijder bewerkings markeringen voor deze opnamen?"
msgid "Error while deleting editing marks!" msgid "Error while deleting editing marks!"
msgstr "" msgstr "Fout bij het verwijderen van alle bewerkings markeringen!"
msgid "Error while changing priority/lifetime!" msgid "Error while changing priority/lifetime!"
msgstr "" msgstr "Fout tijdens het wijzigen prioriteit / duur!"
msgid "Error while changing folder/name!" msgid "Error while changing folder/name!"
msgstr "" msgstr "Fout tijdens het wijzigen map / naam!"
msgid "Recording info" msgid "Recording info"
msgstr "Opname info" msgstr "Opname info"
@ -919,7 +920,7 @@ msgid "Setup.OSD$Info on channel switch"
msgstr "Kanaal info tonen" msgstr "Kanaal info tonen"
msgid "Setup.OSD$Timeout requested channel info" msgid "Setup.OSD$Timeout requested channel info"
msgstr "Tijdsduur opgevraagde kanaalinfo." msgstr "Timout opgevraagde kanaalinfo"
msgid "Setup.OSD$Scroll pages" msgid "Setup.OSD$Scroll pages"
msgstr "Scrollen per pagina" msgstr "Scrollen per pagina"
@ -1084,31 +1085,31 @@ msgid "Setup.LNB$own"
msgstr "eigen" msgstr "eigen"
msgid "Setup.LNB$Use dish positioner" msgid "Setup.LNB$Use dish positioner"
msgstr "" msgstr "Gebruik schotel positioner"
msgid "Setup.LNB$Site latitude (degrees)" msgid "Setup.LNB$Site latitude (degrees)"
msgstr "" msgstr "Plaats breedtegraad (graden)"
msgid "South" msgid "South"
msgstr "" msgstr "Zuiden"
msgid "North" msgid "North"
msgstr "" msgstr "Noorden"
msgid "Setup.LNB$Site longitude (degrees)" msgid "Setup.LNB$Site longitude (degrees)"
msgstr "" msgstr "Plaats lengtegraad (graden)"
msgid "West" msgid "West"
msgstr "" msgstr "Westen"
msgid "East" msgid "East"
msgstr "" msgstr "Oosten"
msgid "Setup.LNB$Max. positioner swing (degrees)" msgid "Setup.LNB$Max. positioner swing (degrees)"
msgstr "" msgstr "Max. positioner swing (graden)"
msgid "Setup.LNB$Positioner speed (degrees/s)" msgid "Setup.LNB$Positioner speed (degrees/s)"
msgstr "" msgstr "Positioner snelheid (graden / s)"
msgid "CAM reset" msgid "CAM reset"
msgstr "CAM herstarten" msgstr "CAM herstarten"
@ -1121,16 +1122,16 @@ msgstr "CAM gereed"
#. TRANSLATORS: note the leading blank! #. TRANSLATORS: note the leading blank!
msgid " (activating)" msgid " (activating)"
msgstr "" msgstr " (Activeren)"
msgid "CAM" msgid "CAM"
msgstr "CAM" msgstr "CAM"
msgid "Button$Cancel activation" msgid "Button$Cancel activation"
msgstr "" msgstr "Anuleer activering"
msgid "Button$Activate" msgid "Button$Activate"
msgstr "" msgstr "Activeer"
msgid "Button$Menu" msgid "Button$Menu"
msgstr "Menu" msgstr "Menu"
@ -1145,7 +1146,7 @@ msgid "Can't open CAM menu!"
msgstr "Kan CAM-menu niet openen!" msgstr "Kan CAM-menu niet openen!"
msgid "Can't activate CAM!" msgid "Can't activate CAM!"
msgstr "" msgstr "Kan CAM niet te activeren!"
msgid "CAM is in use - really reset?" msgid "CAM is in use - really reset?"
msgstr "CAM wordt gebruikt - werkelijk herstarten?" msgstr "CAM wordt gebruikt - werkelijk herstarten?"
@ -1241,22 +1242,31 @@ msgid "Setup.Replay$Pause replay when setting mark"
msgstr "Pauzeer wanneer markering wordt geplaatst" msgstr "Pauzeer wanneer markering wordt geplaatst"
msgid "Setup.Replay$Pause replay when jumping to a mark" msgid "Setup.Replay$Pause replay when jumping to a mark"
msgstr "" msgstr "Pauzeer bij het springen naar een markering"
msgid "Setup.Replay$Skip edited parts" msgid "Setup.Replay$Skip edited parts"
msgstr "" msgstr "Sla bewerkte onderdelen over"
msgid "Setup.Replay$Pause replay at last mark" msgid "Setup.Replay$Pause replay at last mark"
msgstr "" msgstr "Pauzeer bij laatste markering"
msgid "Setup.Replay$Initial duration for adaptive skipping (s)" msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
msgstr "" msgstr "Initiële duur bij adaptief overslaan"
msgid "Setup.Replay$Reset timeout for adaptive skipping (s)" msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
msgstr "" msgstr "Reset Time-out voor adaptief overslaan"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr "Alternatief gedrag voor adaptief overslaan"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr "Gebruik Vorige/Volgende toetsen voor adaptief overslaan"
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr "Spoel sprong met groene en gele toetsen (s)"
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "Spoel sprong met groene en gele toesten in repeteerstand (s)"
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Hervattings ID" msgstr "Hervattings ID"
@ -1295,10 +1305,10 @@ msgid "Setup.Miscellaneous$Initial volume"
msgstr "Opstartvolume" msgstr "Opstartvolume"
msgid "Setup.Miscellaneous$Volume steps" msgid "Setup.Miscellaneous$Volume steps"
msgstr "" msgstr "Volume stappen"
msgid "Setup.Miscellaneous$Volume linearize" msgid "Setup.Miscellaneous$Volume linearize"
msgstr "" msgstr "Volume lineariseren"
msgid "Setup.Miscellaneous$Channels wrap" msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Doorscrollen kanalenlijst" msgstr "Doorscrollen kanalenlijst"
@ -1486,7 +1496,7 @@ msgstr "AFSPELEN"
#, c-format #, c-format
msgid "Moving dish to %.1f..." msgid "Moving dish to %.1f..."
msgstr "" msgstr "Schotel verplaatsen naar% .1f ..."
msgid "ST:TNG Panels" msgid "ST:TNG Panels"
msgstr "ST:TNG Consoles" msgstr "ST:TNG Consoles"

11
po/nn_NO.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n" "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@ -1254,6 +1254,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Resume ID" msgstr "Resume ID"

11
po/pl_PL.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2008-03-09 12:59+0100\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n"
"Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n" "Last-Translator: Marek Nazarko <mnazarko@gmail.com>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n" "Language-Team: Polish <vdr@linuxtv.org>\n"
@ -1255,6 +1255,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID wznowienia" msgstr "ID wznowienia"

11
po/pt_PT.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2010-03-28 22:49+0100\n" "PO-Revision-Date: 2010-03-28 22:49+0100\n"
"Last-Translator: Cris Silva <hudokkow@gmail.com>\n" "Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
"Language-Team: Portuguese <vdr@linuxtv.org>\n" "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@ -1254,6 +1254,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID de resumo" msgstr "ID de resumo"

15
po/ro_RO.po
View File

@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2015-02-06 23:15+0100\n" "PO-Revision-Date: 2015-02-09 00:23+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n" "Language-Team: Romanian <vdr@linuxtv.org>\n"
"Language: ro\n" "Language: ro\n"
@ -799,7 +799,7 @@ msgid "Error while queueing recording for cutting!"
msgstr "Eroare la punerea în coada pentru tăiere!" msgstr "Eroare la punerea în coada pentru tăiere!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Redenumesc înregistrarea ca pe director?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "Șterg marcajele de editare pentru această înregistrare?" msgstr "Șterg marcajele de editare pentru această înregistrare?"
@ -1255,6 +1255,15 @@ msgstr "Timeout (s) de resetare pentru săritul adaptiv al marcajelor"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Strategie alternativă pentru săritul adaptiv al marcajelor" msgstr "Strategie alternativă pentru săritul adaptiv al marcajelor"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Identificator continuare" msgstr "Identificator continuare"

11
po/ru_RU.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2013-03-10 17:13+0100\n" "PO-Revision-Date: 2013-03-10 17:13+0100\n"
"Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n" "Last-Translator: Oleg Roitburd <oroitburd@gmail.com>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n" "Language-Team: Russian <vdr@linuxtv.org>\n"
@ -1254,6 +1254,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID ÒÞáßàÞØ×ÒÕÔÕÝØï" msgstr "ID ÒÞáßàÞØ×ÒÕÔÕÝØï"

11
po/sk_SK.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2013-03-04 21:24+0100\n" "PO-Revision-Date: 2013-03-04 21:24+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n"
@ -1253,6 +1253,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ident. èíslo obnovenia prehrávania" msgstr "ident. èíslo obnovenia prehrávania"

11
po/sl_SI.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2013-03-04 12:46+0100\n" "PO-Revision-Date: 2013-03-04 12:46+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n" "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@ -1254,6 +1254,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID za predvajanje" msgstr "ID za predvajanje"

11
po/sr_RS.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2013-03-16 15:05+0100\n" "PO-Revision-Date: 2013-03-16 15:05+0100\n"
"Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n" "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n"
"Language-Team: Serbian <vdr@linuxtv.org>\n" "Language-Team: Serbian <vdr@linuxtv.org>\n"
@ -1254,6 +1254,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "ID reprodukcije" msgstr "ID reprodukcije"

11
po/sv_SE.po
View File

@ -11,7 +11,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2013-02-18 17:04+0100\n" "PO-Revision-Date: 2013-02-18 17:04+0100\n"
"Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n" "Last-Translator: Richard Lithvall <r-vdr@boomer.se>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n" "Language-Team: Swedish <vdr@linuxtv.org>\n"
@ -1257,6 +1257,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Återupptagnings-ID" msgstr "Återupptagnings-ID"

11
po/tr_TR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n" "Language-Team: Turkish <vdr@linuxtv.org>\n"
@ -1253,6 +1253,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "Gösteriþ ID'si" msgstr "Gösteriþ ID'si"

21
po/uk_UA.po
View File

@ -1,14 +1,14 @@
# VDR language source file. # VDR language source file.
# Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de> # Copyright (C) 2013 Klaus Schmidinger <vdr@tvdr.de>
# This file is distributed under the same license as the VDR package. # This file is distributed under the same license as the VDR package.
# Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013 # Yarema Aka Knedlyk <yupadmin@gmail.com>, 2007-2010, 2013, 2015
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2015-02-01 23:31+0100\n" "PO-Revision-Date: 2015-02-08 16:03+0100\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <vdr@linuxtv.org>\n" "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
"Language: uk\n" "Language: uk\n"
@ -798,7 +798,7 @@ msgid "Error while queueing recording for cutting!"
msgstr "Помилка перешуковування запису для обрізання!" msgstr "Помилка перешуковування запису для обрізання!"
msgid "Rename recording to folder name?" msgid "Rename recording to folder name?"
msgstr "" msgstr "Назвати запис назвою теки?"
msgid "Delete editing marks for this recording?" msgid "Delete editing marks for this recording?"
msgstr "Вилучити мітки редагування для цього запису?" msgstr "Вилучити мітки редагування для цього запису?"
@ -1246,12 +1246,21 @@ msgid "Setup.Replay$Pause replay at last mark"
msgstr "Призупинити програвання на останній мітці" msgstr "Призупинити програвання на останній мітці"
msgid "Setup.Replay$Initial duration for adaptive skipping (s)" msgid "Setup.Replay$Initial duration for adaptive skipping (s)"
msgstr "" msgstr "Початкова тривалість для адаптивного пропуску (ів)"
msgid "Setup.Replay$Reset timeout for adaptive skipping (s)" msgid "Setup.Replay$Reset timeout for adaptive skipping (s)"
msgstr "" msgstr "Скинути тайм-аут для адаптивного пропуску (ів)"
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "Альтернативна поведінка для адаптивного пропуску (ів)"
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr "" msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"

11
po/zh_CN.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 2.0.0\n" "Project-Id-Version: VDR 2.0.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
"POT-Creation-Date: 2015-02-07 17:08+0100\n" "POT-Creation-Date: 2015-02-10 13:40+0100\n"
"PO-Revision-Date: 2013-03-04 14:52+0800\n" "PO-Revision-Date: 2013-03-04 14:52+0800\n"
"Last-Translator: NFVDR <nfvdr@live.com>\n" "Last-Translator: NFVDR <nfvdr@live.com>\n"
"Language-Team: Chinese (simplified) <nfvdr@live.com>\n" "Language-Team: Chinese (simplified) <nfvdr@live.com>\n"
@ -1255,6 +1255,15 @@ msgstr ""
msgid "Setup.Replay$Alternate behavior for adaptive skipping" msgid "Setup.Replay$Alternate behavior for adaptive skipping"
msgstr "" msgstr ""
msgid "Setup.Replay$Use Prev/Next keys for adaptive skipping"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys (s)"
msgstr ""
msgid "Setup.Replay$Skip distance with Green/Yellow keys in repeat (s)"
msgstr ""
msgid "Setup.Replay$Resume ID" msgid "Setup.Replay$Resume ID"
msgstr "恢复 ID" msgstr "恢复 ID"

7
vdr.1
View File

@ -8,7 +8,7 @@
.\" License as specified in the file COPYING that comes with the .\" License as specified in the file COPYING that comes with the
.\" vdr distribution. .\" vdr distribution.
.\" .\"
.\" $Id: vdr.1 3.4 2015/01/20 15:34:29 kls Exp $ .\" $Id: vdr.1 3.5 2015/02/10 13:59:11 kls Exp $
.\" .\"
.TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder" .TH vdr 1 "31 Mar 2013" "2.0" "Video Disk Recorder"
.SH NAME .SH NAME
@ -49,6 +49,11 @@ Send Dolby Digital audio to stdin of command \fIcmd\fR.
Save cache files in \fIdir\fR Save cache files in \fIdir\fR
(default is to save them in the video directory). (default is to save them in the video directory).
.TP .TP
.BI \-\-chartab= character_table
Set the character table to use for strings in the DVB data stream that don't begin
with a character table indicator, but don't use the standard default character table
(for instance ISO-8859-9).
.TP
.BI \-c\ dir ,\ \-\-config= dir .BI \-c\ dir ,\ \-\-config= dir
Read config files from directory \fIdir\fR Read config files from directory \fIdir\fR
(default is to read them from the video directory). (default is to read them from the video directory).

25
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 3.15 2015/01/17 14:48:09 kls Exp $ * $Id: vdr.c 3.16 2015/02/10 14:13:12 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -216,6 +216,12 @@ int main(int argc, char *argv[])
bool MuteAudio = false; bool MuteAudio = false;
int WatchdogTimeout = DEFAULTWATCHDOG; int WatchdogTimeout = DEFAULTWATCHDOG;
const char *Terminal = NULL; const char *Terminal = NULL;
const char *OverrideCharacterTable = NULL;
#define DEPRECATED_VDR_CHARSET_OVERRIDE
#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE
OverrideCharacterTable = getenv("VDR_CHARSET_OVERRIDE");
const char *DeprecatedVdrCharsetOverride = OverrideCharacterTable;
#endif
bool UseKbd = true; bool UseKbd = true;
const char *LircDevice = NULL; const char *LircDevice = NULL;
@ -244,6 +250,7 @@ int main(int argc, char *argv[])
static struct option long_options[] = { static struct option long_options[] = {
{ "audio", required_argument, NULL, 'a' }, { "audio", required_argument, NULL, 'a' },
{ "cachedir", required_argument, NULL, 'c' | 0x100 }, { "cachedir", required_argument, NULL, 'c' | 0x100 },
{ "chartab", required_argument, NULL, 'c' | 0x200 },
{ "config", required_argument, NULL, 'c' }, { "config", required_argument, NULL, 'c' },
{ "daemon", no_argument, NULL, 'd' }, { "daemon", no_argument, NULL, 'd' },
{ "device", required_argument, NULL, 'D' }, { "device", required_argument, NULL, 'D' },
@ -287,6 +294,9 @@ int main(int argc, char *argv[])
case 'c' | 0x100: case 'c' | 0x100:
CacheDirectory = optarg; CacheDirectory = optarg;
break; break;
case 'c' | 0x200:
OverrideCharacterTable = optarg;
break;
case 'c': ConfigDirectory = optarg; case 'c': ConfigDirectory = optarg;
break; break;
case 'd': DaemonMode = true; case 'd': DaemonMode = true;
@ -517,6 +527,11 @@ int main(int argc, char *argv[])
printf("Usage: vdr [OPTIONS]\n\n" // for easier orientation, this is column 80| printf("Usage: vdr [OPTIONS]\n\n" // for easier orientation, this is column 80|
" -a CMD, --audio=CMD send Dolby Digital audio to stdin of command CMD\n" " -a CMD, --audio=CMD send Dolby Digital audio to stdin of command CMD\n"
" --cachedir=DIR save cache files in DIR (default: %s)\n" " --cachedir=DIR save cache files in DIR (default: %s)\n"
" --chartab=CHARACTER_TABLE\n"
" set the character table to use for strings in the\n"
" DVB data stream that don't begin with a character\n"
" table indicator, but don't use the standard default\n"
" character table (for instance ISO-8859-9)\n"
" -c DIR, --config=DIR read config files from DIR (default: %s)\n" " -c DIR, --config=DIR read config files from DIR (default: %s)\n"
" -d, --daemon run in daemon mode\n" " -d, --daemon run in daemon mode\n"
" -D NUM, --device=NUM use only the given DVB device (NUM = 0, 1, 2...)\n" " -D NUM, --device=NUM use only the given DVB device (NUM = 0, 1, 2...)\n"
@ -674,6 +689,14 @@ int main(int argc, char *argv[])
isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown"); isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
cCharSetConv::SetSystemCharacterTable(CodeSet); cCharSetConv::SetSystemCharacterTable(CodeSet);
} }
#ifdef DEPRECATED_VDR_CHARSET_OVERRIDE
if (DeprecatedVdrCharsetOverride)
isyslog("use of environment variable VDR_CHARSET_OVERRIDE (%s) is deprecated!", DeprecatedVdrCharsetOverride);
#endif
if (OverrideCharacterTable) {
isyslog("override character table is '%s'", OverrideCharacterTable);
SI::SetOverrideCharacterTable(OverrideCharacterTable);
}
// Initialize internationalization: // Initialize internationalization: