From: Mario Blättermann <mariobl@gnome.org>
Date: Mon, 20 Dec 2010 18:45:21 +0000 (+0100)
Subject: Moved Dataline template to its own file
X-Git-Tag: glabels-2_3_1~24
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8c1f05cfb999c20d1cc8821fa60d8ad68568ba9c;p=glabels

Moved Dataline template to its own file
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f71c35b4..23f48c46 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -230,6 +230,7 @@ data/schemas/org.gnome.glabels-3.gschema.xml.in.in
 [type: gettext/xml]templates/avery-other-templates.xml
 [type: gettext/xml]templates/brother-other-templates.xml
 [type: gettext/xml]templates/databecker-iso-templates.xml
+[type: gettext/xml]templates/dataline-iso-templates.xml
 [type: gettext/xml]templates/decadry-iso-templates.xml
 [type: gettext/xml]templates/dymo-other-templates.xml
 [type: gettext/xml]templates/geha-iso-templates.xml
diff --git a/templates/Makefile.am b/templates/Makefile.am
index 16894a64..39246d05 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -17,6 +17,7 @@ templates_DATA = \
 	avery-other-templates.xml \
 	brother-other-templates.xml \
 	databecker-iso-templates.xml \
+	dataline-iso-templates.xml	\
 	decadry-iso-templates.xml \
 	dymo-other-templates.xml \
 	geha-iso-templates.xml	\
diff --git a/templates/dataline-iso-templates.xml b/templates/dataline-iso-templates.xml
new file mode 100644
index 00000000..6e853529
--- /dev/null
+++ b/templates/dataline-iso-templates.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<Glabels-templates xmlns="http://glabels.org/xmlns/2.3/">
+
+  <!-- ************************* -->
+  <!--                           -->
+  <!-- Dataline                  -->
+  <!--                           -->
+  <!-- ************************* -->
+
+  <!-- =================================================================== -->
+  <!-- Dataline 57125: Business Cards, 54.0 x 86.0 mm, 10 per sheet        -->
+  <!-- =================================================================== -->
+  <Template brand="Dataline" part="57125" size="A4" _description="Business Cards">
+    <Meta category="card"/>
+    <Meta category="business-card"/>
+    <Label-rectangle id="0" width="86.00mm" height="54.00mm" round="0">
+      <Markup-margin size="0mm"/>
+      <Layout nx="2" ny="5" x0="16mm" y0="11mm" dx="91mm" dy="55.625mm"/>
+    </Label-rectangle>
+  </Template>
+
+</Glabels-templates>
+
+
+
+
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 2f3bfc03..3c1d2884 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -165,25 +165,6 @@
   </Template>
 
 
-  <!-- ************************* -->
-  <!--                           -->
-  <!-- Dataline                  -->
-  <!--                           -->
-  <!-- ************************* -->
-
-  <!-- =================================================================== -->
-  <!-- Dataline 57125: Business Cards, 54.0 x 86.0 mm, 10 per sheet        -->
-  <!-- =================================================================== -->
-  <Template brand="Dataline" part="57125" size="A4" _description="Business Cards">
-    <Meta category="card"/>
-    <Meta category="business-card"/>
-    <Label-rectangle id="0" width="86.00mm" height="54.00mm" round="0">
-      <Markup-margin size="0mm"/>
-      <Layout nx="2" ny="5" x0="16mm" y0="11mm" dx="91mm" dy="55.625mm"/>
-    </Label-rectangle>
-  </Template>
-
-
   <!-- ************************* -->
   <!--                           -->
   <!-- Ednet                     -->
diff --git a/templates/vendors.xml b/templates/vendors.xml
index b6840d41..bf393846 100644
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -7,6 +7,7 @@
   <Vendor name="Ascom"          url="http://www.hovat.co.uk/hovat_labelling.html"	/>
   <Vendor name="Avery"          url="http://www.avery.com/"           			/>
   <Vendor name="Brother"        url="http://www.brother-usa.com/"     			/>
+  <Vendor name="Dataline"       url="http://www.esselte-dataline.com/uk/"   		/>
   <Vendor name="DECAdry"        url="http://www.decadry.com/"         			/>
   <Vendor name="DataBecker"     url="http://www.databecker.de/shop/zubehoer/index.php"	/>
   <Vendor name="Dymo"           url="http://global.dymo.com/"         			/>