From e5a2aa41c9762bda4ce7b987aba1bcfa1cee6f70 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 19 Aug 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.5.8=20-=20Added=20missing=20install-i18n=20?= =?UTF-8?q?to=20the=20install=20target=20in=20the=20Makefile=20(reported?= =?UTF-8?q?=20=20=20by=20Joachim=20Wilke).=20-=20Fixed=20a=20faulty=20comm?= =?UTF-8?q?ent=20in=20Make.config.template=20(reported=20by=20Marco=20Schl?= =?UTF-8?q?=C3=BC=C3=9Fler).=20-=20Improved=20i18n-to-gettext.pl=20(thanks?= =?UTF-8?q?=20to=20Matthias=20Schwarzott).=20-=20Moved=20the=20"all"=20tar?= =?UTF-8?q?get=20in=20plugin=20Makefiles=20before=20the=20"Implicit=20rule?= =?UTF-8?q?s",=20=20=20so=20that=20a=20plain=20"make"=20will=20compile=20e?= =?UTF-8?q?verything=20(suggested=20by=20Matthias=20=20=20Schwarzott).=20T?= =?UTF-8?q?he=20"newplugin"=20script=20has=20been=20changed=20accordingly.?= =?UTF-8?q?=20=20=20Plugin=20authors=20may=20want=20to=20change=20their=20?= =?UTF-8?q?Makefiles,=20too.=20-=20Added=20DESTDIR=20and=20PREFIX=20handli?= =?UTF-8?q?ng=20to=20the=20Makefile=20(thanks=20to=20Matthias=20=20=20Schw?= =?UTF-8?q?arzott).=20-=20Updated=20the=20Finnish=20OSD=20texts=20(thanks?= =?UTF-8?q?=20to=20Rolf=20Ahrenberg).=20-=20Added=20internationalization?= =?UTF-8?q?=20to=20the=20"skincurses"=20plugin=20(thanks=20to=20Rolf=20=20?= =?UTF-8?q?=20Ahrenberg).=20-=20Checking=20the=20string=20for=20NULL=20in?= =?UTF-8?q?=20I18nTranslate().=20-=20Updated=20the=20French=20OSD=20texts?= =?UTF-8?q?=20(thanks=20to=20Bruno=20Roussel).=20-=20Some=20optimizations?= =?UTF-8?q?=20in=20cDvbDevice::SetChannelDevice()=20(thanks=20to=20Tobias?= =?UTF-8?q?=20Bratfisch).=20-=20Optimized=20cMenuEditChrItem::Set()=20(tha?= =?UTF-8?q?nks=20to=20Tobias=20Bratfisch).=20-=20Optimized=20cNitFilter::P?= =?UTF-8?q?rocess()=20(thanks=20to=20Tobias=20Bratfisch).=20-=20Reduced=20?= =?UTF-8?q?the=20number=20of=20time(NULL)=20calls=20in=20vdr.c's=20main=20?= =?UTF-8?q?loop=20to=20a=20single=20call=20=20=20(thanks=20to=20Tobias=20B?= =?UTF-8?q?ratfisch).=20-=20Changed=20cBitmap::DrawText()=20to=20always=20?= =?UTF-8?q?draw=20the=20background=20unless=20ColorBg=20=20=20is=20clrTran?= =?UTF-8?q?sparent=20(thanks=20to=20Christoph=20Haubrich).=20-=20The=20"Se?= =?UTF-8?q?tup/OSD/Language"=20menu=20now=20only=20shows=20those=20languag?= =?UTF-8?q?es=20that=20actually=20=20=20have=20a=20locale=20(suggested=20b?= =?UTF-8?q?y=20Anssi=20Hannula).=20-=20Now=20using=20setenv()=20instead=20?= =?UTF-8?q?of=20setlocale()=20to=20set=20the=20language=20for=20gettext()?= =?UTF-8?q?=20=20=20(suggested=20by=20Anssi=20Hannula;=20thanks=20also=20t?= =?UTF-8?q?o=20Ludwig=20Nussel=20for=20a=20hint=20on=20using=20=20=20=5Fnl?= =?UTF-8?q?=5Fmsg=5Fcat=5Fcntr).=20-=20When=20scanning=20the=20locale=20di?= =?UTF-8?q?rectory,=20VDR=20now=20explicitly=20looks=20for=20a=20file=20na?= =?UTF-8?q?med=20=20=20vdr.mo.=20Text=20files=20for=20plugins=20are=20now?= =?UTF-8?q?=20named=20"vdr-name.mo",=20when=20"name"=20is=20the=20=20=20na?= =?UTF-8?q?me=20of=20the=20plugin.=20The=20"newplugin"=20script=20has=20be?= =?UTF-8?q?en=20changed=20accordingly,=20and=20=20=20plugin=20authors=20sh?= =?UTF-8?q?ould=20change=20their=20Makefiles,=20too.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLUGINS/src/skincurses/HISTORY | 6 ++++++ PLUGINS/src/skincurses/Makefile | 34 +++++++++++++++++++++++++++++++--- PLUGINS/src/skincurses/po/de_DE.po | 32 ++++++++++++++++++++++++++++++++ PLUGINS/src/skincurses/po/fi_FI.po | 32 ++++++++++++++++++++++++++++++++ PLUGINS/src/skincurses/skincurses.c | 10 +++++----- 5 files changed, 106 insertions(+), 8 deletions(-) create mode 100644 PLUGINS/src/skincurses/po/de_DE.po create mode 100644 PLUGINS/src/skincurses/po/fi_FI.po (limited to 'PLUGINS/src/skincurses') 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='' -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 +# This file is distributed under the same license as the VDR package. +# Klaus Schmidinger , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: VDR 1.5.7\n" +"Report-Msgid-Bugs-To: \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 \n" +"Language-Team: \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 +# This file is distributed under the same license as the VDR package. +# Rolf Ahrenberg , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: VDR 1.5.7\n" +"Report-Msgid-Bugs-To: \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 \n" +"Language-Team: \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 @@ -11,8 +11,8 @@ #include #include -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); -- cgit v1.2.3