[glabels/global-template] Merged Zweckform labels

[Mario BlÃttermann <mariobl src gnome org>]

commit 107a1bf8cfee99bd539d457d77d631815cdf5586
Author: Mario BlÃttermann <mario blaettermann gmail com>
Date:   Sun Sep 23 11:42:30 2012 +0200

    Merged Zweckform labels

 templates/zweckform-iso-templates.xml |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/templates/zweckform-iso-templates.xml b/templates/zweckform-iso-templates.xml
index a7ee09e..3fdc040 100644
--- a/templates/zweckform-iso-templates.xml
+++ b/templates/zweckform-iso-templates.xml
@@ -203,25 +203,15 @@
 
 
   <!-- =============================================================== -->
-  <!-- Zweckform J8435: CD Inlets Booklet part                         -->
+  <!-- Zweckform J8435: CD Inlets		                       -->
   <!-- =============================================================== -->
-  <Template brand="Zweckform" part="J8435A" size="A4" _description="CD Booklet">
+  <Template brand="Zweckform" part="J8435" size="A4" _description="CD Booklet and Inlet">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="125mm" round="0">
       <Markup-margin size="2mm"/>
       <Markup-line x1="32mm" y1="0mm" x2="32mm" y2="125mm"/>
       <Layout nx="1" ny="1" x0="27.5mm" y0="22mm" dx="155mm" dy="125mm"/>
     </Label-rectangle>
-  </Template>
-
-  <Template brand="Zweckform" part="32250A" equiv="J8435A"/>
-
-
-  <!-- =============================================================== -->
-  <!-- Zweckform J8435: CD Inlets Inlet part                           -->
-  <!-- =============================================================== -->
-  <Template brand="Zweckform" part="J8435B" size="A4" _description="CD Inlet">
-    <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="122mm" round="0">
       <Markup-margin size="2mm"/>
       <Markup-line x1="8.5mm" y1="0mm" x2="8.5mm" y2="122mm"/>
@@ -230,7 +220,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Zweckform" part="32250B" equiv="J8435B"/>
+  <Template brand="Zweckform" part="32250" equiv="J8435"/>
 
 
   <!-- =================================================================== -->