- Removed the need for build of CVS sources to require Locale::PO.

  It is now only required, when changeing translations and using
  VDR < 1.5.7

5 files changed, 24 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index f2ccee6..977532f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.45 2007/08/19 22:25:44 tadi Exp $
+# $Id: Makefile,v 1.46 2007/08/21 21:12:27 tadi Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -118,8 +118,8 @@ i18n: $(I18Nmo)
 	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(I18Nvdrmo);\
 	    done
 
-i18n-generated.h: i18n-template.h $(I18Npot) $(I18Npo) buildutil/pot2i18n.pl
-	buildutil/pot2i18n.pl $(I18Npot) i18n-template.h > $@
+generate-i18n: i18n-template.h $(I18Npot) $(I18Npo) buildutil/pot2i18n.pl
+	buildutil/pot2i18n.pl $(I18Npot) i18n-template.h > i18n-generated.h
 
 ### Targets:
 
diff --git a/README b/README
index c21043d..c271cd9 100644
--- a/README
+++ b/README
@@ -30,24 +30,36 @@ Requirements:
 =============
 
 VDR >= 1.4.0-2
-Tntnet >= 1.5.3		- http://www.tntnet.org/download.hms
-Cxxtools >= 1.4.3	- http://www.tntnet.org/download.hms
-gcc >= 3.1
 
+gcc >= 3.1
 if gcc < 4.0:
 boost >= 1.32.0		- http://www.boost.org
 
-Locale::PO 		- perl module from CPAN www.cpan.org
+Tntnet >= 1.5.3		- http://www.tntnet.org/download.hms
+Cxxtools >= 1.4.3	- http://www.tntnet.org/download.hms
 
 Tntnet provides basic webserver functions for live and needs cxxtools.
 Boost provides some data structures we need. While currently relying on the
 full blown package we might provide a stripped down version in the future.
 
+If you want to regenerate the backward compatible i18n-generated.h
+header file (for VDR Version prior to 1.5.7) for i18n you also need:
+
+Locale::PO 		- perl module from CPAN www.cpan.org
+
 How to get Locale::PO
 - Use search function on www.cpan.org to obtain module.
 - Check if your distribution provides the package.
   (e.g. in Debian the package name is liblocale-po-perl)
 
+The default provided (via CVS) i18n-generated.h header contains all
+translations from CVS. If you added new ones in your language specific
+.mo file and still want to use an VDR older than version 1.5.7 you
+must regenerate i18n-generated.h by calling make with the target
+generate-i18n. Only in this case you need to have Locale::PO installed
+on your system. Users that just want to stay on bleeding development
+edge of live do not need Locale::PO installed.
+
 
 Installation:
 =============
diff --git a/i18n-generated.h b/i18n-generated.h
index 4836edd..e7c6989 100644
--- a/i18n-generated.h
+++ b/i18n-generated.h
@@ -1,9 +1,9 @@
 /*
   	WARNING: automaticaly generated content. Changes will get lost!
 
-    If this file is 'i18n-generated.cpp' then it *realy* is automaticaly
+    If this file is 'i18n-generated.h' then it *realy* is automaticaly
 	generated.
-    If this file is 'i18n-template.cpp' then it is the base for the
+    If this file is 'i18n-template.h' then it is the base for the
     autogeneration of the other file.
 
 	This file is part of live.
diff --git a/i18n-template.h b/i18n-template.h
index 12a577d..189ee5e 100644
--- a/i18n-template.h
+++ b/i18n-template.h
@@ -1,9 +1,9 @@
 /*
   	WARNING: automaticaly generated content. Changes will get lost!
 
-    If this file is 'i18n-generated.cpp' then it *realy* is automaticaly
+    If this file is 'i18n-generated.h' then it *realy* is automaticaly
 	generated.
-    If this file is 'i18n-template.cpp' then it is the base for the
+    If this file is 'i18n-template.h' then it is the base for the
     autogeneration of the other file.
 
 	This file is part of live.
diff --git a/po/live.pot b/po/live.pot
index 69d09a5..cda8ee7 100644
--- a/po/live.pot
+++ b/po/live.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-08-19 21:11+0200\n"
+"POT-Creation-Date: 2007-08-21 23:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"