From: Mario Blättermann <mariobl@gnome.org>
Date: Thu, 9 Dec 2010 12:24:54 +0000 (+0100)
Subject: Added more Hama products, added a new category »photo« and assigned it to some products
X-Git-Tag: glabels-2_3_1~59
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4bd003abfb60e80544e6d824dfccf2d7cbc1ac2a;p=glabels

Added more Hama products, added a new category »photo« and assigned it to some products
---

diff --git a/help/C/mancreate.page b/help/C/mancreate.page
index cd2a57b0..34c681ee 100644
--- a/help/C/mancreate.page
+++ b/help/C/mancreate.page
@@ -262,6 +262,7 @@
               <item><p><code its:translate="no">media</code></p></item>
               <item><p><code its:translate="no">mail</code></p></item>
               <item><p><code its:translate="no">foldable</code></p></item>
+              <item><p><code its:translate="no">photo</code></p></item>
             </list>
 
 
diff --git a/templates/categories.xml b/templates/categories.xml
index 4f1c2499..903f37d5 100644
--- a/templates/categories.xml
+++ b/templates/categories.xml
@@ -12,5 +12,6 @@
   <Category id="media"	          _name="CD/DVD or other media"/>
   <Category id="mail"             _name="Mailing/shipping products"/>
   <Category id="foldable"         _name="Foldable cards"/>
+  <Category id="photo"            _name="Photo products"/>
 
 </Glabels-categories>
diff --git a/templates/geha-iso-templates.xml b/templates/geha-iso-templates.xml
index 6fb68474..4a2ea533 100644
--- a/templates/geha-iso-templates.xml
+++ b/templates/geha-iso-templates.xml
@@ -208,6 +208,7 @@
   <Template brand="Geha" part="Z40" size="A4" _description="Photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30569"/>
     <Label-rectangle id="0" width="88.9mm" height="127mm" round="0mm" x_waste="2.5mm" y_waste="2mm">
       <Markup-margin size="0mm"/>
@@ -224,6 +225,7 @@
   <Template brand="Geha" part="Z41" size="A4" _description="Photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30545"/>
     <Label-rectangle id="0" width="150mm" height="100mm" round="0mm" x_waste="30mm" y_waste="24mm">
       <Markup-margin size="0mm"/>
@@ -240,6 +242,7 @@
   <Template brand="Geha" part="Z45" size="A4" _description="Photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30521"/>
     <Label-rectangle id="0" width="178mm" height="127mm" round="0mm" x_waste="16mm" y_waste="3mm">
       <Markup-margin size="0mm"/>
@@ -256,6 +259,7 @@
   <Template brand="Geha" part="Z46" size="A4" _description="Passport photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30538"/>
     <Label-rectangle id="0" width="35mm" height="45mm" round="0mm" x_waste="5mm" y_waste="4mm">
       <Markup-margin size="0mm"/>
diff --git a/templates/hama-iso-templates.xml b/templates/hama-iso-templates.xml
index d83061a8..67b8a169 100644
--- a/templates/hama-iso-templates.xml
+++ b/templates/hama-iso-templates.xml
@@ -17,4 +17,30 @@
     </Label-round>
   </Template>
 
+  <!-- ==================================================================== -->
+  <!-- Hama 50390. Photo labels.			                    -->
+  <!-- ==================================================================== -->
+  <Template brand="Hama" part="50390" size="A4" _description="Photo labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
+    <Label-rectangle id="0" width="130mm" height="90mm" round="0mm" x_waste="40mm" y_waste="27.5mm">
+      <Markup-margin size="0mm"/>
+      <Layout nx="1" ny="2" x0="40mm" y0="30.1mm" dx="210mm" dy="150mm"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- ==================================================================== -->
+  <!-- Hama 50393. Photo labels.			                    -->
+  <!-- ==================================================================== -->
+  <Template brand="Hama" part="50393" size="A4" _description="Photo labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
+    <Label-rectangle id="0" width="151mm" height="100mm" round="0mm" x_waste="25mm" y_waste="24mm">
+      <Markup-margin size="0mm"/>
+      <Layout nx="1" ny="2" x0="29mm" y0="24mm" dx="201mm" dy="149mm"/>
+    </Label-rectangle>
+  </Template>
+
 </Glabels-templates>
diff --git a/templates/pearl-iso-templates.xml b/templates/pearl-iso-templates.xml
index 50be8489..d8cce04e 100644
--- a/templates/pearl-iso-templates.xml
+++ b/templates/pearl-iso-templates.xml
@@ -101,6 +101,8 @@
   <Template brand="PEARL" part="VM-5040" size="A4" _description="Photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
+
     <Meta product_url="http://www.pearl.de/a-VM5040-2002.shtml"/>
     <Label-rectangle id="0" width="45mm" height="55mm" round="0mm" x_waste="5mm" y_waste="5mm">
       <Markup-margin size="3.2mm"/>
@@ -221,6 +223,7 @@
   <Template brand="PEARL" part="VM-6102" size="A4" _description="Photo labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.pearl.de/a-VM6102-2202.shtml"/>
     <Label-rectangle id="0" width="45mm" height="55mm" round="0mm" x_waste="5mm" y_waste="5mm">
       <Markup-margin size="3.2mm"/>
@@ -236,6 +239,7 @@
   <Template brand="PEARL" part="VM-6206" size="A4" _description="Photo labels semiglossy">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.pearl.de/a-VM6206-2202.shtml"/>
     <Label-rectangle id="0" width="210mm" height="297mm" round="0mm" x_waste="0mm" y_waste="0mm">
       <Markup-margin size="3.2mm"/>
@@ -405,6 +409,7 @@
   <Template brand="Sattleford" part="VM-5040" size="A4" _description="Passport photo labels glossy">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.pearl.de/a-VM5040-2002.shtml"/>
     <Label-rectangle id="0" width="45mm" height="54.5mm" round="0mm" x_waste="5mm" y_waste="5mm">
       <Markup-margin size="3.2mm"/>
@@ -480,6 +485,7 @@
   <Template brand="Sattleford" part="VM-6102" size="A4" _description="Passport photo labels glossy">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
+    <Meta category="photo"/>
     <Meta product_url="http://www.pearl.de/a-VM6102-2202.shtml"/>
     <Label-rectangle id="0" width="45mm" height="55mm" round="0mm" x_waste="5mm" y_waste="5mm">
       <Markup-margin size="3.2mm"/>