[vdr-plugin-epgsearch] 02/08: Imported Upstream version 1.0.1~beta6
Tobias Grimm
tiber-guest at moszumanska.debian.org
Wed Feb 11 22:14:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-epgsearch.
commit 3b7c36475c54c0c73db18bc5f586291cfd4bc8ac
Author: etobi <git at e-tobi.net>
Date: Wed Feb 11 22:51:26 2015 +0100
Imported Upstream version 1.0.1~beta6
---
HISTORY | 5 +-
HISTORY.DE | 5 +-
Makefile | 173 ++++++++++++++++++++-----------------
Makefile => Makefile.before.1.7.36 | 0
conflictcheck.c | 2 +-
epgsearch.c | 10 +--
menu_conflictcheck.c | 8 +-
menu_dirselect.c | 4 +-
po/ca_ES.po | 18 +---
po/cs_CZ.po | 21 ++---
po/da_DK.po | 18 +---
po/de_DE.po | 21 ++---
po/el_GR.po | 18 +---
po/es_ES.po | 21 ++---
po/et_EE.po | 18 +---
po/fi_FI.po | 21 ++---
po/fr_FR.po | 21 ++---
po/hr_HR.po | 18 +---
po/hu_HU.po | 18 +---
po/it_IT.po | 21 ++---
po/lt_LT.po | 21 ++---
po/nl_NL.po | 21 ++---
po/nn_NO.po | 18 +---
po/pl_PL.po | 18 +---
po/pt_PT.po | 18 +---
po/ro_RO.po | 18 +---
po/ru_RU.po | 18 +---
po/sk_SK.po | 21 ++---
po/sl_SI.po | 18 +---
po/sv_SE.po | 18 +---
po/tr_TR.po | 18 +---
uservars.h | 2 +-
32 files changed, 238 insertions(+), 412 deletions(-)
diff --git a/HISTORY b/HISTORY
index 9c35a02..3097a9a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,8 +1,11 @@
VDR Plugin 'epgsearch' Revision History
---------------------------------------
-2013-01-xx; Version 1.0.1 - maintenance release
+2013-03-xx; Version 1.0.1 - maintenance release
new:
+- new Makefile style as introduced in vdr-1.7.36, the old Makefile still exists as
+ Makefile.before.1.7.36 for previous vdr builds. Many thanks to Copperhead, Stefan
+ Hofmann and Christopher Reimer for their work.
- implement device bonding in conflict checker, thanks to Joachim Wilke for providing a patch
- new service interface "Epgsearch-enablesearchtimers-v1.0" to switch the search timers
background update on/off. Updated the sample in source/vdr-epgsearchclient-0.0.2.tgz
diff --git a/HISTORY.DE b/HISTORY.DE
index 05a3db7..03aaeab 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -1,8 +1,11 @@
VDR Plugin 'epgsearch' Revision History
---------------------------------------
-2012-05-xx: Version 1.0.1 - Maintenance Release
+2013-03-xx: Version 1.0.1 - Maintenance Release
neu:
+- neuer Stil für das Makefile wie in vdr-1.7.36 eingeführt. Das alte Makefile gibt es noch
+ als Makefile.before.1.7.36 für frühere VDR-Versionen. Vielen Dank an Copperhead, Stefan
+ Hofmann und Christopher Reimer für deren Arbeit.
- device bonding in der Timer-Konflikt-Prüfung implementiert, Danke an Joachim Wilke für den Path
- Neue Service-Schnittstelle "Epgsearch-enablesearchtimers-v1.0" zum Ein- und Ausschalten
des Suchtimer-Updates im Hintergrund. Das Beispiel in source/vdr-epgsearchclient-0.0.2.tgz
diff --git a/Makefile b/Makefile
index a25b4aa..6bb1b96 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@
#
# Christian Wieninger cwieninger at gmx.de
#
+# Adapted to the new VDR makefile environment by Copperhead,
+# refined by Stefan Hofmann
+#
### ------------
### CONFIG START
@@ -57,19 +60,24 @@ PLUGIN4 = quickepgsearch
VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-### The C++ compiler and options:
+### The directory environment:
-CXX ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -Wno-format-y2k
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+MANDIR = $(call PKGCFG,mandir)
+CONFDIR = $(call PKGCFG,configdir)
+BINDIR = $(call PKGCFG,bindir)
+#
+TMPDIR ?= /tmp
-### The directory environment:
+### The compiler options:
-#DVBDIR = ../../../../DVB
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+export CFLAGS = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
-### auto configuring modules
+### configuring modules
ifeq ($(AUTOCONFIG),1)
ifeq (exists, $(shell pkg-config libpcre && echo exists))
REGEXLIB = pcre
@@ -84,32 +92,9 @@ ifeq ($(AUTOCONFIG),1)
endif
endif
-### Make sure that necessary options are included:
--include $(VDRDIR)/Make.global
-
-
-### Allow user defined options to overwrite defaults:
+### The version number of VDR's plugin API:
--include $(VDRDIR)/Make.config
-
-ALL = libvdr-$(PLUGIN).so createcats
-ifeq ($(WITHOUT_EPGSEARCHONLY), 0)
- ALL += libvdr-$(PLUGIN2).so
-endif
-ifeq ($(WITHOUT_CONFLICTCHECKONLY), 0)
- ALL += libvdr-$(PLUGIN3).so
-endif
-ifeq ($(WITHOUT_QUICKSEARCH), 0)
- ALL += libvdr-$(PLUGIN4).so
-endif
-
-### The version number of VDR (taken from VDR's "config.h"):
-
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-ifeq ($(strip $(APIVERSION)),)
- APIVERSION = $(VDRVERSION)
-endif
+APIVERSION = $(call PKGCFG,apiversion)
### The name of the distribution archive:
@@ -118,17 +103,27 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here):
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
-#INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
+
+DEFINES +=
-EPGSEARCH_DEFINES += -D_GNU_SOURCE
ifneq ($(SENDMAIL),)
-EPGSEARCH_DEFINES += -DSENDMAIL='"$(SENDMAIL)"'
+DEFINES += -DSENDMAIL='"$(SENDMAIL)"'
endif
-DEFINES += $(EPGSEARCH_DEFINES)
### The object files (add further files here):
+ALL = libvdr-$(PLUGIN).so createcats
+ifeq ($(WITHOUT_EPGSEARCHONLY), 0)
+ ALL += libvdr-$(PLUGIN2).so
+endif
+ifeq ($(WITHOUT_CONFLICTCHECKONLY), 0)
+ ALL += libvdr-$(PLUGIN3).so
+endif
+ifeq ($(WITHOUT_QUICKSEARCH), 0)
+ ALL += libvdr-$(PLUGIN4).so
+endif
+
OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o epgsearchsvdrp.o epgsearchtools.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchaction [...]
ifeq ($(REGEXLIB), pcre)
@@ -165,7 +160,7 @@ endif
### length of the filling '-' in the channel separators, defaults to
### "----------------------------------------"
-### overwrite this with PLUGIN_EPGSEARCH_SEP_ITEMS=--- in your Make.config
+### overwrite this with PLUGIN_EPGSEARCH_SEP_ITEMS=---
### to avoid problems with graphlcd
ifdef PLUGIN_EPGSEARCH_SEP_ITEMS
DEFINES += -DMENU_SEPARATOR_ITEMS='"$(PLUGIN_EPGSEARCH_SEP_ITEMS)"'
@@ -182,20 +177,20 @@ LIBS4 =
### The main target:
-all: $(ALL) i18n
+all: $(ALL) i18n docs
### Implicit rules:
%.o: %.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN)"' $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN)"' $(INCLUDES) -o $@ $<
mainmenushortcut.o: mainmenushortcut.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"' $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"' $(INCLUDES) -o $@ $<
epgsearchonly.o: epgsearchonly.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN2)"' $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN2)"' $(INCLUDES) -o $@ $<
conflictcheckonly.o: conflictcheckonly.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN3)"' $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN3)"' $(INCLUDES) -o $@ $<
quickepgsearch.o: quickepgsearch.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"' $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"' $(INCLUDES) -o $@ $<
# Dependencies:
@@ -209,49 +204,89 @@ $(DEPFILE): Makefile
### Internationalization (I18N):
PODIR = po
-LOCALEDIR = $(VDRDIR)/locale
I18Npo = $(wildcard $(PODIR)/*.po)
-I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
I18Npot = $(PODIR)/$(PLUGIN).pot
%.mo: %.po
msgfmt -c -o $@ $<
-$(I18Npot): $(wildcard *.[ch])
- xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP -kI18nTranslate --msgid-bugs-address='<cwieninger at gmx.de>' -o $@ `ls $^`
+$(I18Npot): $(wildcard *.c)
+ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
%.po: $(I18Npot)
- msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+ msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
@touch $@
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
- @mkdir -p $(dir $@)
- cp $< $@
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ install -D -m644 $< $@
.PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
### Targets:
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
libvdr-$(PLUGIN2).so: $(OBJS2)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
libvdr-$(PLUGIN3).so: $(OBJS3)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
libvdr-$(PLUGIN4).so: $(OBJS4)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
createcats: createcats.o Makefile
$(CXX) $(CXXFLAGS) $(LDFLAGS) createcats.o -o $@
+docs:
+ ./docsrc2man.sh
+ ./docsrc2html.sh
+ ln -sf ./doc/en/epgsearch.4.txt MANUAL
+ ln -sf ./doc/en/epgsearch.1.txt README
+ ln -sf ./doc/de/epgsearch.1.txt README.DE
+
+install-$(PLUGIN): libvdr-$(PLUGIN).so
+ install -D libvdr-$(PLUGIN).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
+
+install-$(PLUGIN2): libvdr-$(PLUGIN2).so
+ install -D libvdr-$(PLUGIN2).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION)
+
+install-$(PLUGIN3): libvdr-$(PLUGIN3).so
+ install -D libvdr-$(PLUGIN3).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN3).so.$(APIVERSION)
+
+install-$(PLUGIN4): libvdr-$(PLUGIN4).so
+ install -D libvdr-$(PLUGIN4).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION)
+
+install-conf:
+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)/conf.d
+ cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
+
+install-doc:
+ mkdir -p $(DESTDIR)$(MANDIR)/man1
+ mkdir -p $(DESTDIR)$(MANDIR)/man4
+ mkdir -p $(DESTDIR)$(MANDIR)/man5
+ mkdir -p $(DESTDIR)$(MANDIR)/de/man1
+ mkdir -p $(DESTDIR)$(MANDIR)/de/man5
+ cp man/en/*1.gz $(DESTDIR)$(MANDIR)/man1/
+ cp man/en/*4.gz $(DESTDIR)$(MANDIR)/man4/
+ cp man/en/*5.gz $(DESTDIR)$(MANDIR)/man5/
+ cp man/de/*1.gz $(DESTDIR)$(MANDIR)/de/man1/
+ cp man/de/*5.gz $(DESTDIR)$(MANDIR)/de/man5/
+
+install-bin: createcats
+ mkdir -p $(DESTDIR)$(BINDIR)
+ cp createcats $(DESTDIR)$(BINDIR)
+
+install: install-lib install-i18n install-conf install-doc install-bin
+
+install-lib: install-$(PLUGIN) install-$(PLUGIN2) install-$(PLUGIN3) install-$(PLUGIN4)
+
dist: docs clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@mkdir $(TMPDIR)/$(ARCHIVE)
@@ -274,26 +309,6 @@ distfull: docs clean
@ln -sf README.git README
@echo complete distribution package created as $(PACKAGE).tgz
-docs:
- @./docsrc2man.sh
- @./docsrc2html.sh
- @ln -sf ./doc/en/epgsearch.4.txt MANUAL
- @ln -sf ./doc/en/epgsearch.1.txt README
- @ln -sf ./doc/de/epgsearch.1.txt README.DE
-
-install-doc: docs
- @mkdir -p $(MANDIR)/man1
- @mkdir -p $(MANDIR)/man4
- @mkdir -p $(MANDIR)/man5
- @mkdir -p $(MANDIR)/de/man1
- @mkdir -p $(MANDIR)/de/man5
-
- @cp man/en/*1.gz $(MANDIR)/man1/
- @cp man/en/*4.gz $(MANDIR)/man4/
- @cp man/en/*5.gz $(MANDIR)/man5/
- @cp man/de/*1.gz $(MANDIR)/de/man1/
- @cp man/de/*5.gz $(MANDIR)/de/man5/
-
clean:
@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
@-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* createcats createcats.o pod2*.tmp
diff --git a/Makefile b/Makefile.before.1.7.36
similarity index 100%
copy from Makefile
copy to Makefile.before.1.7.36
diff --git a/conflictcheck.c b/conflictcheck.c
index 58b334b..eb7fa57 100644
--- a/conflictcheck.c
+++ b/conflictcheck.c
@@ -25,7 +25,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include <algorithm>
#include "conflictcheck.h"
#include "epgsearchcfg.h"
-#include <libsi/si.h>
+/*#include <libsi/si.h>*/
#include "conflictcheck_thread.h"
#include "recstatus.h"
#include "timerstatus.h"
diff --git a/epgsearch.c b/epgsearch.c
index bb84fb6..83a12b6 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -69,7 +69,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "confdloader.h"
#include "pending_notifications.h"
-static const char VERSION[] = "1.0.1.beta3";
+static const char VERSION[] = "1.0.1.beta5";
static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more");
// globals
@@ -153,7 +153,7 @@ bool cPluginEpgsearch::ProcessArgs(int argc, char *argv[])
if (argc==8 && !strcmp(argv[0], "searchepg"))
{
cSearchExt* SearchExt = new cSearchExt;
- strcpy(SearchExt->search,argv[2]);
+ strn0cpy(SearchExt->search,argv[2], sizeof(SearchExt->search));
if (atoi(argv[3]) > 0)
{
SearchExt->useChannel = true;
@@ -234,7 +234,7 @@ bool cPluginEpgsearch::Service(const char *Id, void *Data)
Epgsearch_search_v1_0* searchData = (Epgsearch_search_v1_0*) Data;
searchData->pResultMenu = NULL;
- strcpy(SearchExt->search,searchData->query);
+ strn0cpy(SearchExt->search,searchData->query, sizeof(SearchExt->search));
if (searchData->channelNr > 0)
{
SearchExt->useChannel = true;
@@ -329,7 +329,7 @@ bool cPluginEpgsearch::Service(const char *Id, void *Data)
Epgsearch_searchresults_v1_0* searchData = (Epgsearch_searchresults_v1_0*) Data;
searchData->pResultList = NULL;
- strcpy(SearchExt->search,searchData->query);
+ strn0cpy(SearchExt->search,searchData->query, sizeof(SearchExt->search));
if (searchData->channelNr > 0)
{
SearchExt->useChannel = true;
@@ -507,7 +507,7 @@ cOsdObject *cPluginEpgsearch::DoInitialSearch(char* rcFilename)
if (rcFile.Load(rcFilename))
{
cSearchExt* SearchExt = new cSearchExt;
- strcpy(SearchExt->search,rcFile.Search);
+ strn0cpy(SearchExt->search,rcFile.Search, sizeof(SearchExt->search));
if (rcFile.ChannelNr != -1)
{
SearchExt->useChannel = true;
diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c
index 05ec315..562842e 100644
--- a/menu_conflictcheck.c
+++ b/menu_conflictcheck.c
@@ -62,8 +62,8 @@ cMenuConflictCheckItem::cMenuConflictCheckItem(cConflictCheckTime* Ct, cConflict
cMenuConflictCheck::cMenuConflictCheck()
:cOsdMenu("", 4, 12, 4, 5, 30)
{
-#if VDRVERSNUM >= 10728
- SetMenuCategory(mcSchedule);
+#if VDRVERSNUM >= 10734
+ SetMenuCategory(mcTimerEdit);
#endif
showAll = false;
lastSel = -1;
@@ -197,8 +197,8 @@ bool cMenuConflictCheckDetailsItem::Update(bool Force)
cMenuConflictCheckDetails::cMenuConflictCheckDetails(cConflictCheckTimerObj* TimerObj, cConflictCheck* ConflictCheck)
:cOsdMenu(tr("Timer conflicts"), 2, 4, 13, 3, 2)
{
-#if VDRVERSNUM >= 10728
- SetMenuCategory(mcSchedule);
+#if VDRVERSNUM >= 10734
+ SetMenuCategory(mcTimerEdit);
#endif
timerObj = TimerObj;
checktime = timerObj->conflCheckTime;
diff --git a/menu_dirselect.c b/menu_dirselect.c
index 2dd9556..2fc24a8 100644
--- a/menu_dirselect.c
+++ b/menu_dirselect.c
@@ -64,8 +64,8 @@ int cMenuDirItem::Compare(const cListObject &ListObject) const
cMenuDirSelect::cMenuDirSelect(char* szDirectory)
:cOsdMenu(tr("Select directory"))
{
-#if VDRVERSNUM >= 10728
- SetMenuCategory(mcTimer);
+#if VDRVERSNUM >= 10733
+ SetMenuCategory(mcTimerEdit);
#endif
Directory = szDirectory;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index af453f1..a86b5cc 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -8,15 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Jordi Vilà <jvila at tinet.org>\n"
"Language-Team: Catalan <vdr at linuxtv.org>\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
msgid "Channel groups"
msgstr ""
@@ -1236,15 +1236,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 198e33c..2d071c7 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.21\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2011-10-31 20:21+0200\n"
"Last-Translator: Radek Stastny <dedkus at gmail.com>\n"
"Language-Team: Czech <vdr at linuxtv.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
msgid "Channel groups"
msgstr "Skupiny stanic"
@@ -1234,14 +1234,11 @@ msgstr "Přepnout na (%d) '%s'?"
msgid "Programming timer failed!"
msgstr "Nastavení nahrávání selhalo!"
-#, c-format
-msgid "in %02ldd"
-msgstr "%02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "%02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "%02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "%02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "%02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "%02ldm"
diff --git a/po/da_DK.po b/po/da_DK.po
index 573a927..008c328 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Mogens Elneff <mogens at elneff.dk>\n"
"Language-Team: Danish <vdr at linuxtv.org>\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
msgid "Channel groups"
msgstr ""
@@ -1234,15 +1234,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index f5ae6fb..09b0c75 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Klaus Schmidinger <kls at cadsoft.de>\n"
"Language-Team: German <vdr at linuxtv.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
msgid "Channel groups"
msgstr "Kanalgruppen"
@@ -1280,14 +1280,11 @@ msgstr "Umschalten zu (%d) '%s'?"
msgid "Programming timer failed!"
msgstr "Timer-Programmierung fehlschlagen!"
-#, c-format
-msgid "in %02ldd"
-msgstr "in %02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "in %02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "in %02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "in %02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "in %02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "in %02ldm"
diff --git a/po/el_GR.po b/po/el_GR.po
index 0eeb2cd..d9c5fc1 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail at dimitrios.de>\n"
"Language-Team: Greek <vdr at linuxtv.org>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
msgid "Channel groups"
msgstr ""
@@ -1234,15 +1234,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index b009a08..069bb5b 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-11-18 20:09+0200\n"
"Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
"Language-Team: Spanish <vdr at linuxtv.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
msgid "Channel groups"
msgstr "Grupos de canales"
@@ -1292,17 +1292,14 @@ msgstr "¿Cambiar a (%d) '%s'?"
msgid "Programming timer failed!"
msgstr "¡La programación ha fallado!"
-#, c-format
-msgid "in %02ldd"
-msgstr "en %02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "en %02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "en %02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "en %02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "en %02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "en %02ldm"
#, fuzzy
#~ msgid "Compare expression"
diff --git a/po/et_EE.po b/po/et_EE.po
index 444b73e..3cefb49 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Arthur Konovalov <kasjas at hot.ee>\n"
"Language-Team: Estonian <vdr at linuxtv.org>\n"
+"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
msgid "Channel groups"
msgstr ""
@@ -1234,15 +1234,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 8513046..4e5f963 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: EPGSearch 0.9.25\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2011-01-04 21:07+0200\n"
"Last-Translator: Ville Skyttä <ville.skytta at iki.fi>\n"
"Language-Team: Finnish <vdr at linuxtv.org>\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -1284,14 +1284,11 @@ msgstr "Vaihdetaanko kanavalle (%d) '%s'?"
msgid "Programming timer failed!"
msgstr "Ajastimen ohjelmointi epäonnistui!"
-#, c-format
-msgid "in %02ldd"
-msgstr "%02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "%02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "%02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "%02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "%02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "%02ldm"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index dabd799..feb877c 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -9,15 +9,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2008-04-30 08:36+0200\n"
"Last-Translator: Patrice Staudt <patrice.staudt at laposte.net>\n"
"Language-Team: French <vdr at linuxtv.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
msgid "Channel groups"
msgstr "Groupe de chaînes"
@@ -1288,17 +1288,14 @@ msgstr ""
msgid "Programming timer failed!"
msgstr "La programmation a échoué"
-#, c-format
-msgid "in %02ldd"
-msgstr "en %02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "en %02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "en %02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "en %02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "en %02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "en %02ldm"
#, fuzzy
#~ msgid "Compare expression"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index ac4a09c..1e6c148 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor at dupor.com>\n"
"Language-Team: Croatian <vdr at linuxtv.org>\n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
msgid "Channel groups"
msgstr ""
@@ -1235,15 +1235,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c1aff41..d156991 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko at hotmail.com>, Guido Josten <guido.josten at t-online.de>\n"
"Language-Team: Hungarian <vdr at linuxtv.org>\n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
msgid "Channel groups"
msgstr ""
@@ -1233,15 +1233,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 67820bc..9c76e0d 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,15 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2011-07-17 17:46+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian at tiscali.it>\n"
"Language-Team: Italian <vdr at linuxtv.org>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -1287,17 +1287,14 @@ msgstr "Cambiare a (%d) '%s'?"
msgid "Programming timer failed!"
msgstr "Programmazione timer fallito!"
-#, c-format
-msgid "in %02ldd"
-msgstr "in %02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "in %02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "in %02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "in %02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "in %02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "in %02ldm"
#~ msgid "File"
#~ msgstr "File"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 95db2f3..a9f2cf4 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.10\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Valdemaras Pipiras <varas at ambernet.lt>\n"
"Language-Team: Lithuanian <vdr at linuxtv.org>\n"
+"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
msgid "Channel groups"
msgstr "kanalo grupės"
@@ -1295,17 +1295,14 @@ msgstr "Pereiti į (%d) '%s'?"
msgid "Programming timer failed!"
msgstr "Nustatyti laikmačio nepavyko!"
-#, c-format
-msgid "in %02ldd"
-msgstr "per %02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "per %02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "per %02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "per %02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "per %02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "per %02ldm"
#, fuzzy
#~ msgid "Compare expression"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index e842870..6e48357 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -8,15 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse at urz.uni-hd.de>\n"
"Language-Team: Dutch <vdr at linuxtv.org>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
msgid "Channel groups"
msgstr "Kanaal groepen"
@@ -1293,17 +1293,14 @@ msgstr ""
msgid "Programming timer failed!"
msgstr "Programmeren timer mislukt!"
-#, c-format
-msgid "in %02ldd"
-msgstr "in %02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "in %02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "in %02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "in %02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "in %02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "in %02ldm"
#, fuzzy
#~ msgid "Compare expression"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index cade739..ea595f8 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Truls Slevigen <truls at slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr at linuxtv.org>\n"
+"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nn\n"
msgid "Channel groups"
msgstr ""
@@ -1233,15 +1233,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d493ea1..7b46579 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Michael Rakowski <mrak at gmx.de>\n"
"Language-Team: Polish <vdr at linuxtv.org>\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
msgid "Channel groups"
msgstr ""
@@ -1233,15 +1233,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9316882..67fa81c 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Paulo Lopes <pmml at netvita.pt>\n"
"Language-Team: Portuguese <vdr at linuxtv.org>\n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
msgid "Channel groups"
msgstr ""
@@ -1232,15 +1232,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 3b315f0..13d2a3d 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Lucian Muresan <lucianm at users.sourceforge.net>\n"
"Language-Team: Romanian <vdr at linuxtv.org>\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
msgid "Channel groups"
msgstr ""
@@ -1233,15 +1233,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 15a76f7..fa73059 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov at mail.ru>\n"
"Language-Team: Russian <vdr at linuxtv.org>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
msgid "Channel groups"
msgstr ""
@@ -1232,15 +1232,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 49296f6..52765d7 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: epgsearch\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2009-11-02 09:40+0100\n"
"Last-Translator: Milan Hrala <hrala.milan at gmail.com>\n"
"Language-Team: Slovak <hrala.milan at gmail.com>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
msgid "Channel groups"
msgstr "Skupiny kanálov"
@@ -1296,17 +1296,14 @@ msgstr ""
msgid "Programming timer failed!"
msgstr "Chyba programovania plánovača"
-#, c-format
-msgid "in %02ldd"
-msgstr "v %02ldd"
+#~ msgid "in %02ldd"
+#~ msgstr "v %02ldd"
-#, c-format
-msgid "in %02ldh"
-msgstr "v %02ldh"
+#~ msgid "in %02ldh"
+#~ msgstr "v %02ldh"
-#, c-format
-msgid "in %02ldm"
-msgstr "v %02ldm"
+#~ msgid "in %02ldm"
+#~ msgstr "v %02ldm"
#, fuzzy
#~ msgid "Compare expression"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 9a52cdc..d3e4087 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler at guest.arnes.si>\n"
"Language-Team: Slovenian <vdr at linuxtv.org>\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
msgid "Channel groups"
msgstr ""
@@ -1234,15 +1234,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 3d1d0d5..4b59f38 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Tomas Prybil <tomas at prybil.se>\n"
"Language-Team: Swedish <vdr at linuxtv.org>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
msgid "Channel groups"
msgstr ""
@@ -1234,15 +1234,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 18748e3..47852fd 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
-"POT-Creation-Date: 2012-11-11 20:16+0100\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73 at yahoo.de>\n"
"Language-Team: Turkish <vdr at linuxtv.org>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
msgid "Channel groups"
msgstr ""
@@ -1232,15 +1232,3 @@ msgstr ""
msgid "Programming timer failed!"
msgstr ""
-
-#, c-format
-msgid "in %02ldd"
-msgstr ""
-
-#, c-format
-msgid "in %02ldh"
-msgstr ""
-
-#, c-format
-msgid "in %02ldm"
-msgstr ""
diff --git a/uservars.h b/uservars.h
index 56ccb04..f098750 100644
--- a/uservars.h
+++ b/uservars.h
@@ -834,7 +834,7 @@ class cUserVars : public cList<cUserVar> {
string varName = SearchExtCat->name;
std::transform(varName.begin(), varName.end(), varName.begin(), tolower);
cExtEPGVar* extEPGVar = new cExtEPGVar(varName);
- extEPGVars[varName] = extEPGVar;
+ extEPGVars[extEPGVar->Name()] = extEPGVar;
SearchExtCat = SearchExtCats.Next(SearchExtCat);
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-epgsearch.git
More information about the pkg-vdr-dvb-changes
mailing list