From: Mario Blättermann <mariobl@gnome.org>
Date: Thu, 9 Dec 2010 11:57:11 +0000 (+0100)
Subject: Initial page for Hama templates
X-Git-Tag: glabels-2_3_1~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0c6ebf2102d079a4480ba06aaf1842f71e1a234a;p=glabels

Initial page for Hama templates
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 19be3471..7919f2c7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -232,6 +232,7 @@ data/schemas/org.gnome.glabels-3.gschema.xml.in.in
 [type: gettext/xml]templates/decadry-iso-templates.xml
 [type: gettext/xml]templates/dymo-other-templates.xml
 [type: gettext/xml]templates/geha-iso-templates.xml
+[type: gettext/xml]templates/hama-iso-templates.xml
 [type: gettext/xml]templates/herma-iso-templates.xml
 [type: gettext/xml]templates/jac-iso-templates.xml
 [type: gettext/xml]templates/maco-us-templates.xml
diff --git a/templates/Makefile.am b/templates/Makefile.am
index 8a36a41a..43af1bff 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -19,6 +19,7 @@ templates_DATA = \
 	decadry-iso-templates.xml \
 	dymo-other-templates.xml \
 	geha-iso-templates.xml	\
+	hama-iso-templates.xml	\
 	herma-iso-templates.xml \
 	jac-iso-templates.xml \
 	maco-us-templates.xml \
diff --git a/templates/jac-iso-templates.xml b/templates/jac-iso-templates.xml
index 0f25ad4a..ecc3401e 100644
--- a/templates/jac-iso-templates.xml
+++ b/templates/jac-iso-templates.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Glabels-templates xmlns="http://snaught.com/glabels/3.0/">
+<Glabels-templates xmlns="http://glabels.org/xmlns/2.3/">
 
   <!-- ******************************************************************** -->
   <!-- JAC products.	                                                    -->
diff --git a/templates/vendors.xml b/templates/vendors.xml
index 56cde68e..3f479521 100644
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -12,6 +12,7 @@
   <Vendor name="Geha"           url="http://www.geha.de/index.php?id=1041"     		/>
   <Vendor name="Great Gizmos"   url="http://www.greatgizmos.co.uk/product_ranges.html"	/>
   <Vendor name="Hema"           url="http://hema.nl/nl-nl/winkel/kantoor/papier.aspx"	/>
+  <Vendor name="Hama"           url="http://www.hama.de/produkte/pc_+_notebook/buerobedarf/index.hsp"	/>
   <Vendor name="Herma"          url="http://www.herma.de/"            			/>
   <Vendor name="Impact"         url="http://www.impactlabel.com/"      			/>
   <Vendor name="Kingdom"        url="http://www.kingdom.com/Kingdom-Label-Center-s/20.htm"/>