Index: gnome-doc-utils/ChangeLog
diff -u gnome-doc-utils/ChangeLog:1.328 gnome-doc-utils/ChangeLog:1.329
--- gnome-doc-utils/ChangeLog:1.328	Mon Apr 17 22:49:53 2006
+++ gnome-doc-utils/ChangeLog	Sun Apr 23 18:44:38 2006
@@ -1,3 +1,10 @@
+2006-04-24  Sven Herzberg  <herzi@gnome-de.org>
+
+	* Makefile.am: install new files
+	* template-document.xml,
+	* template.make,
+	* template.omf.in: added template files (fixes bug 170483)
+
 2006-04-18  Vladimer Sichinava  <alinux@siena.linux.it>
 
         * configure.in: Added "ka" (Georgian) to ALL_LINGUAS
Index: gnome-doc-utils/Makefile.am
diff -u gnome-doc-utils/Makefile.am:1.22 gnome-doc-utils/Makefile.am:1.23
--- gnome-doc-utils/Makefile.am:1.22	Sun Nov 27 16:10:11 2005
+++ gnome-doc-utils/Makefile.am	Sun Apr 23 18:44:38 2006
@@ -19,6 +19,11 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnome-doc-utils.pc
 
+pkgdata_DATA=\
+	template.omf.in \
+	template.make \
+	template-document.xml
+
 bin_SCRIPTS = gnome-doc-prepare
 endif
 
@@ -29,6 +34,7 @@
 	$(aclocal_DATA)					\
 	$(share_DATA)					\
 	$(pkgconfig_DATA)				\
+	$(pkgdata_DATA)					\
 	COPYING.GPL					\
 	COPYING.LGPL					\
 	bootstrap.make					\
Index: gnome-doc-utils/template-document.xml
diff -u /dev/null gnome-doc-utils/template-document.xml:1.1
--- /dev/null	Tue May 23 07:13:48 2006
+++ gnome-doc-utils/template-document.xml	Sun Apr 23 18:44:38 2006
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<article id="@DOCUMENT@">
+  <articleinfo>
+    <title>Document title</title>
+    <authorgroup>
+      <author>
+	<firstname>My name</firstname> <surname>Last name</surname>
+	<affiliation>
+	  <address>
+	    <email>@USERNAME@@@DOMAIN@</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>@YEAR@</year> <holder>My Full Name</holder>
+    </copyright>
+    <publisher>
+      <publishername>GNOME Documentation Project</publishername>
+    </publisher>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <revhistory>
+      <revision>
+        <revnumber>0.1</revnumber>
+        <date>@DATE@</date>
+      </revision>
+    </revhistory>
+  </articleinfo>
+
+  <section id="intro">
+    <title>Introduction.</title>
+      <para>Foo.</para>
+  </section>
+ 
+   <section id="end">
+      <title>The End.</title> 
+      <para>Bar.</para>
+   </section>
+
+</article>
Index: gnome-doc-utils/template.make
diff -u /dev/null gnome-doc-utils/template.make:1.1
--- /dev/null	Tue May 23 07:13:48 2006
+++ gnome-doc-utils/template.make	Sun Apr 23 18:44:38 2006
@@ -0,0 +1,8 @@
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+
+DOC_MODULE = @DOCUMENT@
+DOC_INCLUDES = legal.xml
+
+DOC_LINGUAS = 
+
Index: gnome-doc-utils/template.omf.in
diff -u /dev/null gnome-doc-utils/template.omf.in:1.1
--- /dev/null	Tue May 23 07:13:48 2006
+++ gnome-doc-utils/template.omf.in	Sun Apr 23 18:44:38 2006
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8'?>
+<omf>
+  <resource>
+    <date>@DATE@</date>
+    <subject category="System|Other"/>
+    <type>manual</type>
+    <relation seriesid="@SERIESID@"/>
+  </resource>
+</omf>
Index: gnome-doc-utils/xml2po/ChangeLog
diff -u gnome-doc-utils/xml2po/ChangeLog:1.51 gnome-doc-utils/xml2po/ChangeLog:1.52
--- gnome-doc-utils/xml2po/ChangeLog:1.51	Tue Apr 11 12:19:36 2006
+++ gnome-doc-utils/xml2po/ChangeLog	Sun May 14 03:47:56 2006
@@ -1,3 +1,8 @@
+2006-05-14  Danilo Šegan  <danilo@gnome.org>
+
+	* modes/docbook.py (docbookXmlMode.postProcessXmlTranslation):
+	Treat year as utf-8 as well.
+
 2006-04-11  Danilo Šegan  <danilo@gnome.org>
 
         * modes/docbook.py: Check if "translators-credits" is translated.
Index: gnome-doc-utils/xml2po/modes/docbook.py
diff -u gnome-doc-utils/xml2po/modes/docbook.py:1.11 gnome-doc-utils/xml2po/modes/docbook.py:1.12
--- gnome-doc-utils/xml2po/modes/docbook.py:1.11	Tue Apr 11 12:19:37 2006
+++ gnome-doc-utils/xml2po/modes/docbook.py	Sun May 14 03:47:57 2006
@@ -178,7 +178,7 @@
                     else:
                         ai.addChild(copy)
                     if match.group(3):
-                        copy.newChild(None, "year", match.group(3))
+                        copy.newChild(None, "year", match.group(3).encode('utf-8'))
                     if match.group(1) and match.group(2):
                         holder = match.group(1)+"(%s)" % match.group(2)
                     elif match.group(1):