2008-10-27 Jim Evins <evins@snaught.com>

	* data/templates/avery-us-templates.xml:
	* data/templates/misc-iso-templates.xml:
	* data/templates/zweckform-iso-templates.xml:
		Caught up on user submitted templates.
	* AUTHORS:
		Acknowledgements for above templates.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@789 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 425cccb0b8cfc46b635fe7d5ac429616c90ffe0a..b7fc6557aef40db9a722140ddb27e22ce65b3f2c 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -40,10 +40,10 @@ Glabels includes contributions from:
        Darren Warner <warnerd@users.sourceforge.net>
        Javier Donaire Segarra <jyuyu@users.sourceforge.net>
        Alessandro Zummo <azummo@towertech.it>
-       José Dapena Paz <jdapena@igalia.com>
+       José Dapena Paz <jdapena@igalia.com>
        Akkana <akkana@shallowsky.com>
        Dag Wieers <dag@wieers.com>
-       Mário Meyer <mario@meyer.eti.br>
+       Mário Meyer <mario@meyer.eti.br>
        Peter Cherriman <glabels-devel2712@bubieyehyeh.me.uk>
 
 Translations:
@@ -54,13 +54,13 @@ Translations:
        Marcus Bauer <m@7n7.de> -- German (original)
        Christian Neumair <christian-neumair@web.de> -- German (1.89.1)
        Takeshi AIHANA <aihana@gnome.gr.jp> -- Japanese
-       Paulo Rogério Ormenese <pormenese@uol.com.br> -- Brazilian Portuguese
-       Víctor Moral <victor@pasmao.net> -- Spanish translations
+       Paulo Rogério Ormenese <pormenese@uol.com.br> -- Brazilian Portuguese
+       Víctor Moral <victor@pasmao.net> -- Spanish translations
        sergio rivadero <sergiorivadero@argentina.com> -- Spanish Translations (2.0.3)
        Vitaly Lipatov <lav@altlinux.ru> -- Russian translations
        Shell, Hin-lik Hung <shell@home.shellhung.org> -- Chinese Translations
        Arkadiusz Lipiec <A.Lipiec@elka.pw.edu.pl> -- Polish Translations
-       David Makovský (Yakeen) <yakeen@sannyas-on.net> -- Czech Translations
+       David Makovský (Yakeen) <yakeen@sannyas-on.net> -- Czech Translations
        Zbynek Mrkvicka <zbynek@oachot.cz> -- Czech Translations (2.0.3)
        Mancio <mancio_and@yahoo.it> -- Italian Translations
        Daniele Medri <daniele.medri@libero.it> -- Italian Translations (2.0.3)
@@ -97,7 +97,7 @@ particular products (I apologize if I have missed anybody):
        Gwen Patton
        Miek Gieben
        Joerg Schmitz-Linneweber
-       David Makovský
+       David Makovský
        Oliver Schwank
        Akkana
        Ted Poe
@@ -115,7 +115,7 @@ particular products (I apologize if I have missed anybody):
        Lauri Ampuja
        Allan Wind
        Mark S Burgunder
-       Christian Holländer
+       Christian Holländer
        Marvin P. Dickens
        Julien BLACHE
        James D Strandboge
@@ -153,19 +153,26 @@ particular products (I apologize if I have missed anybody):
        Lionel CONS
        Richard Lance
        Anand Kumria
-       Alexandre Sauvé
+       Alexandre Sauvé
        Ironblade
-       Matthias Mailänder
+       Matthias Mailänder
        Bernhard Walle
        Stephen Hilliard
        Alessandro Zummo
        Herbert Straub
-       Dennis Böckmann
+       Dennis Böckmann
        Anon
        D. Leitner
        Georg Ostertag
        Manuel Siggen
        David Huber
        Harald Welte
+       Richard Rothwell
+       Gernot Hassenpflug
+       Pau Ruŀlan Ferragut
+       Richard Hurt
+       Phil Endecott
+       Koen Wybo
+
 
 And many others for their many helpful suggestions and bug reports -- thanks.

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 77b9aef769be64545918832960f3581856d0bdf5..6a355f24154dbb54269f4f2b8d7fcc01f7953567 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-27  Jim Evins  <evins@snaught.com>
+
+       * data/templates/avery-us-templates.xml:
+       * data/templates/misc-iso-templates.xml:
+       * data/templates/zweckform-iso-templates.xml:
+               Caught up on user submitted templates.
+       * AUTHORS:
+               Acknowledgements for above templates.
+
 2008-10-23  Jim Evins  <evins@snaught.com>
 
        * src/label-text.c: (set_font_family):

diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index 5d8ab14a64ce5bc8acc408ef65dacc7d3e56e99b..0f1db861f1d505542f370fa810037f0af4b046d1 100644 (file)
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -718,6 +718,25 @@
     </Label-round>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Avery 5526 family: Shipping Labels.                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="5526" size="US-Letter" description="Shipping Labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="8.5in" height="5.5in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="2" x0="0in" y0="0in" dx="0in" dy="5.5in"/>
+    </Label-rectangle>
+    <!-- Look alikes -->
+    <Alias brand="Avery" part="5126"/>
+    <Alias brand="Avery" part="8126"/>
+    <Alias brand="Avery" part="15516"/>
+    <Alias brand="Avery" part="18126"/>
+    <Alias brand="ULine" part="S-5044"/>
+  </Template>
+
 
   <!-- ******************************************************************** -->
   <!-- Avery labels in tech builitin 152                                   -->

diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index 36b4135f8341cd6992a87332310da6e3150c3efd..f25518ef7069d01752b6ffdd5f54e6364795b5f7 100644 (file)
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -220,6 +220,18 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- APLI 01293:  General Labels.                                        -->
+  <!-- =================================================================== -->
+  <Template brand="Apli" part="01293" size="A4" description="General Labels">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="198.425pt" height="94.3937pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="3" ny="8" x0="0pt" y0="43.3701pt" dx="198.425pt" dy="94.3937pt"/>
+    </Label-rectangle>
+  </Template>
+
+
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Ordnerrucken, 192 x 61,5 mm, 4 per sheet    -->
   <!-- =================================================================== -->
@@ -494,6 +506,19 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- DECAdrty DLW-1787: Mailing Labels.                                  -->
+  <!-- =================================================================== -->
+  <Template brand="DECAdry" part="DLW-1787" size="A4" description="Mailing Labels">
+    <Meta category="label"/>
+    <Meta category="mail"/>
+    <Label-rectangle id="0" width="70mm" height="35mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="3" ny="8" x0="0mm" y0="8.5mm" dx="70mm" dy="35mm"/>
+    </Label-rectangle>
+    <Alias brand="DECAdry" part="OLW-4787"/>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Connect KF10647 Mailing Labels..                                    -->
   <!-- =================================================================== -->
@@ -506,6 +531,29 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Poundland 30 Labels.                                                -->
+  <!-- =================================================================== -->
+  <Template brand="Poundland" part="30" size="A4" description="Labels">
+    <Meta category="label"/>
+    <Label-rectangle id="0" width="184.252pt" height="72pt" round="8.50394pt" x_waste="4.25197pt" y_waste="0pt">
+      <Markup-margin size="7.08661pt"/>
+      <Layout nx="3" ny="10" x0="4.25197pt" y0="62.3622pt" dx="201.26pt" dy="72pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <!-- =================================================================== -->
+  <!-- Sanwa LB-CDRJP.  CD Labels.                                         -->
+  <!-- =================================================================== -->
+  <Template brand="Sanwa" part="LB-CDRJP" size="A4" description="CD Labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="167.244pt" hole="34.0pt" waste="9pt">
+      <Markup-margin size="9pt"/>
+      <Layout nx="1" ny="2" x0="29.1969pt" y0="70.8661pt" dx="352.488pt" dy="367.087pt"/>
+    </Label-cd>
+  </Template>
+
 
   <!-- ******************************************************************** -->
   <!-- Misc. A6 products.                                                   -->

diff --git a/glabels2/data/templates/zweckform-iso-templates.xml b/glabels2/data/templates/zweckform-iso-templates.xml
index f6b2c5818b29b9efaaf382e57dea7811dc944dee..95eeff65c6a4dafa005f18ebc532838d1f075e46 100644 (file)
--- a/glabels2/data/templates/zweckform-iso-templates.xml
+++ b/glabels2/data/templates/zweckform-iso-templates.xml
@@ -200,6 +200,7 @@
     </Label-rectangle>
     <Alias brand="DECAdry" part="SCW-2090"/>
     <Alias brand="DECAdry" part="OCB-3327"/>
+    <Alias brand="DECAdry" part="OCC-3342"/>
     <Alias brand="DECAdry" part="DAW-327"/>
   </Template>