From: Mario Blättermann <mariobl@gnome.org>
Date: Fri, 17 Dec 2010 14:42:06 +0000 (+0100)
Subject: Moved Ascom template to its own file
X-Git-Tag: glabels-2_3_1~37
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2b1ed215968487da9ac7c0ceb7123028a8729b6e;p=glabels

Moved Ascom template to its own file
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7919f2c7..5f1297bb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -224,6 +224,7 @@ data/schemas/org.gnome.glabels-3.gschema.xml.in.in
 
 [type: gettext/xml]templates/paper-sizes.xml
 [type: gettext/xml]templates/categories.xml
+[type: gettext/xml]templates/ascom-iso-templates.xml
 [type: gettext/xml]templates/avery-us-templates.xml
 [type: gettext/xml]templates/avery-iso-templates.xml
 [type: gettext/xml]templates/avery-other-templates.xml
diff --git a/templates/Makefile.am b/templates/Makefile.am
index 43af1bff..16894a64 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -11,6 +11,7 @@ templates_DATA = \
 	paper-sizes.xml \
 	categories.xml \
 	vendors.xml \
+	ascom-iso-templates.xml	\
 	avery-us-templates.xml \
 	avery-iso-templates.xml \
 	avery-other-templates.xml \
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 4638a2f4..dd9a3284 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -71,29 +71,6 @@
   </Template>
 
 
-  <!-- ************************* -->
-  <!--                           -->
-  <!-- Ascom                     -->
-  <!--                           -->
-  <!-- ************************* -->
-
-  <!-- Ascom was bought some years ago by Hovat.		-->
-  <!-- Label data are now available from the following URL:	-->
-  <!-- http://www.hovat.co.uk/office_templates.zip		-->
-
-  <!-- =================================================================== -->
-  <!-- Ascom A4/24/MKII: Rectangular Labels, 24 per sheet                  -->
-  <!-- =================================================================== -->
-  <!-- TODO: Is this the real part #? -->
-  <Template brand="Ascom" part="A4/24/MKII" size="A4" _description="Rectangular Labels">
-    <Meta category="label"/>
-    <Label-rectangle id="0" width="181" height="96" round="10">
-      <Markup-margin size="5"/>
-      <Layout nx="3" ny="8" x0="19" y0="36" dx="187" dy="96"/>
-    </Label-rectangle>
-  </Template>
-
-
   <!-- ************************* -->
   <!--                           -->
   <!-- Best Office               -->