summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-08-19 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-08-19 18:00:00 +0200
commite5a2aa41c9762bda4ce7b987aba1bcfa1cee6f70 (patch)
treecb794be1f7796ccbfdd1ce04bca0d75d997ead0b
parent4c65b525dc1e3c62336b223d200a46fb30dc7e52 (diff)
downloadvdr-patch-lnbsharing-e5a2aa41c9762bda4ce7b987aba1bcfa1cee6f70.tar.gz
vdr-patch-lnbsharing-e5a2aa41c9762bda4ce7b987aba1bcfa1cee6f70.tar.bz2
Version 1.5.8vdr-1.5.8
- Added missing install-i18n to the install target in the Makefile (reported by Joachim Wilke). - Fixed a faulty comment in Make.config.template (reported by Marco Schlüßler). - Improved i18n-to-gettext.pl (thanks to Matthias Schwarzott). - Moved the "all" target in plugin Makefiles before the "Implicit rules", so that a plain "make" will compile everything (suggested by Matthias Schwarzott). The "newplugin" script has been changed accordingly. Plugin authors may want to change their Makefiles, too. - Added DESTDIR and PREFIX handling to the Makefile (thanks to Matthias Schwarzott). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Added internationalization to the "skincurses" plugin (thanks to Rolf Ahrenberg). - Checking the string for NULL in I18nTranslate(). - Updated the French OSD texts (thanks to Bruno Roussel). - Some optimizations in cDvbDevice::SetChannelDevice() (thanks to Tobias Bratfisch). - Optimized cMenuEditChrItem::Set() (thanks to Tobias Bratfisch). - Optimized cNitFilter::Process() (thanks to Tobias Bratfisch). - Reduced the number of time(NULL) calls in vdr.c's main loop to a single call (thanks to Tobias Bratfisch). - Changed cBitmap::DrawText() to always draw the background unless ColorBg is clrTransparent (thanks to Christoph Haubrich). - The "Setup/OSD/Language" menu now only shows those languages that actually have a locale (suggested by Anssi Hannula). - Now using setenv() instead of setlocale() to set the language for gettext() (suggested by Anssi Hannula; thanks also to Ludwig Nussel for a hint on using _nl_msg_cat_cntr). - When scanning the locale directory, VDR now explicitly looks for a file named vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the name of the plugin. The "newplugin" script has been changed accordingly, and plugin authors should change their Makefiles, too.
-rw-r--r--CONTRIBUTORS26
-rw-r--r--HISTORY34
-rw-r--r--Make.config.template5
-rw-r--r--Makefile40
-rw-r--r--PLUGINS/src/hello/HISTORY5
-rw-r--r--PLUGINS/src/hello/Makefile10
-rw-r--r--PLUGINS/src/hello/hello.c4
-rw-r--r--PLUGINS/src/osddemo/HISTORY5
-rw-r--r--PLUGINS/src/osddemo/Makefile8
-rw-r--r--PLUGINS/src/osddemo/osddemo.c4
-rw-r--r--PLUGINS/src/servicedemo/HISTORY5
-rw-r--r--PLUGINS/src/servicedemo/Makefile8
-rw-r--r--PLUGINS/src/servicedemo/svccli.c4
-rw-r--r--PLUGINS/src/servicedemo/svcsvr.c4
-rw-r--r--PLUGINS/src/skincurses/HISTORY6
-rw-r--r--PLUGINS/src/skincurses/Makefile34
-rw-r--r--PLUGINS/src/skincurses/po/de_DE.po32
-rw-r--r--PLUGINS/src/skincurses/po/fi_FI.po32
-rw-r--r--PLUGINS/src/skincurses/skincurses.c10
-rw-r--r--PLUGINS/src/sky/HISTORY5
-rw-r--r--PLUGINS/src/sky/Makefile8
-rw-r--r--PLUGINS/src/sky/sky.c4
-rw-r--r--PLUGINS/src/status/HISTORY5
-rw-r--r--PLUGINS/src/status/Makefile8
-rw-r--r--PLUGINS/src/status/status.c4
-rw-r--r--PLUGINS/src/svdrpdemo/HISTORY5
-rw-r--r--PLUGINS/src/svdrpdemo/Makefile8
-rw-r--r--PLUGINS/src/svdrpdemo/svdrpdemo.c4
-rw-r--r--config.h10
-rw-r--r--dvbdevice.c19
-rwxr-xr-xi18n-to-gettext.pl23
-rw-r--r--i18n.c40
-rw-r--r--i18n.h11
-rw-r--r--menu.c4
-rw-r--r--menuitems.c9
-rwxr-xr-xnewplugin10
-rw-r--r--nit.c99
-rw-r--r--osd.c16
-rw-r--r--po/ca_ES.po40
-rw-r--r--po/cs_CZ.po40
-rw-r--r--po/da_DK.po40
-rw-r--r--po/de_DE.po40
-rw-r--r--po/el_GR.po40
-rw-r--r--po/es_ES.po40
-rw-r--r--po/et_EE.po40
-rw-r--r--po/fi_FI.po74
-rw-r--r--po/fr_FR.po178
-rw-r--r--po/hr_HR.po40
-rw-r--r--po/hu_HU.po40
-rw-r--r--po/it_IT.po40
-rw-r--r--po/nl_NL.po40
-rw-r--r--po/nn_NO.po40
-rw-r--r--po/pl_PL.po40
-rw-r--r--po/pt_PT.po40
-rw-r--r--po/ro_RO.po40
-rw-r--r--po/ru_RU.po40
-rw-r--r--po/sl_SI.po40
-rw-r--r--po/sv_SE.po40
-rw-r--r--po/tr_TR.po40
-rw-r--r--vdr.c26
60 files changed, 930 insertions, 676 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ea354f2..68abd99 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -887,6 +887,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
for making the Makefile patch friendlier
for a patch that was used for implementing setting the user id
for pointing out that the canonical spelling of codesets is with '-'
+ for a hint on using _nl_msg_cat_cntr
Thomas Koch <tom@harhar.net>
for his support in keeping the Premiere World channels up to date in 'channels.conf'
@@ -934,12 +935,14 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
for reporting a problem with multiple entries of the same subdirectory in the
"Recordings" menu
-Andreas Mair <Andreas.Mair@linogate.com>
+Andreas Mair <andreas@vdr-developer.org>
for reporting a short display of the main menu if a plugin displays its own OSD and
is started through a user defined key macro
for reporting a problem with extremely long summary fields in timers
for reporting a bug in handling the tfRecording flag when reading timers
for enabling fonts to be created with a width that overwrites the default width
+ for suggesting to make cBitmap::SetXpm() checks whether the given Xpm pointer is
+ not NULL
Olivier Jacques <jacquesolivier@hotmail.com>)
for translating OSD texts to the French language
@@ -1017,6 +1020,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for suggesting to change the parameter "OSD font" to "Default font" in "Setup/OSD"
for improving cControl::Launch() to keep 'control' from pointing to uninitialized
memory
+ for adding internationalization to the "skincurses" plugin
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1408,6 +1412,7 @@ Marco Schlüßler <marco@lordzodiac.de>
for fixing a buffer overflow in initializing the system character table
for reporting a missing 'P' in vdr.c's SHUTDOWNCANCELROMPT macro
for fixing a problem with characters >0x7F in the modified version of skipspace()
+ for reporting a faulty comment in Make.config.template
Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP
@@ -1544,6 +1549,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
for fixing removing the '-' when entering a channel number where there is no other
one that fits the input
for reporting a problem with cStatus::MsgOsdTextItem() being called without a text
+ for reporting a missing install-i18n in the install target in the Makefile
Sascha Klek <sklek@gmx.de>
for reporting a problem with the '0' key in the "Day" item of the "Timers" menu
@@ -1976,6 +1982,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
for suggestions that led to implementing cOsd::SetOsdPosition() etc.
for fixing a typo in the function name of cOsd::SetOsdPosition() and adding a range
check to it
+ for changing cBitmap::DrawText() to always draw the background unless ColorBg
+ is clrTransparent
Pekka Mauno <pekka.mauno@iki.fi>
for fixing cSchedule::GetFollowingEvent() in case there is currently no present
@@ -2051,6 +2059,9 @@ Anssi Hannula <anssi.hannula@gmail.com>
for fixing handling frequencies in NitFilter::Process()
for making non-primary devices in Transfer mode be also used for recording
for code and hints on how to use 'fontconfig' to determine which fonts to use
+ for suggesting to make the "Setup/OSD/Language" menu only show those languages
+ that actually have a locale
+ for suggesting to use setenv() instead of setlocale() to set the language for gettext()
Antti Hartikainen <ami+vdr@ah.fi>
for updating 'S13E' in 'sources.conf'
@@ -2083,6 +2094,10 @@ Tomas Berglund <tomber@telia.com>
Matthias Schwarzott <zzam@gentoo.org>
for suggesting to add LC_ALL to the checks for UTF-8 at startup
for fixing getting the code setting from the locale
+ for improving i18n-to-gettext.pl
+ for suggesting to move the "all" target in plugin Makefiles before the
+ "Implicit rules", so that a plain "make" will compile everything
+ for adding DESTDIR and PREFIX handling to the Makefile
Martin Ostermann <martin@familie-ostermann.de>
for fixing processing the PDCDescriptor in 'libsi' on big endian systems
@@ -2129,7 +2144,10 @@ Patrice Staudt <staudt@engsystem.net>
Tobias Bratfisch <tobias@reel-multimedia.com>
for improving numdigits(), isnumber() and strreplace()
for suggesting to make skipspace() an inline function
+ for making some optimizations in cDvbDevice::SetChannelDevice()
+ for optimizing cMenuEditChrItem::Set()
+ for optimizing cNitFilter::Process()
+ for reducing the number of time(NULL) calls in vdr.c's main loop to a single call
-Andreas Mair <andreas@vdr-developer.org>
- for suggesting to make cBitmap::SetXpm() checks whether the given Xpm pointer is
- not NULL
+Bruno Roussel <bruno.roussel@free.fr>
+ for translating OSD texts to the French language
diff --git a/HISTORY b/HISTORY
index c2d9aa7..0677dbc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5345,3 +5345,37 @@ Video Disk Recorder Revision History
Mair).
- Added a debug error message to cReceiver::~cReceiver() in case it is still
attached to a device (thanks to Reinhard Nissl).
+
+2007-08-19: Version 1.5.8
+
+- Added missing install-i18n to the install target in the Makefile (reported
+ by Joachim Wilke).
+- Fixed a faulty comment in Make.config.template (reported by Marco Schlüßler).
+- Improved i18n-to-gettext.pl (thanks to Matthias Schwarzott).
+- Moved the "all" target in plugin Makefiles before the "Implicit rules",
+ so that a plain "make" will compile everything (suggested by Matthias
+ Schwarzott). The "newplugin" script has been changed accordingly.
+ Plugin authors may want to change their Makefiles, too.
+- Added DESTDIR and PREFIX handling to the Makefile (thanks to Matthias
+ Schwarzott).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added internationalization to the "skincurses" plugin (thanks to Rolf
+ Ahrenberg).
+- Checking the string for NULL in I18nTranslate().
+- Updated the French OSD texts (thanks to Bruno Roussel).
+- Some optimizations in cDvbDevice::SetChannelDevice() (thanks to Tobias Bratfisch).
+- Optimized cMenuEditChrItem::Set() (thanks to Tobias Bratfisch).
+- Optimized cNitFilter::Process() (thanks to Tobias Bratfisch).
+- Reduced the number of time(NULL) calls in vdr.c's main loop to a single call
+ (thanks to Tobias Bratfisch).
+- Changed cBitmap::DrawText() to always draw the background unless ColorBg
+ is clrTransparent (thanks to Christoph Haubrich).
+- The "Setup/OSD/Language" menu now only shows those languages that actually
+ have a locale (suggested by Anssi Hannula).
+- Now using setenv() instead of setlocale() to set the language for gettext()
+ (suggested by Anssi Hannula; thanks also to Ludwig Nussel for a hint on using
+ _nl_msg_cat_cntr).
+- When scanning the locale directory, VDR now explicitly looks for a file named
+ vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the
+ name of the plugin. The "newplugin" script has been changed accordingly, and
+ plugin authors should change their Makefiles, too.
diff --git a/Make.config.template b/Make.config.template
index 5412eaf..86564a2 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Make.config.template 1.12 2007/08/12 12:04:17 kls Exp $
+# $Id: Make.config.template 1.13 2007/08/12 20:43:46 kls Exp $
### The C compiler and options:
@@ -26,7 +26,8 @@ endif
#DVBDIR = /usr/src/v4l-dvb/linux
MANDIR = /usr/local/man
BINDIR = /usr/local/bin
-LOCDIR = /usr/share/vdr/locale # set to ./locale to run VDR from within its source directory
+# set to ./locale to run VDR from within its source directory:
+LOCDIR = /usr/share/vdr/locale
PLUGINDIR= ./PLUGINS
PLUGINLIBDIR= $(PLUGINDIR)/lib
diff --git a/Makefile b/Makefile
index a5f9201..a46aaef 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 1.102 2007/08/11 12:26:12 kls Exp $
+# $Id: Makefile 1.104 2007/08/15 13:47:16 kls Exp $
.DELETE_ON_ERROR:
@@ -15,9 +15,11 @@ CXX ?= g++
CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
LSIDIR = ./libsi
-MANDIR = /usr/local/man
-BINDIR = /usr/local/bin
-LOCDIR = /usr/share/vdr/locale
+DESTDIR ?=
+PREFIX ?= /usr/local
+MANDIR = $(PREFIX)/share/man
+BINDIR = $(PREFIX)/bin
+LOCDIR = $(PREFIX)/share/vdr/locale
LIBS = -ljpeg -lpthread -ldl -lcap -lfreetype -lfontconfig
INCLUDES = -I/usr/include/freetype2
@@ -25,6 +27,7 @@ PLUGINDIR= ./PLUGINS
PLUGINLIBDIR= $(PLUGINDIR)/lib
VIDEODIR = /video
+CONFDIR ?= $(VIDEODIR)
DOXYGEN = /usr/bin/doxygen
DOXYFILE = Doxyfile
@@ -123,8 +126,8 @@ i18n: $(I18Nmo)
done
install-i18n:
- @mkdir -p $(LOCDIR)
- @(cd $(LOCALEDIR); cp -r --parents * $(LOCDIR))
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+ @(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
# The 'include' directory (for plugins):
@@ -157,35 +160,36 @@ clean-plugins:
# Install the files:
-install: install-bin install-conf install-doc install-plugins
+install: install-bin install-conf install-doc install-plugins install-i18n
# VDR binary:
install-bin: vdr
- @mkdir -p $(BINDIR)
- @cp --remove-destination vdr runvdr $(BINDIR)
+ @mkdir -p $(DESTDIR)$(BINDIR)
+ @cp --remove-destination vdr runvdr svdrpsend.pl $(DESTDIR)$(BINDIR)
# Configuration files:
install-conf:
- @if [ ! -d $(VIDEODIR) ]; then\
- mkdir -p $(VIDEODIR);\
- cp *.conf $(VIDEODIR);\
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+ @if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\
+ mkdir -p $(DESTDIR)$(CONFDIR);\
+ cp *.conf $(DESTDIR)$(CONFDIR);\
fi
# Documentation:
install-doc:
- @mkdir -p $(MANDIR)/man1
- @mkdir -p $(MANDIR)/man5
- @gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
- @gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
+ @mkdir -p $(DESTDIR)$(MANDIR)/man1
+ @mkdir -p $(DESTDIR)$(MANDIR)/man5
+ @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+ @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
# Plugins:
install-plugins: plugins
- @mkdir -p $(PLUGINLIBDIR)
- @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
+ @mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
+ @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
# Source documentation:
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 2d770b8..d4c9d37 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -53,3 +53,8 @@ VDR Plugin 'hello' Revision History
2007-08-11: Version 0.2.0
- Switched to 'gettext' internationalization.
+
+2007-08-15: Version 0.2.1
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+ so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index e78b6e1..80b6c8c 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.16 2007/08/11 10:18:16 kls Exp $
+# $Id: Makefile 1.18 2007/08/19 14:18:59 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
### Implicit rules:
%.o: %.c
@@ -85,13 +89,11 @@ i18n: $(I18Nmo)
@mkdir -p $(LOCALEDIR)
for i in $(I18Ndirs); do\
mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
- cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+ cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
done
### Targets:
-all: libvdr-$(PLUGIN).so i18n
-
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 9640338..273217e 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: hello.c 1.13 2007/08/11 09:31:17 kls Exp $
+ * $Id: hello.c 1.14 2007/08/15 13:17:16 kls Exp $
*/
#include <getopt.h>
@@ -12,7 +12,7 @@
#include <vdr/interface.h>
#include <vdr/plugin.h>
-static const char *VERSION = "0.2.0";
+static const char *VERSION = "0.2.1";
static const char *DESCRIPTION = trNOOP("A friendly greeting");
static const char *MAINMENUENTRY = trNOOP("Hello");
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index fd10cc3..b0f300a 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -12,3 +12,8 @@ VDR Plugin 'osddemo' Revision History
2004-04-30: Version 0.1.1
- New OSD handling.
+
+2007-08-15: Version 0.1.2
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+ so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 7163888..568faa6 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.10 2007/08/15 13:05:24 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
-all: libvdr-$(PLUGIN).so
-
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 08b2d96..a4c0b8f 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,12 +3,12 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: osddemo.c 1.3 2004/05/16 09:28:51 kls Exp $
+ * $Id: osddemo.c 1.4 2007/08/15 13:17:55 kls Exp $
*/
#include <vdr/plugin.h>
-static const char *VERSION = "0.1.1";
+static const char *VERSION = "0.1.2";
static const char *DESCRIPTION = "Demo of arbitrary OSD setup";
static const char *MAINMENUENTRY = "Osd Demo";
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 16a0c43..76d95a5 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -4,3 +4,8 @@ VDR Plugin 'servicedemo' Revision History
2005-08-21: Version 0.1.1
- Initial revision.
+
+2007-08-15: Version 0.1.2
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+ so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index a18f995..9625953 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.8 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.9 2007/08/15 13:05:42 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN1).o $(PLUGIN2).o
+### The main target:
+
+all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
+
### Implicit rules:
%.o: %.c
@@ -65,8 +69,6 @@ $(DEPFILE): Makefile
### Targets:
-all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so
-
libvdr-$(PLUGIN1).so: $(PLUGIN1).o
$(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index 9a4ed44..6e812b4 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: svccli.c 1.1 2005/08/21 10:44:29 kls Exp $
+ * $Id: svccli.c 1.2 2007/08/15 13:18:08 kls Exp $
*/
#include <stdlib.h>
#include <vdr/interface.h>
#include <vdr/plugin.h>
-static const char *VERSION = "0.1.1";
+static const char *VERSION = "0.1.2";
static const char *DESCRIPTION = "Service demo client";
static const char *MAINMENUENTRY = "Service demo";
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 7aff2b9..9ccb73c 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: svcsvr.c 1.1 2005/08/21 10:44:24 kls Exp $
+ * $Id: svcsvr.c 1.2 2007/08/15 13:18:59 kls Exp $
*/
#include <stdlib.h>
#include <vdr/interface.h>
#include <vdr/plugin.h>
-static const char *VERSION = "0.1.1";
+static const char *VERSION = "0.1.2";
static const char *DESCRIPTION = "Service demo server";
class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 60f4839..02065a4 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -51,3 +51,9 @@ VDR Plugin 'skincurses' Revision History
2007-07-20: Version 0.1.2
- Fixed clearing color buttons.
+
+2007-08-15: Version 0.1.3
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+ so that a plain "make" will compile everything.
+- Added internationalization.
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index a52f409..5199dd8 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.8 2007/06/10 16:19:08 kls Exp $
+# $Id: Makefile 1.11 2007/08/19 14:19:07 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
### Implicit rules:
%.o: %.c
@@ -61,9 +65,32 @@ $(DEPFILE): Makefile
-include $(DEPFILE)
-### Targets:
+### Internationalization (I18N):
+
+PODIR = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo = $(wildcard $(PODIR)/*.po)
+I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Npot = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+ msgfmt -c -o $@ $<
-all: libvdr-$(PLUGIN).so
+$(I18Npot): $(wildcard *.c)
+ xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+
+$(I18Npo): $(I18Npot)
+ msgmerge -U --no-wrap -F --backup=none -q $@ $<
+
+i18n: $(I18Nmo)
+ @mkdir -p $(LOCALEDIR)
+ for i in $(I18Ndirs); do\
+ mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
+ cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
+ done
+
+### Targets:
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
@@ -78,4 +105,5 @@ dist: clean
@echo Distribution package created as $(PACKAGE).tgz
clean:
+ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po
new file mode 100644
index 0000000..e80cdc6
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/de_DE.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Klaus Schmidinger <kls@cadsoft.de>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-15 16:04+0200\n"
+"PO-Revision-Date: 2007-08-15 16:07+0200\n"
+"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: skincurses.c:15
+msgid "A text only skin"
+msgstr "Eine reine Text-Oberfläche"
+
+#: skincurses.c:566
+msgid "Key$Mute"
+msgstr "Stumm"
+
+#: skincurses.c:569
+msgid "Volume "
+msgstr "Lautstärke"
+
+#: skincurses.c:699
+msgid "Text mode"
+msgstr "Text-Modus"
diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po
new file mode 100644
index 0000000..d4a4742
--- /dev/null
+++ b/PLUGINS/src/skincurses/po/fi_FI.po
@@ -0,0 +1,32 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
+# This file is distributed under the same license as the VDR package.
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: VDR 1.5.7\n"
+"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
+"POT-Creation-Date: 2007-08-14 20:54+0300\n"
+"PO-Revision-Date: 2007-08-14 20:48+0300\n"
+"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: skincurses.c:15
+msgid "A text only skin"
+msgstr "Tekstipohjainen ulkoasu"
+
+#: skincurses.c:566
+msgid "Key$Mute"
+msgstr "Mykistys"
+
+#: skincurses.c:569
+msgid "Volume "
+msgstr "Äänenvoimakkuus "
+
+#: skincurses.c:699
+msgid "Text mode"
+msgstr "Teksti"
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index 9324210..0553de9 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: skincurses.c 1.15 2007/07/20 14:45:07 kls Exp $
+ * $Id: skincurses.c 1.17 2007/08/15 14:01:54 kls Exp $
*/
#include <ncurses.h>
@@ -11,8 +11,8 @@
#include <vdr/plugin.h>
#include <vdr/skins.h>
-static const char *VERSION = "0.1.2";
-static const char *DESCRIPTION = "A text only skin";
+static const char *VERSION = "0.1.3";
+static const char *DESCRIPTION = trNOOP("A text only skin");
static const char *MAINMENUENTRY = NULL;
// --- cCursesFont -----------------------------------------------------------
@@ -738,13 +738,13 @@ public:
cPluginSkinCurses(void);
virtual ~cPluginSkinCurses();
virtual const char *Version(void) { return VERSION; }
- virtual const char *Description(void) { return DESCRIPTION; }
+ virtual const char *Description(void) { return tr(DESCRIPTION); }
virtual const char *CommandLineHelp(void);
virtual bool ProcessArgs(int argc, char *argv[]);
virtual bool Initialize(void);
virtual bool Start(void);
virtual void Housekeeping(void);
- virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+ virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
virtual cOsdObject *MainMenuAction(void);
virtual cMenuSetupPage *SetupMenu(void);
virtual bool SetupParse(const char *Name, const char *Value);
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 3233bf6..b089c4a 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -54,3 +54,8 @@ VDR Plugin 'sky' Revision History
use the new option -U of getskyepg.pl to have the information added to the URL
as a query string.
- The getskyepg.pl script now replaces "&amp;" with "&".
+
+2007-08-15:Version 0.3.6
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+ so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 63a647c..52a520b 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.10 2007/08/15 13:06:08 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
-all: libvdr-$(PLUGIN).so
-
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 4033bf7..f2aa0cf 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: sky.c 1.13 2006/03/26 09:21:10 kls Exp $
+ * $Id: sky.c 1.14 2007/08/15 13:19:24 kls Exp $
*/
#include <sys/socket.h>
@@ -15,7 +15,7 @@
#include <vdr/plugin.h>
#include <vdr/sources.h>
-static const char *VERSION = "0.3.5";
+static const char *VERSION = "0.3.6";
static const char *DESCRIPTION = "Sky Digibox interface";
// --- cDigiboxDevice --------------------------------------------------------
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 998e23d..97bc7e2 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -35,3 +35,8 @@ VDR Plugin 'status' Revision History
2005-12-31: Version 0.2.0
- API change in cStatus.
+
+2007-08-15: Version 0.2.1
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+ so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 1985ab0..2c66d20 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.13 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.14 2007/08/15 13:06:17 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
-all: libvdr-$(PLUGIN).so
-
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index 7163927..fa5f0d4 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: status.c 1.8 2005/12/31 15:19:45 kls Exp $
+ * $Id: status.c 1.9 2007/08/15 13:19:44 kls Exp $
*/
#include <vdr/plugin.h>
#include <vdr/status.h>
-static const char *VERSION = "0.2.0";
+static const char *VERSION = "0.2.1";
static const char *DESCRIPTION = "Status monitor test";
static const char *MAINMENUENTRY = NULL;
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index efdc826..6433468 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -8,3 +8,8 @@ VDR Plugin 'svdrpdemo' Revision History
2005-08-28: Version 0.0.2
- Removed unused MAINMENUENTRY.
+
+2007-08-15: Version 0.0.3
+
+- Moved the "all" target in the Makefile before the "Implicit rules",
+ so that a plain "make" will compile everything.
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 8c0f42e..a694446 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $
+# $Id: Makefile 1.8 2007/08/15 13:06:28 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o
+### The main target:
+
+all: libvdr-$(PLUGIN).so
+
### Implicit rules:
%.o: %.c
@@ -63,8 +67,6 @@ $(DEPFILE): Makefile
### Targets:
-all: libvdr-$(PLUGIN).so
-
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index 66dc25b..008d25b 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: svdrpdemo.c 1.2 2005/08/28 21:11:14 kls Exp $
+ * $Id: svdrpdemo.c 1.3 2007/08/15 13:19:57 kls Exp $
*/
#include <vdr/plugin.h>
-static const char *VERSION = "0.0.2";
+static const char *VERSION = "0.0.3";
static const char *DESCRIPTION = "How to add SVDRP support to a plugin";
class cPluginSvdrpdemo : public cPlugin {
diff --git a/config.h b/config.h
index 5ff5849..5268853 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.296 2007/08/10 13:01:52 kls Exp $
+ * $Id: config.h 1.297 2007/08/12 20:38:10 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,13 +22,13 @@
// VDR's own version number:
-#define VDRVERSION "1.5.7"
-#define VDRVERSNUM 10507 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.5.8"
+#define VDRVERSNUM 10508 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
-#define APIVERSION "1.5.7"
-#define APIVERSNUM 10507 // Version * 10000 + Major * 100 + Minor
+#define APIVERSION "1.5.8"
+#define APIVERSNUM 10508 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
diff --git a/dvbdevice.c b/dvbdevice.c
index 8757710..7d1a5c8 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 1.164 2007/02/25 11:46:52 kls Exp $
+ * $Id: dvbdevice.c 1.165 2007/08/17 13:37:56 kls Exp $
*/
#include "dvbdevice.h"
@@ -793,18 +793,25 @@ bool cDvbDevice::IsTunedToTransponder(const cChannel *Channel)
bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
{
+ int apid = Channel->Apid(0);
+ int vpid = Channel->Vpid();
+ int dpid = Channel->Dpid(0);
+
bool DoTune = !dvbTuner->IsTunedTo(Channel);
+ bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid;
+ bool pidHandlesAudio = pidHandles[ptAudio].pid == apid;
+
bool TurnOffLivePIDs = HasDecoder()
&& (DoTune
|| !IsPrimaryDevice()
|| LiveView // for a new live view the old PIDs need to be turned off
- || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+ || pidHandlesVideo // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
);
bool StartTransferMode = IsPrimaryDevice() && !DoTune
- && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || (pidHandles[ptAudio].pid != Channel->Apid(0) && (Channel->Dpid(0) ? pidHandles[ptAudio].pid != Channel->Dpid(0) : true)))// the PID is already set as DMX_PES_OTHER
- || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
+ && (LiveView && HasPid(vpid ? vpid : apid) && (!pidHandlesVideo || (!pidHandlesAudio && (dpid ? pidHandles[ptAudio].pid != dpid : true)))// the PID is already set as DMX_PES_OTHER
+ || !LiveView && (pidHandlesVideo || pidHandlesAudio) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
);
if (CamSlot() && !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlot()->SlotNumber()))
StartTransferMode |= LiveView && IsPrimaryDevice() && Channel->Ca() >= CA_ENCRYPTED_MIN;
@@ -836,7 +843,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
if (TurnOnLivePIDs) {
SetAudioBypass(false);
- if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid(0), ptAudio))) {
+ if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(vpid, ptVideo) && AddPid(apid, ptAudio))) {
esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
return false;
}
@@ -848,7 +855,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, true));
}
else if (StartTransferMode)
- cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()));
+ cControl::Launch(new cTransferControl(this, Channel->GetChannelID(), vpid, Channel->Apids(), Channel->Dpids(), Channel->Spids()));
return true;
}
diff --git a/i18n-to-gettext.pl b/i18n-to-gettext.pl
index 79b2aab..130122d 100755
--- a/i18n-to-gettext.pl
+++ b/i18n-to-gettext.pl
@@ -10,7 +10,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: i18n-to-gettext.pl 1.2 2007/08/12 10:02:01 kls Exp $
+# $Id: i18n-to-gettext.pl 1.3 2007/08/15 12:52:00 kls Exp $
# How to convert an actual plugin:
#
@@ -75,7 +75,7 @@ die "can't find plugin name!" unless ($PLUGIN);
# Locate the file containing the texts:
$I18NFILE = "";
-for ("i18n.c", `ls *.c`) { # try i18n.c explicitly first
+for ("i18n.c", "i18n.h", `ls *.c`) { # try i18n.[ch] explicitly first
chomp($f = $_);
if (-f $f && `grep tI18nPhrase $f`) {
$I18NFILE = $f;
@@ -204,13 +204,28 @@ $POTFILE = "$PODIR/$PLUGIN.pot";
# Collect all translated texts:
open(F, $I18NFILE) || die "$I18NFILE: $!\n";
+$InComment = 0;
while (<F>) {
chomp;
s/\t/ /g; # get rid of tabs
s/ *$//; # get rid of trailing blanks
s/^ *\/\/.*//; # remove comment lines
- s/, *\/\/.*/,/; # strip trailing comments
+ s/ *\/\/.*//; # strip trailing comments
+ s/\/\*.*\*\///g; # strip c comments
+ if (/\/\*/) {
+ $InComment = 1;
+ s/\/\*.*$//; # remove start of comment
+ }
+ elsif (/\*\//) {
+ $InComment = 0;
+ s/^.*\*\///; # remove end of comment
+ }
+ elsif ($InComment) {
+ next;
+ }
next if (/^ *$/); # skip empty lines
+ next if (/#if/);
+ next if (/#endif/);
next unless ($found or $found = /const *tI18nPhrase .*{/); # sync on phrases
next if (/const *tI18nPhrase .*{/); # skip sync line
last if (/{ *NULL *}/); # stop after last phrase
@@ -324,7 +339,7 @@ while (<OLD>) {
$_ .= " i18n";
}
elsif (/^clean:/) {
- $_ .= "\n\t\@-rm -f \$(PODIR)/*.mo \$(PODIR)/*.pot";
+ $_ .= "\n\t\@-rm -f \$(PODIR)/*.mo \$(PODIR)/*.pot";
}
print NEW "$_\n";
}
diff --git a/i18n.c b/i18n.c
index 1673e53..15853a0 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c 1.308 2007/08/12 12:15:29 kls Exp $
+ * $Id: i18n.c 1.312 2007/08/19 14:10:46 kls Exp $
*
*
*/
@@ -23,6 +23,7 @@
#include <ctype.h>
#include <libintl.h>
#include <locale.h>
+#include <unistd.h>
#include "tools.h"
// TRANSLATORS: The name of the language, as written natively
@@ -67,6 +68,7 @@ static cStringList LanguageLocales;
static cStringList LanguageNames;
static cStringList LanguageCodes;
+static int NumLocales = 1;
static int CurrentLanguage = 0;
static bool ContainsCode(const char *Codes, const char *Code)
@@ -90,6 +92,13 @@ static const char *SkipContext(const char *s)
return p ? p + 1 : s;
}
+static void SetEnvLanguage(const char *Locale)
+{
+ setenv("LANGUAGE", Locale, 1);
+ extern int _nl_msg_cat_cntr;
+ ++_nl_msg_cat_cntr;
+}
+
void I18nInitialize(void)
{
LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
@@ -99,11 +108,13 @@ void I18nInitialize(void)
bindtextdomain("vdr", I18nLocaleDir);
cFileNameList Locales(I18nLocaleDir, true);
if (Locales.Size() > 0) {
- dsyslog("found %d locales in %s", Locales.Size(), I18nLocaleDir);
char *OldLocale = strdup(setlocale(LC_MESSAGES, NULL));
for (int i = 0; i < Locales.Size(); i++) {
- if (i < I18N_MAX_LANGUAGES - 1) {
- if (setlocale(LC_MESSAGES, Locales[i])) {
+ cString FileName = cString::sprintf("%s/%s/LC_MESSAGES/vdr.mo", I18nLocaleDir, Locales[i]);
+ if (access(FileName, F_OK) == 0) { // found a locale with VDR texts
+ if (i < I18N_MAX_LANGUAGES - 1) {
+ SetEnvLanguage(Locales[i]);
+ NumLocales++;
if (strstr(OldLocale, Locales[i]) == OldLocale)
CurrentLanguage = LanguageLocales.Size();
LanguageLocales.Append(strdup(Locales[i]));
@@ -117,12 +128,15 @@ void I18nInitialize(void)
}
LanguageCodes.Append(strdup(Code));
}
+ else {
+ esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!");
+ break;
+ }
}
- else
- esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!");
}
- setlocale(LC_MESSAGES, OldLocale);
+ SetEnvLanguage(LanguageLocales[CurrentLanguage]);
free(OldLocale);
+ dsyslog("found %d locales in %s", NumLocales - 1, I18nLocaleDir);
}
// Prepare any known language codes for which there was no locale:
for (const char **lc = LanguageCodeList; *lc; lc++) {
@@ -144,7 +158,8 @@ void I18nInitialize(void)
void I18nRegister(const char *Plugin)
{
- bindtextdomain(Plugin, I18nLocaleDir);
+ cString Domain = cString::sprintf("vdr-%s", Plugin);
+ bindtextdomain(Domain, I18nLocaleDir);
}
void I18nSetLocale(const char *Locale)
@@ -153,7 +168,7 @@ void I18nSetLocale(const char *Locale)
int i = LanguageLocales.Find(Locale);
if (i >= 0) {
CurrentLanguage = i;
- setlocale(LC_MESSAGES, Locale);
+ SetEnvLanguage(Locale);
}
else
dsyslog("unknown locale: '%s'", Locale);
@@ -173,6 +188,11 @@ void I18nSetLanguage(int Language)
}
}
+int I18nNumLanguagesWithLocale(void)
+{
+ return NumLocales;
+}
+
const cStringList *I18nLanguages(void)
{
return &LanguageNames;
@@ -180,6 +200,8 @@ const cStringList *I18nLanguages(void)
const char *I18nTranslate(const char *s, const char *Plugin)
{
+ if (!s)
+ return s;
if (CurrentLanguage) {
const char *t = s;
if (Plugin)
diff --git a/i18n.h b/i18n.h
index 46c6a5e..2d1c79b 100644
--- a/i18n.h
+++ b/i18n.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.h 1.21 2007/08/10 13:53:57 kls Exp $
+ * $Id: i18n.h 1.23 2007/08/19 14:07:17 kls Exp $
*/
#ifndef __I18N_H
@@ -36,9 +36,16 @@ int I18nCurrentLanguage(void);
void I18nSetLanguage(int Language);
///< Sets the current language index to Language. If Language is outside
///< the range of available languages, nothing happens.
+int I18nNumLanguagesWithLocale(void);
+ ///< Returns the number of entries in the list returned by I18nLanguages()
+ ///< that actually have a locale.
const cStringList *I18nLanguages(void);
///< Returns the list of available languages. Values returned by
///< I18nCurrentLanguage() are indexes into this list.
+ ///< Only the first I18nNumLanguagesWithLocale() entries in this list
+ ///< have an actual locale installed. The rest are just dummy entries
+ ///< to allow having three letter language codes for other languages
+ ///< that have no actual locale on this system.
const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1);
///< Translates the given string (with optional Plugin context) into
///< the current language. If no translation is available, the original
@@ -72,7 +79,7 @@ bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode,
///< the second one (like "deu" out of ""eng+deu").
#ifdef PLUGIN_NAME_I18N
-#define tr(s) I18nTranslate(s, PLUGIN_NAME_I18N)
+#define tr(s) I18nTranslate(s, "vdr-" PLUGIN_NAME_I18N)
#else
#define tr(s) I18nTranslate(s)
#endif
diff --git a/menu.c b/menu.c
index 69621ef..4d94b61 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.459 2007/08/12 10:44:35 kls Exp $
+ * $Id: menu.c 1.460 2007/08/18 09:03:05 kls Exp $
*/
#include "menu.h"
@@ -2205,7 +2205,7 @@ void cMenuSetupOSD::Set(void)
useSmallFontTexts[2] = tr("always");
Clear();
SetSection(tr("OSD"));
- Add(new cMenuEditStraItem(tr("Setup.OSD$Language"), &osdLanguageIndex, I18nLanguages()->Size(), &I18nLanguages()->At(0)));
+ Add(new cMenuEditStraItem(tr("Setup.OSD$Language"), &osdLanguageIndex, I18nNumLanguagesWithLocale(), &I18nLanguages()->At(0)));
Add(new cMenuEditStraItem(tr("Setup.OSD$Skin"), &skinIndex, numSkins, skinDescriptions));
if (themes.NumThemes())
Add(new cMenuEditStraItem(tr("Setup.OSD$Theme"), &themeIndex, themes.NumThemes(), themes.Descriptions()));
diff --git a/menuitems.c b/menuitems.c
index 44661ec..a900e4a 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menuitems.c 1.50 2007/08/04 09:12:18 kls Exp $
+ * $Id: menuitems.c 1.51 2007/08/17 13:48:07 kls Exp $
*/
#include "menuitems.h"
@@ -222,7 +222,8 @@ cMenuEditChrItem::~cMenuEditChrItem()
void cMenuEditChrItem::Set(void)
{
char buf[2];
- snprintf(buf, sizeof(buf), "%c", *value);
+ buf[0] = *value;
+ buf[1] = '\0';
SetValue(buf);
}
@@ -490,9 +491,7 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
break;
case kBlue|k_Repeat:
case kBlue: // consume the key only if in edit-mode
- if (InEditMode())
- ;
- else
+ if (!InEditMode())
return osUnknown;
break;
case kLeft|k_Repeat:
diff --git a/newplugin b/newplugin
index c35ae7e..368007b 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: newplugin 1.34 2007/08/12 11:04:39 kls Exp $
+# $Id: newplugin 1.36 2007/08/19 14:19:49 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@@ -108,6 +108,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
OBJS = \$(PLUGIN).o
+### The main target:
+
+all: libvdr-\$(PLUGIN).so i18n
+
### Implicit rules:
%.o: %.c
@@ -144,13 +148,11 @@ i18n: \$(I18Nmo)
\@mkdir -p \$(LOCALEDIR)
for i in \$(I18Ndirs); do\\
mkdir -p \$(LOCALEDIR)/\$\$i/LC_MESSAGES;\\
- cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/\$(PLUGIN).mo;\\
+ cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/vdr-\$(PLUGIN).mo;\\
done
### Targets:
-all: libvdr-\$(PLUGIN).so i18n
-
libvdr-\$(PLUGIN).so: \$(OBJS)
\$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@
\@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)
diff --git a/nit.c b/nit.c
index 9291c96..ba80a68 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: nit.c 1.14 2007/04/29 11:35:33 kls Exp $
+ * $Id: nit.c 1.15 2007/08/17 14:02:45 kls Exp $
*/
#include "nit.h"
@@ -140,13 +140,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
break;
}
- bool found = false;
- for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
- if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
- if (Setup.UpdateChannels >= 5) {
- if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
+ if (Setup.UpdateChannels >= 5) {
+ bool found = false;
+ for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+ if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+ int transponder = Channel->Transponder();
+ if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), transponder)) {
for (int n = 0; n < NumFrequencies; n++) {
- if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
+ if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), transponder)) {
Frequency = Frequencies[n];
break;
}
@@ -157,16 +158,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
found = true;
}
- }
- if (!found && Setup.UpdateChannels >= 5) {
- for (int n = 0; n < NumFrequencies; n++) {
- cChannel *Channel = new cChannel;
- Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
- if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
- EITScanner.AddTransponder(Channel);
- else
- delete Channel;
- }
+ if (!found) {
+ for (int n = 0; n < NumFrequencies; n++) {
+ cChannel *Channel = new cChannel;
+ Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+ if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
+ EITScanner.AddTransponder(Channel);
+ else
+ delete Channel;
+ }
+ }
}
}
break;
@@ -190,13 +191,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
break;
}
- bool found = false;
- for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
- if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
- if (Setup.UpdateChannels >= 5) {
- if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
+ if (Setup.UpdateChannels >= 5) {
+ bool found = false;
+ for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+ if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+ int transponder = Channel->Transponder();
+ if (!ISTRANSPONDER(Frequency / 1000, transponder)) {
for (int n = 0; n < NumFrequencies; n++) {
- if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
+ if (ISTRANSPONDER(Frequencies[n] / 1000, transponder)) {
Frequency = Frequencies[n];
break;
}
@@ -207,16 +209,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
found = true;
}
- }
- if (!found && Setup.UpdateChannels >= 5) {
- for (int n = 0; n < NumFrequencies; n++) {
- cChannel *Channel = new cChannel;
- Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
- if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate))
- EITScanner.AddTransponder(Channel);
- else
- delete Channel;
- }
+ if (!found) {
+ for (int n = 0; n < NumFrequencies; n++) {
+ cChannel *Channel = new cChannel;
+ Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+ if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate))
+ EITScanner.AddTransponder(Channel);
+ else
+ delete Channel;
+ }
+ }
}
}
break;
@@ -247,13 +249,14 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
break;
}
- bool found = false;
- for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
- if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
- if (Setup.UpdateChannels >= 5) {
- if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
+ if (Setup.UpdateChannels >= 5) {
+ bool found = false;
+ for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+ if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) {
+ int transponder = Channel->Transponder();
+ if (!ISTRANSPONDER(Frequency / 1000000, transponder)) {
for (int n = 0; n < NumFrequencies; n++) {
- if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
+ if (ISTRANSPONDER(Frequencies[n] / 1000000, transponder)) {
Frequency = Frequencies[n];
break;
}
@@ -264,15 +267,15 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
found = true;
}
- }
- if (!found && Setup.UpdateChannels >= 5) {
- for (int n = 0; n < NumFrequencies; n++) {
- cChannel *Channel = new cChannel;
- Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
- if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
- EITScanner.AddTransponder(Channel);
- else
- delete Channel;
+ if (!found) {
+ for (int n = 0; n < NumFrequencies; n++) {
+ cChannel *Channel = new cChannel;
+ Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
+ if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
+ EITScanner.AddTransponder(Channel);
+ else
+ delete Channel;
+ }
}
}
}
diff --git a/osd.c b/osd.c
index 3be8fc7..5624c26 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 1.72 2007/08/12 11:33:17 kls Exp $
+ * $Id: osd.c 1.73 2007/08/17 15:23:50 kls Exp $
*/
#include "osd.h"
@@ -449,13 +449,13 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
int w = Font->Width(s);
int h = Font->Height();
int limit = 0;
+ int cw = Width ? Width : w;
+ int ch = Height ? Height : h;
+ if (!Intersects(x, y, x + cw - 1, y + ch - 1))
+ return;
+ if (ColorBg != clrTransparent)
+ DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
if (Width || Height) {
- int cw = Width ? Width : w;
- int ch = Height ? Height : h;
- if (!Intersects(x, y, x + cw - 1, y + ch - 1))
- return;
- if (ColorBg != clrTransparent)
- DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
limit = x + cw - x0;
if (Width) {
if ((Alignment & taLeft) != 0)
@@ -482,8 +482,6 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
}
}
}
- else if (!Intersects(x, y, x + w - 1, y + h - 1))
- return;
x -= x0;
y -= y0;
Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index a23a19e..72093c1 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -38,12 +38,12 @@ msgid "No title"
msgstr ""
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Català"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "cat"
@@ -396,7 +396,7 @@ msgstr "Propietats del canal duplicades!"
msgid "Channels"
msgstr "Canals"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Esborrar"
@@ -1001,7 +1001,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Aquest plugin no admet configuració!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Configuració"
@@ -1076,7 +1076,7 @@ msgstr ""
msgid "Not enough disk space to start recording!"
msgstr ""
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "No hi ha cap dispositiu DVB lliure per gravar!"
@@ -1113,23 +1113,23 @@ msgstr " aàbcçdeéèfghiíjklmnoòpqrstuúvwxyz0123456789-.,#~,/_@·"
msgid "yes"
msgstr "sí"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Inserir"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Sobrescriure"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1234,39 +1234,39 @@ msgstr "Dissabte"
msgid "Sunday"
msgstr "Diumenge"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr ""
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr ""
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Prem qualsevol tecla per cancel·lar l'aturada"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Canviant a la interfície DVB primària..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Procés d'edició fallit!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Procés d'edició finalitzat"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 08f454c..07439ab 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "Bez názvu"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Èesky"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "cze"
@@ -394,7 +394,7 @@ msgstr "Nastavení kanálù nejsou unikátní!"
msgid "Channels"
msgstr "Kanály"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Smazat"
@@ -999,7 +999,7 @@ msgstr "Moduly"
msgid "This plugin has no setup parameters!"
msgstr "Modul nemá konfiguraèní parametry!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Nastavení"
@@ -1074,7 +1074,7 @@ msgstr "Zvuk není dostupný!"
msgid "Not enough disk space to start recording!"
msgstr "Nedostatek volného místa k zapoèetí nahrávání!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "®ádná DVB karta není volná pro nahrávání"
@@ -1111,23 +1111,23 @@ msgstr " aábcèdïeéìfghiíjklmnòoópqrøs¹t»uúùvwxyýz¾0123456789-.#~,/_@"
msgid "yes"
msgstr "ano"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcáè2\tdefïéì3\tghií4\tjkl5\tmnoòó6\tpqrsø¹7\ttuv»úù8\twxyzý¾9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Vlo¾it"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Pøepsat"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Modul"
@@ -1232,39 +1232,39 @@ msgstr "Sobota"
msgid "Sunday"
msgstr "Nedìle"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "Brzo zaène nahrávání VPS!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Zaèalo nahrávání"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Jakákoliv klávesa zru¹í vypnutí"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Pøepnout primární DVB..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Editaèní proces selhal!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Editaèní proces skonèil"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index b3bca8a..61ff642 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "Ingen titel"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Dansk"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "dan"
@@ -394,7 +394,7 @@ msgstr "Kanalindstillinger er ikke entydige!"
msgid "Channels"
msgstr "Kanaler"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Slet"
@@ -999,7 +999,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Denne plugin har ingen parametre"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Indstillinger"
@@ -1074,7 +1074,7 @@ msgstr "Ingen lyd tilgængelig!"
msgid "Not enough disk space to start recording!"
msgstr "For lidt harddisk plads til optagelse!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Ingen fri DVB enhed til optagelse!"
@@ -1111,23 +1111,23 @@ msgstr " abcdefghijklmnopqrstuvwxyzæøå0123456789-.#~,/_@"
msgid "yes"
msgstr "ja"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcæå2\tdef3\tghi4\tjkl5\tmnoø6\tpqrs7\ttuv8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Indsæt"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Overskriv"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1232,39 +1232,39 @@ msgstr "Lørdag"
msgid "Sunday"
msgstr "Søndag"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "VPS optagelse starter snart!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Optagelse startet"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Tryk vilkårlig tast for at annullere sluk"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Skifter primær DVB enhed..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Redigeringsproces fejlede!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Redigeringsproces afsluttet"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 1e70b1c..0da285c 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "Kein Titel"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Deutsch"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "deu"
@@ -394,7 +394,7 @@ msgstr "Kanaleinstellungen sind nicht eindeutig!"
msgid "Channels"
msgstr "Kanäle"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Löschen"
@@ -999,7 +999,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Dieses Plugin hat keine Parameter!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Einstellungen"
@@ -1074,7 +1074,7 @@ msgstr "Kein Audio verfügbar!"
msgid "Not enough disk space to start recording!"
msgstr "Nicht genügend Plattenplatz für Aufnahme!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Keine freie DVB-Karte zum Aufnehmen!"
@@ -1111,23 +1111,23 @@ msgstr " aäbcdefghijklmnoöpqrstuüvwxyz0123456789-.#~,/_@"
msgid "yes"
msgstr "ja"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcä2\tdef3\tghi4\tjkl5\tmnoö6\tpqrs7\ttuvü8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Einfügen"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Überschreiben"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1232,39 +1232,39 @@ msgstr "Samstag"
msgid "Sunday"
msgstr "Sonntag"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "VPS-Aufnahme beginnt in Kürze!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Aufzeichnung gestartet"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr "VDR schaltet später aus - Power zum erzwingen"
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Taste drücken, um Ausschalten abzubrechen"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Primäres Interface wird umgeschaltet..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Schnitt gescheitert!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Schnitt beendet"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr "Taste drücken, um Neustart abzubrechen"
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR wird in %s Minuten ausschalten"
diff --git a/po/el_GR.po b/po/el_GR.po
index d08fd2e..363246d 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "×ùñßò Ôßôëï"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "ÅëëçíéêÜ"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "ell"
@@ -394,7 +394,7 @@ msgstr "Ïé ñéèìýóåéò ôïí êáíáëéþí áëëõëïóõìðßðôïõí!"
msgid "Channels"
msgstr "ÊáíÜëéá"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "ÄéáãñáöÞ"
@@ -999,7 +999,7 @@ msgstr "ÅðåêôÜóåéò"
msgid "This plugin has no setup parameters!"
msgstr "ÁõôÞ ç åðÝêôáóç äåí Ý÷åé ðáñÜìåôñïõò!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Ñõèìéóåéò"
@@ -1074,7 +1074,7 @@ msgstr "Ìç äéáèÝóéìïò Þ÷ïò"
msgid "Not enough disk space to start recording!"
msgstr ""
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "ÁíåðÜñêåéá DVB ÊÜñôáò ãéÜ åããñáöÞ!"
@@ -1111,23 +1111,23 @@ msgstr " áÜâãäåÝæçÞèéßêëìíîïüðñóòôõýö÷øùþ0123456789-.#~,/_@abcdefghijklmnopqrstu
msgid "yes"
msgstr "íáß"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABÃ/áâã"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "ÅéóáãùãÞ"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "ÁíôéêáôÜóôáóç"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "ÅðÝêôáóç"
@@ -1232,39 +1232,39 @@ msgstr "ÓÜââáôï"
msgid "Sunday"
msgstr "ÊõñéáêÞ"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr ""
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr ""
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Ðßåóå Ýíá ðëÞêôñï ãéÜ áêýñùäç ôåñìáôéóìïý"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Ç êýñéá DVB êÜñôá áëëÜæåé..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Ç åðåîåñãáóßá áðÝôõ÷å!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Ç åðåîåñãáóßá ôåëåßùóå"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 1314aa7..bab0dfa 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "Sin título"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Español"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "esl"
@@ -394,7 +394,7 @@ msgstr "!Propiedades de canal duplicadas!"
msgid "Channels"
msgstr "Canales"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Borrar"
@@ -999,7 +999,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Este plugin no admite configuración"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Configuración"
@@ -1074,7 +1074,7 @@ msgstr "¡No hay audio disponible!"
msgid "Not enough disk space to start recording!"
msgstr ""
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "¡Ningún dispositivo DVB disponible para grabar!"
@@ -1111,23 +1111,23 @@ msgstr " aábcçdeéfghiíjklmnñoópqrstuúvwxyz0123456789-.#~,/_@"
msgid "yes"
msgstr "sí"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcáç2\tdefé3\tghií4\tjkl5\tmnoñó6\tpqrs7\ttuvú8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Insertar"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Sobreescribir"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1232,39 +1232,39 @@ msgstr "Sábado"
msgid "Sunday"
msgstr "Domingo"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr ""
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Iniciando grabación"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Pulse una tecla para interrumpir apagar"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Cambiando el interfaz DVB primario..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "¡Proceso de edición fallido!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Proceso de edición terminado"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index 989a14f..56b8382 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "Pealkiri puudub"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "eesti"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "est"
@@ -394,7 +394,7 @@ msgstr "Kanaliseaded ei ole unikaalsed!"
msgid "Channels"
msgstr "Kanalid"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Kustuta"
@@ -999,7 +999,7 @@ msgstr "Laiendusmoodulid"
msgid "This plugin has no setup parameters!"
msgstr "Sellel laienudusmoodulil ei ole seadeid!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Sätted"
@@ -1074,7 +1074,7 @@ msgstr "Audio kättesaamatu!"
msgid "Not enough disk space to start recording!"
msgstr "Ebapiisavalt kettaruumi salvestamise alustamiseks!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Puudub vaba DVB seade salvestamiseks!"
@@ -1111,23 +1111,23 @@ msgstr " abcdefghijklmnopqrsðzþtuvwõäöüxy0123456789-.#~,/_@"
msgid "yes"
msgstr "jah"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcä2\tdef3\tghi4\tjkl5\tmnoõö6\tpqrsð7\ttuvü8\twxyzþ9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Lisa (INS)"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Asenda (OVR)"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Laiendusmoodul"
@@ -1232,39 +1232,39 @@ msgstr "Laupäev"
msgid "Sunday"
msgstr "Pühapäev"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "VPS salvestamine tulekul!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Salvestamine algas"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr "VDR lülitub välja hiljem - vajuta Power kiirendamiseks"
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Vajuta suvalist klahvi väljalülitamise tühistamiseks"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Esmase DVB seadme ümberlülitus..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Redigeerimine ebaõnnestus"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Redigeerimine lõpetatud"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr "Restardi katkestamiseks vajuta suvalist klahvi"
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR lülitub välja %s minuti pärast"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f44f3c1..09b83b4 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
#: channels.c:1077 menu.c:707
msgid "*** Invalid Channel ***"
-msgstr "*** Virheellinen kanavavalinta! ***"
+msgstr "*** Virheellinen kanavavalinta ***"
#: device.c:634 device.c:670
msgid "Channel not available!"
@@ -39,12 +39,12 @@ msgid "No title"
msgstr "Ei esitystä"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "suomi"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "fin"
@@ -243,39 +243,39 @@ msgstr "Komennot"
#: keys.c:58
msgid "Key$User1"
-msgstr ""
+msgstr "Lisänäppäin 1"
#: keys.c:59
msgid "Key$User2"
-msgstr ""
+msgstr "Lisänäppäin 2"
#: keys.c:60
msgid "Key$User3"
-msgstr ""
+msgstr "Lisänäppäin 3"
#: keys.c:61
msgid "Key$User4"
-msgstr ""
+msgstr "Lisänäppäin 4"
#: keys.c:62
msgid "Key$User5"
-msgstr ""
+msgstr "Lisänäppäin 5"
#: keys.c:63
msgid "Key$User6"
-msgstr ""
+msgstr "Lisänäppäin 6"
#: keys.c:64
msgid "Key$User7"
-msgstr ""
+msgstr "Lisänäppäin 7"
#: keys.c:65
msgid "Key$User8"
-msgstr ""
+msgstr "Lisänäppäin 8"
#: keys.c:66
msgid "Key$User9"
-msgstr ""
+msgstr "Lisänäppäin 9"
#: menu.c:69
msgid "Free To Air"
@@ -397,7 +397,7 @@ msgstr "Kanava-asetukset eivät ole yksilölliset!"
msgid "Channels"
msgstr "Kanavat"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Poista"
@@ -550,7 +550,7 @@ msgstr "Syötä %d numeroa!"
#: menu.c:1754
msgid "CAM not responding!"
-msgstr ""
+msgstr "CA-moduuli ei vastaa!"
#: menu.c:1784
msgid "Recording info"
@@ -840,15 +840,15 @@ msgstr "LNB-ylätaajuus (MHz)"
#: menu.c:2560
msgid "CAM reset"
-msgstr ""
+msgstr "CAM nollaus"
#: menu.c:2561
msgid "CAM present"
-msgstr ""
+msgstr "CAM havaittu"
#: menu.c:2562
msgid "CAM ready"
-msgstr ""
+msgstr "CAM valmis"
#: menu.c:2585 menu.c:2815
msgid "CAM"
@@ -872,11 +872,11 @@ msgstr "CA-moduulin valikko ei saatavilla"
#: menu.c:2624
msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CA-moduuli käytössä - nollataanko?"
#: menu.c:2626
msgid "Can't reset CAM!"
-msgstr "CA-moduulin palautus alkutilaan epäonnistui!"
+msgstr "CA-moduulin nollaus epäonnistui!"
#: menu.c:2660 menu.c:2816
msgid "Recording"
@@ -1002,7 +1002,7 @@ msgstr "Laajennokset"
msgid "This plugin has no setup parameters!"
msgstr "Tällä laajennoksella ei ole asetuksia!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Asetukset"
@@ -1077,7 +1077,7 @@ msgstr "Äänen kieli ei ole valittavissa!"
msgid "Not enough disk space to start recording!"
msgstr "Tallennustilan puute estää tallennuksen!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Ei vapaata DVB-viritintä tallennukselle!"
@@ -1114,23 +1114,23 @@ msgstr " abcdefghijklmnopqrstuvwxyzåäö0123456789-.#~,/_@"
msgid "yes"
msgstr "kyllä"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcäå2\tdef3\tghi4\tjkl5\tmnoö6\tpqrs7\ttuv8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Lisää"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Korvaa"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Laajennos"
@@ -1235,39 +1235,39 @@ msgstr "Lauantai"
msgid "Sunday"
msgstr "Sunnuntai"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "VPS-tallennus on alkamassa!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Tallennus aloitettu"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr "VDR sammuu myöhemmin - pakota virtanäppäimellä"
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Peru sammutus painamalla mitä tahansa näppäintä"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Vaihdetaan ensisijaista DVB-sovitinta..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Muokkaus epäonnistui!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Muokkaus valmis"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr "Peru uudelleenkäynnistys painamalla mitä tahansa näppäintä"
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR sammuu %s minuutin kuluttua"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index b9622af..4e5551c 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -5,14 +5,16 @@
# Olivier Jacques <jacquesolivier@hotmail.com>, 2003
# Gregoire Favre <greg@magma.unil.ch>, 2003
# Nicolas Huillard <nhuillard@e-dition.fr>, 2005
+# Pierre Briec <pbriec@free.fr>, 2006
+# Bruno Roussel <bruno.roussel@free.fr>, 2007
#
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
-"PO-Revision-Date: 2007-08-12 14:17+0200\n"
-"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
+"PO-Revision-Date: 2007-08-17 13:45+0200\n"
+"Last-Translator: Bruno Roussel <bruno.roussel@free.fr>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -20,15 +22,15 @@ msgstr ""
#: channels.c:1077 menu.c:707
msgid "*** Invalid Channel ***"
-msgstr "*** Chaîne invalide! ***"
+msgstr "*** Chaîne invalide ! ***"
#: device.c:634 device.c:670
msgid "Channel not available!"
-msgstr "Chaîne non disponible!"
+msgstr "Chaîne non disponible !"
#: device.c:636
msgid "Can't start Transfer Mode!"
-msgstr "Impossible d'utiliser le mode transfert!"
+msgstr "Impossible d'utiliser le mode transfert !"
#: eitscan.c:159
msgid "Starting EPG scan"
@@ -39,12 +41,12 @@ msgid "No title"
msgstr "Sans titre"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Français"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "fra"
@@ -58,7 +60,7 @@ msgstr "Appuyer sur une touche de la télécommande"
#: interface.c:79
msgid "RC code detected!"
-msgstr "Code de la télécommande détecté!"
+msgstr "Code de la télécommande détecté !"
#: interface.c:80
msgid "Do not press any key..."
@@ -243,39 +245,39 @@ msgstr "Commandes"
#: keys.c:58
msgid "Key$User1"
-msgstr ""
+msgstr "Utilisateur1"
#: keys.c:59
msgid "Key$User2"
-msgstr ""
+msgstr "Utilisateur2"
#: keys.c:60
msgid "Key$User3"
-msgstr ""
+msgstr "Utilisateur3"
#: keys.c:61
msgid "Key$User4"
-msgstr ""
+msgstr "Utilisateur4"
#: keys.c:62
msgid "Key$User5"
-msgstr ""
+msgstr "Utilisateur5"
#: keys.c:63
msgid "Key$User6"
-msgstr ""
+msgstr "Utilisateur6"
#: keys.c:64
msgid "Key$User7"
-msgstr ""
+msgstr "Utilisateur7"
#: keys.c:65
msgid "Key$User8"
-msgstr ""
+msgstr "Utilisateur8"
#: keys.c:66
msgid "Key$User9"
-msgstr ""
+msgstr "Utilisateur9"
#: menu.c:69
msgid "Free To Air"
@@ -391,13 +393,13 @@ msgstr "Hiérarchie"
#: menu.c:312
msgid "Channel settings are not unique!"
-msgstr "Caractéristiques des chaînes ne sont pas uniques"
+msgstr "Caractéristiques des chaînes non uniques"
#: menu.c:402 menu.c:2923
msgid "Channels"
msgstr "Chaînes"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Supprimer"
@@ -415,11 +417,11 @@ msgstr "Nouveau"
#: menu.c:512
msgid "Channel is being used by a timer!"
-msgstr "Cette chaîne est en cours d'utilisation!"
+msgstr "Cette chaîne est en cours d'utilisation !"
#: menu.c:515
msgid "Delete channel?"
-msgstr "Supprimer la chaîne?"
+msgstr "Supprimer la chaîne ?"
#: menu.c:652
msgid "Edit timer"
@@ -479,11 +481,11 @@ msgstr "Marche/Arr"
#: menu.c:890
msgid "Delete timer?"
-msgstr "Supprimer la programmation?"
+msgstr "Supprimer la programmation ?"
#: menu.c:892 menu.c:2031
msgid "Timer still recording - really delete?"
-msgstr "Enregistrement en cours - confirmez la suppression"
+msgstr "Enregistrement en cours - suppression confirmée ?"
#: menu.c:948
msgid "Event"
@@ -511,7 +513,7 @@ msgstr "Programmes en cours"
#: menu.c:1138 menu.c:1381 menu.c:1501
msgid "Button$Next"
-msgstr "Après"
+msgstr "Aprés"
#: menu.c:1138 menu.c:1381 menu.c:1501
msgid "Button$Now"
@@ -523,7 +525,7 @@ msgstr "Programme"
#: menu.c:1158 menu.c:1450
msgid "Can't switch channel!"
-msgstr "Impossible de changer de chaîne!"
+msgstr "Impossible de changer de chaîne !"
#: menu.c:1283
#, c-format
@@ -541,16 +543,16 @@ msgstr "Cet événement - toutes les chaînes"
#: menu.c:1342
msgid "All events - all channels"
-msgstr "Tous les événements - toutes chaînes"
+msgstr "Tous les événements - toutes les chaînes"
#: menu.c:1712
#, c-format
msgid "Please enter %d digits!"
-msgstr "Veuillez entrer %d chiffres!"
+msgstr "Veuillez entrer %d chiffres !"
#: menu.c:1754
msgid "CAM not responding!"
-msgstr ""
+msgstr "Pas de réponse de la CAM"
#: menu.c:1784
msgid "Recording info"
@@ -578,15 +580,15 @@ msgstr "Commandes"
#: menu.c:1970
msgid "Error while accessing recording!"
-msgstr "Impossible d'accèder à l'enregistrement"
+msgstr "Impossible d'accéder à l'enregistrement"
#: menu.c:2028
msgid "Delete recording?"
-msgstr "Supprimer l'enregistrement?"
+msgstr "Supprimer l'enregistrement ?"
#: menu.c:2058
msgid "Error while deleting recording!"
-msgstr "Erreur de suppression de l'enregistrement!"
+msgstr "Erreur de suppression de l'enregistrement !"
#: menu.c:2089
msgid "Recording commands"
@@ -642,35 +644,35 @@ msgstr "Durée affichage message (s)"
#: menu.c:2217
msgid "Setup.OSD$Use small font"
-msgstr "Utiliser les petits caractères"
+msgstr "Utiliser les petites polices"
#: menu.c:2218
msgid "Setup.OSD$Anti-alias"
-msgstr ""
+msgstr "Anti-aliasing"
#: menu.c:2219
msgid "Setup.OSD$Default font"
-msgstr ""
+msgstr "Police par défaut"
#: menu.c:2220
msgid "Setup.OSD$Small font"
-msgstr ""
+msgstr "Petite police"
#: menu.c:2221
msgid "Setup.OSD$Fixed font"
-msgstr ""
+msgstr "Police taille fixe"
#: menu.c:2222
msgid "Setup.OSD$Default font size (pixel)"
-msgstr ""
+msgstr "Taille police par défaut (pixel)"
#: menu.c:2223
msgid "Setup.OSD$Small font size (pixel)"
-msgstr ""
+msgstr "Taille petite police par défaut (pixel)"
#: menu.c:2224
msgid "Setup.OSD$Fixed font size (pixel)"
-msgstr ""
+msgstr "Taille police fixe par défaut (pixel)"
#: menu.c:2225
msgid "Setup.OSD$Channel info position"
@@ -840,19 +842,19 @@ msgstr "Fréquence haute LNB (MHz)"
#: menu.c:2560
msgid "CAM reset"
-msgstr ""
+msgstr "CAM remise à zéro"
#: menu.c:2561
msgid "CAM present"
-msgstr ""
+msgstr "CAM présente"
#: menu.c:2562
msgid "CAM ready"
-msgstr ""
+msgstr "CAM prête"
#: menu.c:2585 menu.c:2815
msgid "CAM"
-msgstr "Accès conditionnel"
+msgstr "Accés conditionnel"
#: menu.c:2590
msgid "Button$Menu"
@@ -868,15 +870,15 @@ msgstr "Ouverture du menu CAM"
#: menu.c:2615
msgid "Can't open CAM menu!"
-msgstr "Impossible d'ouvrir le menu CAM!"
+msgstr "Impossible d'ouvrir le menu CAM !"
#: menu.c:2624
msgid "CAM is in use - really reset?"
-msgstr ""
+msgstr "CAM en cours d'utilisation - Remettre à zéro ?"
#: menu.c:2626
msgid "Can't reset CAM!"
-msgstr "Impossible de réinitialiser la CAM!"
+msgstr "Impossible de réinitialiser la CAM !"
#: menu.c:2660 menu.c:2816
msgid "Recording"
@@ -980,7 +982,7 @@ msgstr "Prise en compte chaîne (s)"
#: menu.c:2716
msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
-msgstr ""
+msgstr "Entrée chaîne timeout (ms)"
#: menu.c:2717
msgid "Setup.Miscellaneous$Initial channel"
@@ -1002,7 +1004,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Ce plugin n'a pas de paramètres!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Configuration"
@@ -1012,7 +1014,7 @@ msgstr "Redémarrer"
#: menu.c:2826
msgid "Really restart?"
-msgstr "Redémarrer?"
+msgstr "Vraiment redémarrer ?"
#. TRANSLATORS: note the leading and trailing blanks!
#: menu.c:2878
@@ -1063,23 +1065,23 @@ msgstr " Annuler le montage"
#: menu.c:3038
msgid "Stop recording?"
-msgstr "Arrêter l'enregistrement?"
+msgstr "Arrêter l'enregistrement ?"
#: menu.c:3046
msgid "Cancel editing?"
-msgstr "Annuler les modifications?"
+msgstr "Annuler les modifications ?"
#: menu.c:3526
msgid "No audio available!"
-msgstr ""
+msgstr "Pas d'audio disponible !"
#: menu.c:3736
msgid "Not enough disk space to start recording!"
-msgstr "Espace disque insuffisant pour démarrer l'enregistrement!"
+msgstr "Espace disque insuffisant pour démarrer l'enregistrement !"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
-msgstr "Pas de carte DVB disponible pour l'enregistrement!"
+msgstr "Pas de carte DVB disponible pour l'enregistrement !"
#: menu.c:3797
msgid "Pausing live video..."
@@ -1088,15 +1090,15 @@ msgstr "Pause de l'émission en direct..."
#. TRANSLATORS: note the trailing blank!
#: menu.c:4040
msgid "Jump: "
-msgstr "Accès direct: "
+msgstr "Accès direct : "
#: menu.c:4184
msgid "No editing marks defined!"
-msgstr "Pas de marques d'édition définies!"
+msgstr "Pas de marques d'édition définies !"
#: menu.c:4186
msgid "Can't start editing process!"
-msgstr "Impossible de commencer le montage!"
+msgstr "Impossible de commencer le montage !"
#: menu.c:4188
msgid "Editing process started"
@@ -1104,7 +1106,7 @@ msgstr "Opération de montage lancée"
#: menu.c:4191
msgid "Editing process already active!"
-msgstr "Montage déjà en cours!"
+msgstr "Montage déjà en cours !"
#: menuitems.c:21
msgid " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@"
@@ -1114,23 +1116,23 @@ msgstr " aàbcçdeéèêfghiîjklmnoôpqrstuùûvwxyz0123456789-.#~,/_@"
msgid "yes"
msgstr "oui"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcàâç2\tdeféèê3\tghiîï4\tjkl5\tmnoô6\tpqrs7\ttuvù8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Insérer"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
-msgstr "Écraser"
+msgstr "Ecraser"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1140,23 +1142,23 @@ msgstr "Haut/Bas -> nouvelle place - OK -> déplacer"
#: player.c:84
msgid "Channel locked (recording)!"
-msgstr "Chaîne verrouillée (enregistrement en cours)!"
+msgstr "Chaîne verrouillée (enregistrement en cours) !"
#: recording.c:189
msgid "Low disk space!"
-msgstr "Disque presque plein!"
+msgstr "Disque presque plein !"
#: shutdown.c:148
msgid "Can't shutdown - option '-s' not given!"
-msgstr "Arrêt impossible - option '-s' absente!"
+msgstr "Arrêt impossible - option '-s' absente !"
#: shutdown.c:152
msgid "Editing - shut down anyway?"
-msgstr ""
+msgstr "Edition en cours - confirmez l'arrêt ?"
#: shutdown.c:162
msgid "Recording - shut down anyway?"
-msgstr "Enregistrement en cours - confirmez l'arrêt"
+msgstr "Enregistrement en cours - confirmez l'arrêt ?"
#: shutdown.c:169
#, c-format
@@ -1170,19 +1172,19 @@ msgstr "confirmez l'arrêt"
#: shutdown.c:184
#, c-format
msgid "Plugin %s wakes up in %ld min, continue?"
-msgstr ""
+msgstr "Le plugin %s démarre dans %ld min, continuer ?"
#: shutdown.c:195
msgid "Editing - restart anyway?"
-msgstr ""
+msgstr "Edition en cours - redémarrer ?"
#: shutdown.c:205
msgid "Recording - restart anyway?"
-msgstr "Enregistrement en cours - redémarrer?"
+msgstr "Enregistrement en cours - redémarrer ?"
#: shutdown.c:209
msgid "restart anyway?"
-msgstr "redémarrer?"
+msgstr "redémarrer ?"
#. TRANSLATORS: note the trailing blank!
#: skinclassic.c:553
@@ -1235,39 +1237,39 @@ msgstr "Samedi"
msgid "Sunday"
msgstr "Dimanche"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "Enregistrement VPS commence prochaînement"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Enregistrement a commencé"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
-msgstr ""
+msgstr "VDR doit s'arrêter plus tard - Appuyer sur Power pour forcer"
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Appuyez sur une touche pour annuler l'arrêt"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Changement de carte DVB primaire..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
-msgstr "Echec du montage!"
+msgstr "Echec du montage !"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Montage terminé"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
-msgstr ""
+msgstr "Appuyer sur une touche pour annuler le redémarrage"
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
-msgstr ""
+msgstr "VDR s'arrêtera dans %s minutes"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 698810c..1798657 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
msgstr "Bez titla"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Hrvatski"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "hrv"
@@ -395,7 +395,7 @@ msgstr "Parametri programa nisu jednoznaèni!"
msgid "Channels"
msgstr "Programi"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Obri¹i"
@@ -1000,7 +1000,7 @@ msgstr "Dodaci (Plugins)"
msgid "This plugin has no setup parameters!"
msgstr "Ovaj dodatak (Plugin) nema parametara!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Konfiguracija"
@@ -1075,7 +1075,7 @@ msgstr "Audio nedostupan"
msgid "Not enough disk space to start recording!"
msgstr ""
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Nema slobodnog DVB ureðaja za snimanje!"
@@ -1112,23 +1112,23 @@ msgstr " abcèædðefghijklmnopqrs¹tuvwxyz¾0123456789-.#~,/_@"
msgid "yes"
msgstr "da"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Umetni"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Prepi¹i"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1233,39 +1233,39 @@ msgstr "Subota"
msgid "Sunday"
msgstr "Nedjelja"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr ""
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr ""
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Pritisnite tipku ako ne ¾elite ugasiti sistem"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Preklapanje primarnog DVB ureðaja..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Rezanje neuspje¹no!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Rezanje zavr¹eno"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index b210525..495aa40 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
msgstr "név nélkül"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Magyar"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "hun"
@@ -395,7 +395,7 @@ msgstr "Az adóbeállítások nem egyértelmûek"
msgid "Channels"
msgstr "Csatornák"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Törölni"
@@ -1000,7 +1000,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Ennek a plugin-nak nincs setup-parametere!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Beállítások"
@@ -1075,7 +1075,7 @@ msgstr "Hang nem lehetséges!"
msgid "Not enough disk space to start recording!"
msgstr "Nincs elegendõ hely a felvételre"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Nincs szabad DVB kártya a felvételhez!"
@@ -1112,23 +1112,23 @@ msgstr " aábcdeéfghiíjklmnoóöõpqrstuúüûvwxyz0123456789-.,#~,/_@"
msgid "yes"
msgstr "igen"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\taábc2\tdeéf3\tghií4\tjkl5\tmnoóöõ6\tpqrs7\ttuúüûv8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Beilleszteni"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Átírni"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1233,39 +1233,39 @@ msgstr "Szombat"
msgid "Sunday"
msgstr "Vasárnap"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "VPS-felvétel rögtön kezdõdik!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "A felvétel elinditva Nd"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Nyomj egy gombot a leállás megállításához"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Primér Interface átkapcsolva..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Vágás sikertelen!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Vágás befejezve"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index ccf1741..e87b05f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Sean Carlos <seanc@libero.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -38,12 +38,12 @@ msgid "No title"
msgstr "Senza titolo"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Italiano"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "ita"
@@ -396,7 +396,7 @@ msgstr "Parametri canale non univoci!"
msgid "Channels"
msgstr "Canali"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Cancella"
@@ -1001,7 +1001,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Questo plugin non ha parametri di configurazione!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Opzioni"
@@ -1076,7 +1076,7 @@ msgstr "Nessun audio disponibile!"
msgid "Not enough disk space to start recording!"
msgstr "Spazio su disco insufficiente per registrare!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Nessuna periferica DVB disponibile per registrare!"
@@ -1113,23 +1113,23 @@ msgstr " aáàbcdeéèfghiìîjklmnoòpqrstuùvwxyz0123456789-.#~,/_@"
msgid "yes"
msgstr "si"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\taàbc2\tdeèf3\tghiì4\tjkl5\tmnoò6\tpqrs7\ttuùv8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Inserisci"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Sovrascrivi"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1234,39 +1234,39 @@ msgstr "Sabato"
msgid "Sunday"
msgstr "Domenica"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "Registrazione VPS imminente!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Registrazione avviata"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Premere un tasto per annullare lo spegnimento"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Cambio su card DVB primaria..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Processo di modifica fallito!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Processo di modifica terminato"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 19c3514..f06f56f 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -38,12 +38,12 @@ msgid "No title"
msgstr "Geen titel"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Nederlands"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "dut"
@@ -396,7 +396,7 @@ msgstr "Kanaalinstellingen zijn niet uniek!"
msgid "Channels"
msgstr "Kanalen"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Verwijder"
@@ -1001,7 +1001,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr "Deze plugin heeft geen instelparameters"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Instellingen"
@@ -1076,7 +1076,7 @@ msgstr "Geen audio beschikbaar!"
msgid "Not enough disk space to start recording!"
msgstr ""
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Geen vrije DVB kaart om op te nemen!"
@@ -1113,23 +1113,23 @@ msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.#~,/_@áäàïóöòúüù"
msgid "yes"
msgstr "ja"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Invoegen"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Overschrijven"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1234,39 +1234,39 @@ msgstr "Zaterdag"
msgid "Sunday"
msgstr "Zondag"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr ""
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr ""
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Druk een toets om shutdown af te breken"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Eerste DVB-kaart wordt omgeschakeld..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Bewerken is mislukt!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Bewerken is klaar"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 25d074b..62e3a59 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
msgstr ""
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Norsk"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "nor"
@@ -395,7 +395,7 @@ msgstr ""
msgid "Channels"
msgstr "Kanaler"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Slett"
@@ -1000,7 +1000,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr ""
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Konfigurasjon"
@@ -1075,7 +1075,7 @@ msgstr "Pas d'audio disponible!"
msgid "Not enough disk space to start recording!"
msgstr ""
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Ingen ledige DVB enheter for opptak!"
@@ -1112,23 +1112,23 @@ msgstr ""
msgid "yes"
msgstr "ja"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr ""
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1233,39 +1233,39 @@ msgstr "Lørdag"
msgid "Sunday"
msgstr "Søndag"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr ""
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr ""
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Trykk en tast for ikke å slå av"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Bytter første DVB-enhet..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Feil under redigering!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Redigeringsprosess avsluttet"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d782eff..60b93ac 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "Bez tytu³u"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Polski"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "pol"
@@ -394,7 +394,7 @@ msgstr "Ustawienia kana³u nie s± unikalne!"
msgid "Channels"
msgstr "Kana³y"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Usuñ"
@@ -999,7 +999,7 @@ msgstr "Wtyczki"
msgid "This plugin has no setup parameters!"
msgstr "Ta wtyczka nie ma ¿adnych ustawieñ!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Ustawienia"
@@ -1074,7 +1074,7 @@ msgstr "D¼wiêk nie jest dostêpny!"
msgid "Not enough disk space to start recording!"
msgstr "Brak miejsca na dysku do nagrywania!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Brak wolnej karty DVB do nagrywania!"
@@ -1111,23 +1111,23 @@ msgstr " a±bcædeêfghijkl³mnñoópqrs¶tuvwxyz¼¿0123456789-.#~,/_@"
msgid "yes"
msgstr "tak"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabc2±æ\tdef3ê\tghi4\tjkl5³\tmno6ñó\tpqrs7¶\ttuv8\twxyz9¼¿"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Wstaw"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Nadpisz"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Wtyczka"
@@ -1232,39 +1232,39 @@ msgstr "Sobota"
msgid "Sunday"
msgstr "Niedziela"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "Wkrótce nagranie VPS!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Rozpoczêto nagrywanie"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Naci¶nij dowolny klawisz aby nie wy³±czaæ"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Przê³±czam na pierwszy interfejs DVB..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Proces edycji nie powiód³ siê!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Proces edycji zakoñczony"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8bab256..ff15f57 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr ""
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Português"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "por"
@@ -394,7 +394,7 @@ msgstr ""
msgid "Channels"
msgstr "Canais"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Apagar"
@@ -999,7 +999,7 @@ msgstr "Plugins"
msgid "This plugin has no setup parameters!"
msgstr ""
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Configurar"
@@ -1074,7 +1074,7 @@ msgstr ""
msgid "Not enough disk space to start recording!"
msgstr ""
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Nenhuma placa DVB disponivel para gravar!"
@@ -1111,23 +1111,23 @@ msgstr ""
msgid "yes"
msgstr "sim"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr ""
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr ""
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin"
@@ -1232,39 +1232,39 @@ msgstr "Sábado"
msgid "Sunday"
msgstr "Domingo"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr ""
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr ""
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Pressione qualquer tecla para cancelar"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "A mudar interface DVB primário..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Falha no processo de modificação"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Processo de modificação terminado"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f2edbec..933389e 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
msgstr "Fãrã titlu"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Românã"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "rom"
@@ -395,7 +395,7 @@ msgstr "Parametrii canalului nu sunt univoci!"
msgid "Channels"
msgstr "Canale"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "ªterge"
@@ -1000,7 +1000,7 @@ msgstr "Plugin-uri"
msgid "This plugin has no setup parameters!"
msgstr "Acest plugin nu se configureazã!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Configuraþie"
@@ -1075,7 +1075,7 @@ msgstr "Lipseºte sunetul!"
msgid "Not enough disk space to start recording!"
msgstr "Insuficient spaþiul pe disc pentru înregistrare!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Nu mai sunt dispozitive DVB disponibile pentru înregistrare!"
@@ -1112,23 +1112,23 @@ msgstr " aãâbcdefghiîjklmnopqrsºtþuvwxyz0123456789-.#~,/_@"
msgid "yes"
msgstr "da"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\taãâbc2\tdef3\tghiî4\tjkl5\tmno6\tpqrsº7\ttþuv8\twxyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Insereazã"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Suprascrie"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Plugin (modul adiþional)"
@@ -1233,39 +1233,39 @@ msgstr "Sâmbãtã"
msgid "Sunday"
msgstr "Duminicã"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "Urmeazã o înregistrare VPS!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "A început înregistrarea"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Apasã orice tastã pentru a anula închiderea"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Comut dispozitiv DVB primar..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Montajul înregistrãrii a eºuat"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Montajul înregistrãrii s-a terminat"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 47cbbac..ec18474 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "±Õ× ÝÐ×ÒÐÝØï"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "ÀãááÚØÙ"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "rus"
@@ -394,7 +394,7 @@ msgstr "½ÐáâàÞÙÚØ ÚÐÝÐÛÐ ÝÕ ãÝØÚÐÛìÝë!"
msgid "Channels"
msgstr "ºÐÝÐÛë"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "ÃÔÐÛØâì"
@@ -999,7 +999,7 @@ msgstr "¼ÞÔãÛØ àÐáèØàÕÝØï"
msgid "This plugin has no setup parameters!"
msgstr "¼ÞÔãÛì ÝÕ ØÜÕÕâ ßÐàÐÜÕâàÞÒ ÝÐáâàÞÙÚØ!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "½ÐáâàÞÙÚÐ"
@@ -1074,7 +1074,7 @@ msgstr "¾âáãâáâÒãÕâ ×ÒãÚ!"
msgid "Not enough disk space to start recording!"
msgstr "½ÕÔÞáâÐâÞçÝÞ ÜÕáâÐ ÝÐ ÔØáÚÕ ÔÛï ÝÐçÐÛÐ ×ÐßØáØ"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "½Õâ áÒÞÑÞÔÝÞÓÞ DVB-ãáâàÞÙáâÒÐ ÔÛï ×ÐßØáØ!"
@@ -1111,23 +1111,23 @@ msgstr " abcdefghijklmnopqrstuvwxyzÐÑÒÓÔÕñÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìîï0123456789-.#
msgid "yes"
msgstr "ÔÐ"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcÐÑÒÓ2\tdefÔÕñÖ×3\tghiØÙÚÛ4\tjklÜÝÞ5\tmnoßàá6\tpqrsâãäå7\ttuvæçèéê8\twxyzëìíîï9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "°±²/ÐÑÒ"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "²áâÐÒÚÐ"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "·ÐÜÕÝÐ"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "¼ÞÔãÛì"
@@ -1232,39 +1232,39 @@ msgstr "ÁãÑÑÞâÐ"
msgid "Sunday"
msgstr "²ÞáÚàÕáÕÝìÕ"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "VPS-·ÐßØáì áÚÞàÞ ÝÐçÝÕâáï"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "·ÐßØáì ÝÐçÐâÐ"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr "VDR ÒëÚÛîçØâáï ßÞ×ÖÕ - ÝÐÖÜØâÕ Power ÔÛï ãáÚÞàÕÝØï"
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "½ÐÖÜØâÕ ÛîÑãî ÚÝÞßÚã çâÞÑë ÞâÜÕÝØâì ÒëÚÛîçÕÝØÕ."
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "ÁÜÕÝÐ ÞáÝÞÒÝÞÓÞ DVB-ãáâàÞÙáâÒÐ..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "¾èØÑÚÐ ÒÞ ÒàÕÜï ÜÞÝâÐÖÐ ×ÐßØáØ!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "¼ÞÝâÐÖ ÞÚÞÝçÕÝ"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr "½ÐÖÜØâÕ ÛîÑãî ÚÝÞßÚã ÔÛï ÞâÜÕÝë ßÕàÕ×ÐÓàã×ÚØ"
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR ÒëÚÛîçØâáï çÕàÕ× %s ÜØÝãâ"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 642f403..c62b272 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
msgstr "Brez naziva"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Slovenski"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "slv"
@@ -395,7 +395,7 @@ msgstr "Nastavitve kanala niso edinstvene!"
msgid "Channels"
msgstr "Kanali"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Izbri¹i"
@@ -1000,7 +1000,7 @@ msgstr "Vstavki"
msgid "This plugin has no setup parameters!"
msgstr "Ta vstavek nima nastavitvenih parametrov!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Nastavitve"
@@ -1075,7 +1075,7 @@ msgstr "Zvok ni dosegljiv!"
msgid "Not enough disk space to start recording!"
msgstr "Premalo prostora na disku za snemanje!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Ni proste DVB naprave za snemanje!"
@@ -1112,23 +1112,23 @@ msgstr " abcèdefghijklmnopqrs¹tuvwxyz¾0123456789-.#~,/_@"
msgid "yes"
msgstr "da"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcè2\tdef3\tghi4\tjkl5\tmno6\tpqrs¹7\ttuv8\twxyz¾9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Vstavi"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Prepi¹i"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Vstavek"
@@ -1233,39 +1233,39 @@ msgstr "Sobota"
msgid "Sunday"
msgstr "Nedelja"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "Sledi VPS snemanje!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Snemanje se je prièelo"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Pritisnite katerikoli gumb za preklic izklopa"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Preklapljanje primarne DVB naprave..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Napaka pri procesu urejanja!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Proces urejanja je konèan"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 82b1373..bf84d16 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -37,12 +37,12 @@ msgid "No title"
msgstr "ingen titel"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Svenska"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "sve"
@@ -395,7 +395,7 @@ msgstr "Kanalinställningarna är ej unika!"
msgid "Channels"
msgstr "Kanaler"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Ta bort"
@@ -1000,7 +1000,7 @@ msgstr "Moduler"
msgid "This plugin has no setup parameters!"
msgstr "Den här modulen har inga parametrar"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Inställningar"
@@ -1075,7 +1075,7 @@ msgstr "Ljud saknas!"
msgid "Not enough disk space to start recording!"
msgstr "Otillräcklingt diskutrymme för inspelning!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Det finns ingen ledig DVB enhet för inspelning!"
@@ -1112,23 +1112,23 @@ msgstr " abcdefghijklmnopqrstuvwxyzåäö0123456789-.#~,/_@"
msgid "yes"
msgstr "ja"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcåä2\tdef3\tghi4\tjkl5\tmnoö6\tpqrs7\ttuv8\twxyz"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Infoga"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Skriv över"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Modul"
@@ -1233,39 +1233,39 @@ msgstr "Lördag"
msgid "Sunday"
msgstr "Söndag"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "strax VPS inspelning..."
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Inspelningen har startat"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Tryck valfri knapp för att återkalla avstängningen"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Byter primär DVB enhet..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Redigeringsprocessen misslyckades"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Redigering avslutad"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 4a220ba..1eecb50 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-12 14:11+0200\n"
+"POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -36,12 +36,12 @@ msgid "No title"
msgstr "Ýsim yok"
#. TRANSLATORS: The name of the language, as written natively
-#: i18n.c:29
+#: i18n.c:30
msgid "LanguageName$English"
msgstr "Türkçe"
#. TRANSLATORS: The 3-letter code of the language
-#: i18n.c:31
+#: i18n.c:32
msgid "LanguageCode$eng"
msgstr "tur"
@@ -394,7 +394,7 @@ msgstr "Kanal ayarlarý belli deðýl!"
msgid "Channels"
msgstr "Kanallar"
-#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:319
+#: menu.c:432 menu.c:847 menu.c:1920 menuitems.c:320
msgid "Button$Delete"
msgstr "Sil"
@@ -999,7 +999,7 @@ msgstr "Eklentiler"
msgid "This plugin has no setup parameters!"
msgstr "Bu eklentinin düzenek parametresi yok!"
-#: menu.c:2808 menu.c:2942 menuitems.c:951
+#: menu.c:2808 menu.c:2942 menuitems.c:950
msgid "Setup"
msgstr "Ayarlar"
@@ -1074,7 +1074,7 @@ msgstr "Audio yok!"
msgid "Not enough disk space to start recording!"
msgstr "Kayýt için yeterince kapasite yok!"
-#: menu.c:3767 vdr.c:1015 vdr.c:1075
+#: menu.c:3767 vdr.c:1017 vdr.c:1077
msgid "No free DVB device to record!"
msgstr "Kullanýlmayan DVB kartý bulunmadý!"
@@ -1111,23 +1111,23 @@ msgstr " abcçdefgðhýijklmnoöprsþtuüvyz0123456789-.#~,/_@"
msgid "yes"
msgstr "evet"
-#: menuitems.c:287
+#: menuitems.c:288
msgid " 0\t-.#~,/_@1\tabc2\tdef3\tghi4\tjkl5\tmno6\tpqrs7\ttuv8\twxyz9"
msgstr " 0\t-.#~,/_@1\tabcç2\tdef3\tgðhýi4\tjkl5\tmnoö6\tprsþ7\ttuüv8\tyz9"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$ABC/abc"
msgstr "ABC/abc"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Insert"
msgstr "Ekle"
-#: menuitems.c:319
+#: menuitems.c:320
msgid "Button$Overwrite"
msgstr "Üstüne yaz"
-#: menuitems.c:972
+#: menuitems.c:971
msgid "Plugin"
msgstr "Eklenti"
@@ -1232,39 +1232,39 @@ msgstr "Cumartesi"
msgid "Sunday"
msgstr "Pazar"
-#: vdr.c:861
+#: vdr.c:863
msgid "Upcoming VPS recording!"
msgstr "VPS çekim yakýnda baþlýyor!"
-#: vdr.c:1023 vdr.c:1079
+#: vdr.c:1025 vdr.c:1081
msgid "Recording started"
msgstr "Kayýt baþlandý"
-#: vdr.c:1032
+#: vdr.c:1034
msgid "VDR will shut down later - press Power to force"
msgstr ""
-#: vdr.c:1044
+#: vdr.c:1046
msgid "Press any key to cancel shutdown"
msgstr "Kapatmayý iptal etmek için herhangi bir tuþa bas"
-#: vdr.c:1097
+#: vdr.c:1099
msgid "Switching primary DVB..."
msgstr "Primer DVB arayüzü deðiþtiriliyor..."
-#: vdr.c:1165
+#: vdr.c:1167
msgid "Editing process failed!"
msgstr "Kesim baþarýsýz!"
-#: vdr.c:1167
+#: vdr.c:1169
msgid "Editing process finished"
msgstr "Kesim bitti"
-#: vdr.c:1173
+#: vdr.c:1175
msgid "Press any key to cancel restart"
msgstr ""
-#: vdr.c:1193
+#: vdr.c:1195
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr ""
diff --git a/vdr.c b/vdr.c
index b15938a..0f9cf5f 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.296 2007/08/12 11:22:04 kls Exp $
+ * $Id: vdr.c 1.298 2007/08/18 13:03:46 kls Exp $
*/
#include <getopt.h>
@@ -704,10 +704,13 @@ int main(int argc, char *argv[])
#endif
// Attach launched player control:
cControl::Attach();
+
+ time_t Now = time(NULL);
+
// Make sure we have a visible programme in case device usage has changed:
if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
static time_t lastTime = 0;
- if (time(NULL) - lastTime > MINCHANNELWAIT) {
+ if (Now - lastTime > MINCHANNELWAIT) {
cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
@@ -716,7 +719,7 @@ int main(int argc, char *argv[])
&& !cDevice::SwitchChannel(-1)) // ...or the next lower available one
;
}
- lastTime = time(NULL); // don't do this too often
+ lastTime = Now; // don't do this too often
LastTimerChannel = -1;
}
}
@@ -738,8 +741,8 @@ int main(int argc, char *argv[])
if (modified == CHANNELSMOD_USER || Timers.Modified(TimerState))
ChannelSaveTimeout = 1; // triggers an immediate save
else if (modified && !ChannelSaveTimeout)
- ChannelSaveTimeout = time(NULL) + CHANNELSAVEDELTA;
- bool timeout = ChannelSaveTimeout == 1 || ChannelSaveTimeout && time(NULL) > ChannelSaveTimeout && !cRecordControls::Active();
+ ChannelSaveTimeout = Now + CHANNELSAVEDELTA;
+ bool timeout = ChannelSaveTimeout == 1 || ChannelSaveTimeout && Now > ChannelSaveTimeout && !cRecordControls::Active();
if ((modified || timeout) && Channels.Lock(false, 100)) {
if (timeout) {
Channels.Save();
@@ -767,16 +770,15 @@ int main(int argc, char *argv[])
if (!Menu)
Menu = new cDisplayChannel(cDevice::CurrentChannel(), LastChannel >= 0);
LastChannel = cDevice::CurrentChannel();
- LastChannelChanged = time(NULL);
+ LastChannelChanged = Now;
}
- if (time(NULL) - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[PreviousChannelIndex])
+ if (Now - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[PreviousChannelIndex])
PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
// Timers and Recordings:
if (!Timers.BeingEdited()) {
// Assign events to timers:
Timers.SetEvents();
// Must do all following calls with the exact same time!
- time_t Now = time(NULL);
// Process ongoing recordings:
cRecordControls::Process(Now);
// Start new recordings:
@@ -863,7 +865,7 @@ int main(int argc, char *argv[])
}
}
}
- LastTimerCheck = time(NULL);
+ LastTimerCheck = Now;
}
// Delete expired timers:
Timers.DeleteExpired();
@@ -1065,7 +1067,7 @@ int main(int argc, char *argv[])
continue;
}
}
- else if (time(NULL) - cRemote::LastActivity() > MENUTIMEOUT)
+ else if (Now - cRemote::LastActivity() > MENUTIMEOUT)
state = osEnd;
}
switch (state) {
@@ -1181,12 +1183,12 @@ int main(int argc, char *argv[])
ShutdownHandler.countdown.Cancel();
}
- if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (time(NULL) - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
+ if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
// Handle housekeeping tasks
// Shutdown:
// Check whether VDR will be ready for shutdown in SHUTDOWNWAIT seconds:
- time_t Soon = time(NULL) + SHUTDOWNWAIT;
+ time_t Soon = Now + SHUTDOWNWAIT;
if (ShutdownHandler.IsUserInactive(Soon) && ShutdownHandler.Retry(Soon) && !ShutdownHandler.countdown) {
if (ShutdownHandler.ConfirmShutdown(false))
// Time to shut down - start final countdown: