[SCM] vdr-plugin-prefermenu packaging repository branch, master, updated. debian/0.6.6-35-2-g284294d
etobi
git at e-tobi.net
Sun Apr 22 10:50:24 UTC 2012
The following commit has been merged in the master branch:
commit 284294dd746bd6bb0268768fd1d90f7e7ac0bb9f
Author: etobi <git at e-tobi.net>
Date: Sun Apr 22 12:45:18 2012 +0200
VDR 1.7.27 compatibility
diff --git a/debian/patches/series b/debian/patches/series
index e0ab7bd..ca18a94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_Makefile-fPIC-fix.patch
02_Makefile-GNU_SOURCE-fix.patch
90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.patch
+vdr_1.7.27.patch
diff --git a/debian/patches/vdr_1.7.27.patch b/debian/patches/vdr_1.7.27.patch
new file mode 100644
index 0000000..cf5a385
--- /dev/null
+++ b/debian/patches/vdr_1.7.27.patch
@@ -0,0 +1,1352 @@
+Index: vdr-plugin-prefermenu/Makefile
+===================================================================
+--- vdr-plugin-prefermenu.orig/Makefile 2012-04-22 12:46:04.000000000 +0200
++++ vdr-plugin-prefermenu/Makefile 2012-04-22 12:48:08.000000000 +0200
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
+@@ -46,6 +46,7 @@
+ endif
+
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
++DEFINES += -D_GNU_SOURCE
+
+ ### The object files (add further files here):
+
+@@ -65,9 +66,34 @@
+
+ -include $(DEPFILE)
+
++### 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))))))
++I18Npot = $(PODIR)/$(PLUGIN).pot
++
++%.mo: %.po
++ msgfmt -c -o $@ $<
++
++$(I18Npot): $(wildcard *.c)
++ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-tobi.net>' -o $@ $^
++
++%.po: $(I18Npot)
++ msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
++ @touch $@
++
++$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
++ @mkdir -p $(dir $@)
++ cp $< $@
++
++.PHONY: i18n
++i18n: $(I18Nmsgs)
++
+ ### Targets:
+
+-all: libvdr-$(PLUGIN).so
++all: libvdr-$(PLUGIN).so i18n
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+@@ -82,4 +108,5 @@
+ @echo Distribution package created as $(PACKAGE).tgz
+
+ clean:
++ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+Index: vdr-plugin-prefermenu/i18n.c.orig
+===================================================================
+--- vdr-plugin-prefermenu.orig/i18n.c.orig 2012-04-22 12:46:04.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,214 +0,0 @@
+-/*
+- * PreferMenu plugin to VDR (C++)
+- *
+- * (C) 2001,2002 Stefan Huelswitt <huels at iname.com>
+- *
+- * This code is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This code is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+- */
+-
+-#include "i18n.h"
+-
+-const tI18nPhrase Phrases[] = {
+-/*
+- * French translations provided by Maxime Guilbot <maxime.guilbot at orange.fr>
+- */
+- { "Channel", // ENGLISH
+- "Kanal", // GERMAN
+- "", // TODO
+- "Canale", // ITALIAN
+- "Kanaal", // NL
+- "", // TODO
+- "Chaînes", // FR
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "Czatoma", // HU
+- },
+- { "Origin X", // EN
+- "Position X", // GERMAN
+- "", // TODO
+- "Origine X", // ITALIAN
+- "X positie", // NL
+- "", // TODO
+- "Origine X", // FR
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "X helyzet", // HU
+- },
+- { "Origin Y", // EN
+- "Position Y", // GERMAN
+- "", // TODO
+- "Origine Y", // ITALIAN
+- "Y positie", // NL
+- "", // TODO
+- "Origine Y", // FR
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "Y helyzet", // HU
+- },
+- { "Width", //EN
+- "Breite", // GER
+- "", // TODO
+- "Larghezza", // ITALIAN
+- "Breedte", // NL
+- "",
+- "Largeur",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "Szélesség", // HU
+- },
+- { "AddChannel",
+- "Kanal hinzufügen", // GER
+- "", // TODO
+- "Aggiungi Canale", // ITALIAN
+- "iKanaal bijdoen", // NL
+- "", // TODO
+- "Nouvelle chaîne", // FR
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "Adj csatornát hozza", // HU
+- },
+- { "RemoveChannel",
+- "Kanal löschen", // GER
+- "", // TODO
+- "Rimuovi Canale", // ITALIAN
+- "Kanaal wegneemen", // NL
+- "", // TODO
+- "Supprime chaîne", //FR
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "Fok csatornát", // HU
+- },
+-/*
+- { "Background opacity",
+- "Rand transparenz", // TODO
+- "", // TODO
+- "Alpha Bordo 1", // ITALIAN
+- "", // TODO
+- "", // TODO
+- "Opacité du fond",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- },
+- { "Selected channel opacity",
+- "", // TODO
+- "", // TODO
+- "Alpha Bordo 2", // ITALIAN
+- "", // TODO
+- "", // TODO
+- "Opacité de la chaîne selectionnée",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- },
+- { "Border opacity",
+- "Alpha Rand", // GER
+- "", // TODO
+- "AlphaBordo", // ITALIAN
+- "Alpha kant", // NL
+- "", // TODO
+- "Opacité du contour", // FR
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "Alpha szegély", // HU
+- },
+-*/
+- { "Sort by",
+- "", // TODO
+- "", // TODO
+- "Ordina Per", // ITALIAN
+- "", // TODO
+- "", // TODO
+- "Trier par",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- },
+- { "None",
+- "", // TODO
+- "", // TODO
+- "Nessuno", // ITALIAN
+- "", // TODO
+- "", // TODO
+- "Aucun",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- },
+- { "Name",
+- "", // TODO
+- "", // TODO
+- "Nome", // ITALIAN
+- "", // TODO
+- "", // TODO
+- "Nom",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- },
+- { "As entered",
+- "", // TODO
+- "", // TODO
+- "Non Ordinati", // ITALIAN
+- "", // TODO
+- "", // TODO
+- "Tel que saisi",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- },
+- { "Close on switch",
+- "", // TODO
+- "", // TODO
+- "Chiudi al cambio canale", // ITALIAN
+- "", // TODO
+- "", // TODO
+- "Fermer le menu en zappant",
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- "", // TODO
+- },
+-
+- { NULL }
+-};
+Index: vdr-plugin-prefermenu/po/ca_ES.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/ca_ES.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,43 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Marc Rovira Vall <tm05462 at salleURL.edu>, 2003
++# Ramon Roca <ramon.roca at xcombo.com>, 2003
++# Jordi Vilà <jvila at tinet.org>, 2003
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Jordi Vilà <jvila at tinet.org>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/cs_CZ.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/cs_CZ.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Vladimír Bárta <vladimir.barta at k2atmitec.cz>, 2006
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Vladimír Bárta <vladimir.barta at k2atmitec.cz>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/da_DK.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/da_DK.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Mogens Elneff <mogens at elneff.dk>, 2004
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Mogens Elneff <mogens at elneff.dk>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/de_DE.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/de_DE.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Klaus Schmidinger <kls at tvdr.de>, 2000
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Klaus Schmidinger <kls at tvdr.de>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr "Position X"
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr "Position Y"
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr "Breite"
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/el_GR.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/el_GR.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Dimitrios Dimitrakos <mail at dimitrios.de>, 2002
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Dimitrios Dimitrakos <mail at dimitrios.de>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-7\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr "X helyzet"
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr "Y helyzet"
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr "Szélesség"
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/es_ES.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/es_ES.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Ruben Nunez Francisco <ruben.nunez at tang-it.com>, 2002
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Ruben Nunez Francisco <ruben.nunez at tang-it.com>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/et_EE.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/et_EE.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Arthur Konovalov <kasjas at hot.ee>, 2004
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Arthur Konovalov <kasjas at hot.ee>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-13\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/fi_FI.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/fi_FI.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,44 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Hannu Savolainen <hannu at opensound.com>, 2002
++# Jaakko Hyvätti <jaakko at hyvatti.iki.fi>, 2002
++# Niko Tarnanen <niko.tarnanen at hut.fi>, 2003
++# Rolf Ahrenberg <rahrenbe at cc.hut.fi>, 2003
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Rolf Ahrenberg <rahrenbe at cc.hut.fi>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/fr_FR.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/fr_FR.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,44 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Jean-Claude Repetto <jc at repetto.org>, 2001
++# Olivier Jacques <jacquesolivier at hotmail.com>, 2003
++# Gregoire Favre <greg at magma.unil.ch>, 2003
++# Nicolas Huillard <nhuillard at e-dition.fr>, 2005
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Nicolas Huillard <nhuillard at e-dition.fr>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr "Origine X"
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr "Origine Y"
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr "Largeur"
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr "Fermer le menu en zappant"
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr "Trier par"
+Index: vdr-plugin-prefermenu/po/hr_HR.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/hr_HR.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,42 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Drazen Dupor <drazen.dupor at dupor.com>, 2004
++# Dino Ravnic <dino.ravnic at fer.hr>, 2004
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Drazen Dupor <drazen.dupor at dupor.com>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/hu_HU.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/hu_HU.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,42 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Istvan Koenigsberger <istvnko at hotmail.com>, 2002
++# Guido Josten <guido.josten at t-online.de>, 2002
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Istvan Koenigsberger <istvnko at hotmail.com>, Guido Josten <guido.josten at t-online.de>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/it_IT.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/it_IT.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,43 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Alberto Carraro <bertocar at tin.it>, 2001
++# Antonio Ospite <ospite at studenti.unina.it>, 2003
++# Sean Carlos <seanc at libero.it>, 2005
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Sean Carlos <seanc at libero.it>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr "Origine X"
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr "Origine Y"
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr "Larghezza"
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr "Chiudi al cambio canale"
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr "Ordina Per"
+Index: vdr-plugin-prefermenu/po/nl_NL.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/nl_NL.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,43 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Arnold Niessen <niessen at iae.nl> <arnold.niessen at philips.com>, 2001
++# Hans Dingemans <hans.dingemans at tacticalops.nl>, 2003
++# Maarten Wisse <Maarten.Wisse at urz.uni-hd.de>, 2005
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Maarten Wisse <Maarten.Wisse at urz.uni-hd.de>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr "X positie"
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr "Y positie"
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr "Breedte"
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/nn_NO.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/nn_NO.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,42 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Jørgen Tvedt <pjtvedt at online.no>, 2001
++# Truls Slevigen <truls at slevigen.no>, 2002
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Truls Slevigen <truls at slevigen.no>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/pl_PL.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/pl_PL.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Michael Rakowski <mrak at gmx.de>, 2002
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Michael Rakowski <mrak at gmx.de>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/pt_PT.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/pt_PT.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Paulo Lopes <pmml at netvita.pt>, 2001
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Paulo Lopes <pmml at netvita.pt>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/ro_RO.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/ro_RO.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,42 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Paul Lacatus <paul at campina.iiruc.ro>, 2002
++# Lucian Muresan <lucianm at users.sourceforge.net>, 2004
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Lucian Muresan <lucianm at users.sourceforge.net>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/ru_RU.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/ru_RU.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Vyacheslav Dikonov <sdiconov at mail.ru>, 2004
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Vyacheslav Dikonov <sdiconov at mail.ru>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-5\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/sl_SI.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/sl_SI.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,42 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Miha Setina <mihasetina at softhome.net>, 2000
++# Matjaz Thaler <matjaz.thaler at guest.arnes.si>, 2003
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Matjaz Thaler <matjaz.thaler at guest.arnes.si>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/sv_SE.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/sv_SE.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,42 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Tomas Prybil <tomas at prybil.se>, 2002
++# Jan Ekholm <chakie at infa.abo.fi>, 2003
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Tomas Prybil <tomas at prybil.se>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/po/tr_TR.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr-plugin-prefermenu/po/tr_TR.po 2012-04-22 12:48:08.000000000 +0200
+@@ -0,0 +1,41 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls at tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Oktay Yolgeçen <oktay_73 at yahoo.de>, 2007
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.5.7\n"
++"Report-Msgid-Bugs-To: vdr-tobi.net\n"
++"POT-Creation-Date: 2012-04-22 12:35+0200\n"
++"PO-Revision-Date: 2012-04-22 12:35+0200\n"
++"Last-Translator: Oktay Yolgeçen <oktay_73 at yahoo.de>\n"
++"Language-Team: <vdr at linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-9\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: prefersetup.c:111
++msgid "Origin X"
++msgstr ""
++
++#: prefersetup.c:112
++msgid "Origin Y"
++msgstr ""
++
++#: prefersetup.c:113
++msgid "Width"
++msgstr ""
++
++#: prefersetup.c:114
++msgid "Number of channels"
++msgstr ""
++
++#: prefersetup.c:118
++msgid "Close on switch"
++msgstr ""
++
++#: prefersetup.c:119
++msgid "Sort by"
++msgstr ""
+Index: vdr-plugin-prefermenu/prefermenu.c
+===================================================================
+--- vdr-plugin-prefermenu.orig/prefermenu.c 2012-04-22 12:46:04.000000000 +0200
++++ vdr-plugin-prefermenu/prefermenu.c 2012-04-22 12:48:08.000000000 +0200
+@@ -75,6 +75,7 @@
+ }
+ // Clean up the file with current VDR channels.conf
+ PreferedChannelsList.Save();
++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+ config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE;
+ return new cPreferOsd;
+ }
+Index: vdr-plugin-prefermenu/preferosd.c
+===================================================================
+--- vdr-plugin-prefermenu.orig/preferosd.c 2012-04-22 12:46:04.000000000 +0200
++++ vdr-plugin-prefermenu/preferosd.c 2012-04-22 12:48:08.000000000 +0200
+@@ -60,7 +60,8 @@
+ }
+ osd=cOsdProvider::NewOsd(config.originx, config.originy);
+ if (osd) {
+- tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4};
++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
++ tArea Area = { 0, 0, ((config.width+LINEHEIGHT) & ~0x01) - 1, config.height-1, 4};
+ osd->SetAreas(&Area, 1);
+ DrawPreferMenu(0,0);
+ DisplayPreferMenu();
+@@ -168,6 +169,7 @@
+ {
+ if (current > 1) {
+ current -= 1;
++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+ DrawPreferMenu(-LINEHEIGHT,1);
+ DisplayPreferMenu();
+ //DrawPreferMneu(-10,1);
+@@ -181,6 +183,7 @@
+ {
+ if (current < number) {
+ current += 1;
++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height();
+ DrawPreferMenu(+LINEHEIGHT,-1);
+ DisplayPreferMenu();
+ //DrawPreferMenu(+10,-1);
+@@ -315,6 +318,8 @@
+
+ void cPreferOsd::DrawPreferMenu(int delta, int highlight)
+ {
++ const cFont *font = cFont::GetFont(fontOsd);
++ const int LINEHEIGHT = font->Height();
+
+ int middle = int(config.height/2) + config.height%2;
+
+@@ -390,6 +395,8 @@
+
+ void cPreferOsd::DrawChannelsNames(int delta)
+ {
++ const cFont *font = cFont::GetFont(fontOsd);
++ const int LINEHEIGHT = font->Height();
+
+ // XXX The margin is hardcoded for now
+ // TODO: make it more flexible
+Index: vdr-plugin-prefermenu/preferosd.h
+===================================================================
+--- vdr-plugin-prefermenu.orig/preferosd.h 2012-04-22 12:46:04.000000000 +0200
++++ vdr-plugin-prefermenu/preferosd.h 2012-04-22 12:48:08.000000000 +0200
+@@ -4,8 +4,6 @@
+ #include <vdr/plugin.h>
+
+ static const int BORDERSIZE = 2;
+-static const cFont *font = cFont::GetFont(fontOsd);
+-static const int LINEHEIGHT = font->Height();
+
+
+ class cPreferOsd : public cOsdObject {
+Index: vdr-plugin-prefermenu/prefersetup.c
+===================================================================
+--- vdr-plugin-prefermenu.orig/prefersetup.c 2012-04-22 12:46:04.000000000 +0200
++++ vdr-plugin-prefermenu/prefersetup.c 2012-04-22 12:48:08.000000000 +0200
+@@ -11,7 +11,7 @@
+
+ #include "prefersetup.h"
+
+-static const char *SortOpt[] = { "As entered", "None", "Name", NULL };
++static const char *SortOpt[] = { trNOOP("As entered"), trNOOP("None"), trNOOP("Name"), NULL };
+
+ // --- cMenuEditSortByItem --------------------------------------------------
+
--
vdr-plugin-prefermenu packaging repository
More information about the pkg-vdr-dvb-changes
mailing list