From: Jim Evins <evins@snaught.com>
Date: Fri, 6 Nov 2009 02:29:13 +0000 (-0500)
Subject: Caught up on user submitted templates.
X-Git-Tag: glabels-2_2_6~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9542ced852f02b4ded00a923ea99bbfc5262234b;p=glabels

Caught up on user submitted templates.

Added user submitted templates and acknowledgements.
---

diff --git a/AUTHORS b/AUTHORS
index 4ca41f61..bab24539 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -179,6 +179,8 @@ particular products (I apologize if I have missed anybody):
 	Mark Moeller
 	Bertus W.
 	Oliver Friedrich
+	Dr. Oliver Thiel
+	Jonas Stein
 
 
 And many others for their many helpful suggestions and bug reports -- thanks.
diff --git a/data/templates/misc-iso-templates.xml b/data/templates/misc-iso-templates.xml
index 1db04adc..6e26521a 100644
--- a/data/templates/misc-iso-templates.xml
+++ b/data/templates/misc-iso-templates.xml
@@ -155,12 +155,27 @@
   <!-- DATA BECKER 0526 Address Labels.                                    -->
   <!-- =================================================================== -->
   <Template brand="DataBecker" part="0526" size="A4" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
     <Label-rectangle id="0" width="198.425pt" height="102.047pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="9pt"/>
       <Layout nx="3" ny="8" x0="3.93386e-16pt" y0="15.5906pt" dx="198.425pt" dy="102.047pt"/>
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- DATA BECKER 0562 CD Labels.                                         -->
+  <!-- =================================================================== -->
+  <Template brand="DataBecker" part="0562" size="A4" _description="CD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="58mm" hole="20.6375mm" waste="2mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="1" ny="2" x0="5mm" y0="5mm" dx="120mm" dy="171mm"/>
+      <Layout nx="1" ny="1" x0="89mm" y0="90mm" dx="120mm" dy="120mm"/>
+    </Label-cd>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- DATA BECKER 0598 Address Labels.                                    -->
   <!-- =================================================================== -->
diff --git a/data/templates/zweckform-iso-templates.xml b/data/templates/zweckform-iso-templates.xml
index e3aecea4..fa3c9391 100644
--- a/data/templates/zweckform-iso-templates.xml
+++ b/data/templates/zweckform-iso-templates.xml
@@ -17,6 +17,18 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Zweckform 3477: Adress labels                                       -->
+  <!-- =================================================================== -->
+  <Template brand="Zweckform" part="3477" size="A4" _description="Address Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="105mm" height="41mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="2" ny="7" x0="0mm" y0="4.93mm" dx="105mm" dy="41mm"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Zweckform 3651: Rectangular Labels, 52 x 29.5 mm, 40 per sheet      -->
   <!-- =================================================================== -->