New release version 1.2v1.2

9 files changed, 42 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c915306
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.dependencies
+*.o
+*.so*
+*.pot
+*.tgz
+*~
+debian
diff --git a/HISTORY b/HISTORY
index 1c629c5..a0193e8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,27 @@
 VDR Plugin 'text2skin' Revision History
 ---------------------------------------
 
+2009-06-01: Version 1.2
+
+- Moved to http://projects.vdr-developer.org/projects/show/plg-text2skin
+  as community maintained project using a GIT archive
+- adopted to newer VDR >= 1.3.38
+- fixed possible buffer overflow in xml reading
+- Fix build with gcc 4.3's cleaned up C++ headers
+- Make compatible with VDR >= 1.5.4
+- Added gettext support (VDR >= 1.5.7)
+  The skins have to be patched, too. The patches for DeepBlue, Enigma and
+  enElchi are ready for download from http://toms-cafe.de/vdr/download/.
+  To patch other skins the Makefile from these patches could be used
+  without any changes, missing translation entries should be added to the
+  *.skin file (e.g. as comments <!-- trans('Volume') -->)
+- Fix font problems with libfreetype6 >= 2.2.1
+- Replaced 'uint64' with 'uint64_t' to avoid problems on 64-bit machines
+- Quick fix for VDR >= 1.7.3
+- Use pkg-config
+- Convert docs to UTF-8
+- Updated project homepage url in README
+
 2005-06-xx: Version 1.1
 
 - fixed crash due to uninitialized pointer (thanks to Frank Enderle)
diff --git a/README b/README
index 0a274b3..54f72fc 100644
--- a/README
+++ b/README
@@ -2,9 +2,9 @@ This is a "plugin" for the Video Disk Recorder (VDR).
 
 Written by:                  Sascha Volkenandt <sascha@akv-soft.de>
 
-Project's homepage:          http://www.magoa.net/linux/contrib/
+Project's homepage:          http://linux.kompiliert.net/index.php?view=text2skin
 
-Latest version available at: http://www.magoa.net/linux/contrib/
+Latest version available at: http://projects.vdr-developer.org/projects/show/plg-text2skin
 
 See the file COPYING for license information.
 
diff --git a/README.de b/README.de
index 2d6a0b3..c3e3f9a 100644
--- a/README.de
+++ b/README.de
@@ -2,9 +2,9 @@ Dies ist ein "plugin" für den Video Disk Recorder (VDR).
 
 Geschrieben von:               Sascha Volkenandt <sascha@akv-soft.de>
 
-Projekthomepage:               http://www.magoa.net/linux/contrib/
+Projekthomepage:               http://linux.kompiliert.net/index.php?view=text2skin
 
-Letzte Version verfügbar auf: http://www.magoa.net/linux/contrib/
+Letzte Version verfügbar auf: http://projects.vdr-developer.org/projects/show/plg-text2skin
 
 Siehe COPYING für Linzensierungsinformationen.
 
diff --git a/common.c b/common.c
index f45ed1c..785e74a 100644
--- a/common.c
+++ b/common.c
@@ -32,7 +32,7 @@ const char *ChannelName(const cChannel *Channel, int Number)
 	if (Channel)
 		snprintf(buffer, sizeof(buffer), "%s", Channel->Name());
 	else if (!Number)
-		snprintf(buffer, sizeof(buffer), "%s", tr("*** Invalid Channel ***"));
+		snprintf(buffer, sizeof(buffer), "%s", trVDR("*** Invalid Channel ***"));
 
 #if VDRVERSNUM < 10315
 	char *ptr;
@@ -54,7 +54,7 @@ const char *ChannelShortName(const cChannel *Channel, int Number)
 		snprintf(buffer, sizeof(buffer), "%s", Channel->ShortName(true));
 #endif
 	else if (!Number)
-		snprintf(buffer, sizeof(buffer), "%s", tr("*** Invalid Channel ***"));
+		snprintf(buffer, sizeof(buffer), "%s", trVDR("*** Invalid Channel ***"));
 
 #if VDRVERSNUM < 10315
 	char *ptr;
diff --git a/i18n.h b/i18n.h
index 642e53b..821e7c1 100644
--- a/i18n.h
+++ b/i18n.h
@@ -11,6 +11,7 @@
 
 #if VDRVERSNUM < 10507
 #define trNOOP(s) (s)
+#define trVDR(s) tr(s)
 
 extern const tI18nPhrase Phrases[];
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 1f73a85..287601e 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -3,23 +3,18 @@
 # This file is distributed under the same license as the vdr-text2skin package.
 # Sascha Volkenandt <sascha@akv-soft.de>, 2004, 2005.
 #
-# $Id$
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-text2skin 1.0\n"
+"Project-Id-Version: vdr-text2skin 1.2\n"
 "Report-Msgid-Bugs-To: <sascha@akv-soft.de>\n"
-"POT-Creation-Date: 2008-01-26 14:59+0100\n"
-"PO-Revision-Date: 2008-01-26 12:38+0100\n"
+"POT-Creation-Date: 2009-06-01 17:47+0200\n"
+"PO-Revision-Date: 2009-06-01 17:47+0200\n"
 "Last-Translator: Sascha Volkenandt <sascha@akv-soft.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"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Skin too large or incorrectly aligned"
 msgstr "Skin zu groß oder nicht korrekt ausgerichtet"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 3b99a90..a8f268c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -3,23 +3,18 @@
 # This file is distributed under the same license as the vdr-text2skin package.
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2004, 2005.
 #
-# $Id$
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-text2skin 1.0\n"
+"Project-Id-Version: vdr-text2skin 1.2\n"
 "Report-Msgid-Bugs-To: <sascha@akv-soft.de>\n"
-"POT-Creation-Date: 2008-01-26 14:59+0100\n"
-"PO-Revision-Date: 2008-01-26 12:38+0100\n"
+"POT-Creation-Date: 2009-06-01 17:47+0200\n"
+"PO-Revision-Date: 2009-06-01 17:47+0200\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"
 
-msgid "*** Invalid Channel ***"
-msgstr ""
-
 msgid "Skin too large or incorrectly aligned"
 msgstr "Ulkoasu on liian suuri tai väärin asemoitu"
 
diff --git a/text2skin.c b/text2skin.c
index f28ace9..f45496d 100644
--- a/text2skin.c
+++ b/text2skin.c
@@ -13,7 +13,7 @@
 #include "loader.h"
 #include "status.h"
 
-const char *cText2SkinPlugin::VERSION        = "1.1-cvs";
+const char *cText2SkinPlugin::VERSION        = "1.2";
 const char *cText2SkinPlugin::SKINVERSION    = "1.0";
 const char *cText2SkinPlugin::DESCRIPTION    = trNOOP("Loader for text-based skins");