From 273e96234241a73a9e1f81de1ea691109025f189 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 28 Dec 2008 04:03:27 +0000
Subject: [PATCH] 2008-12-27  Jim Evins  <evins@snaught.com>

	* data/templates/avery-iso-templates.xml:
	* data/templates/avery-other-templates.xml:
	* data/templates/avery-us-templates.xml:
	* data/templates/brother-other-templates.xml:
	* data/templates/misc-iso-templates.xml:
	* data/templates/misc-other-templates.xml:
	* data/templates/zweckform-iso-templates.xml:
		Make sure all descriptions are marked as translatable.


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@818 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 glabels2/ChangeLog                            | 11 +++++++
 .../data/templates/avery-iso-templates.xml    |  4 +--
 .../data/templates/avery-other-templates.xml  |  2 +-
 .../data/templates/avery-us-templates.xml     | 30 +++++++++----------
 .../templates/brother-other-templates.xml     |  6 ++--
 .../data/templates/misc-iso-templates.xml     | 26 ++++++++--------
 .../data/templates/misc-other-templates.xml   |  2 +-
 .../templates/zweckform-iso-templates.xml     |  6 ++--
 8 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 4ac73679..5d8d0bd8 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,14 @@
+2008-12-27  Jim Evins  <evins@snaught.com>
+
+	* data/templates/avery-iso-templates.xml:
+	* data/templates/avery-other-templates.xml:
+	* data/templates/avery-us-templates.xml:
+	* data/templates/brother-other-templates.xml:
+	* data/templates/misc-iso-templates.xml:
+	* data/templates/misc-other-templates.xml:
+	* data/templates/zweckform-iso-templates.xml:
+		Make sure all descriptions are marked as translatable.
+
 2008-12-27  Jim Evins  <evins@snaught.com>
 
 	* de.po:
diff --git a/glabels2/data/templates/avery-iso-templates.xml b/glabels2/data/templates/avery-iso-templates.xml
index 60c47536..5865f08b 100644
--- a/glabels2/data/templates/avery-iso-templates.xml
+++ b/glabels2/data/templates/avery-iso-templates.xml
@@ -104,7 +104,7 @@
   <!-- =================================================================== -->
   <!-- Avery 7165 family: Address labels                                   -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="7165" size="A4" description="Address Labels">
+  <Template brand="Avery" part="7165" size="A4" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="280.8pt" height="191.991pt" round="0pt" waste="0pt">
@@ -144,7 +144,7 @@
   <!-- =================================================================== -->
   <!-- Avery 7664 family: Diskette Labels, 70mm x 71.9 mm, 8 per sheet     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="7664" size="A4" description="Diskette Labels">
+  <Template brand="Avery" part="7664" size="A4" _description="Diskette Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="70mm" height="71.9mm" round="2.5mm">
diff --git a/glabels2/data/templates/avery-other-templates.xml b/glabels2/data/templates/avery-other-templates.xml
index cc320dcc..796657cf 100644
--- a/glabels2/data/templates/avery-other-templates.xml
+++ b/glabels2/data/templates/avery-other-templates.xml
@@ -10,7 +10,7 @@
   <!-- Avery 06141 family: File Folder Labels, 5/8'' x 2_3/4'', 7 per sheet-->
   <!-- =================================================================== -->
   <Template brand="Avery" part="06141" size="Other" width="207pt" height="351pt"
-            description="File Folder Labels">
+            _description="File Folder Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198pt" height="45pt" round="4.5pt" waste="0pt">
       <Markup-margin size="4.5pt"/>
diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index 96137405..2c2bab62 100644
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -130,7 +130,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5159 family: Address Labels, 1_1/2'' x 4'', 14 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5159" size="US-Letter" description="Address Labels">
+  <Template brand="Avery" part="5159" size="US-Letter" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.5in" round="0.0625in" waste="0in">
@@ -194,7 +194,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5168 family:  Shipping Labels 5'' x 3_1/2'', 4 per sheet      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5168" size="US-Letter" description="Shipping Labels">
+  <Template brand="Avery" part="5168" size="US-Letter" _description="Shipping Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.5in" height="5in" round="0.0625in" waste="0in">
@@ -266,7 +266,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5193 family: Round Labels                                     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5193" size="US-Letter" description="Round Labels">
+  <Template brand="Avery" part="5193" size="US-Letter" _description="Round Labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="0.8125in" waste="0pt">
@@ -281,7 +281,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5194 family: Round Labels, 12 per sheet.                      -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5194" size="US-Letter" description="Round Labels">
+  <Template brand="Avery" part="5194" size="US-Letter" _description="Round Labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.25in" waste="0pt">
@@ -297,7 +297,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5195 family: Round Labels                                     -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5195" size="US-Letter" description="Round Labels">
+  <Template brand="Avery" part="5195" size="US-Letter" _description="Round Labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.65625in" waste="0pt">
@@ -426,7 +426,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5388 family: Index Cards, 5'' x 3'', 3 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5388" size="US-Letter" description="Index Cards">
+  <Template brand="Avery" part="5388" size="US-Letter" _description="Index Cards">
     <Meta category="card"/>
     <Label-rectangle id="0" width="5in" height="3in" round="0pt" waste="0pt">
       <Markup-margin size="0.125in"/>
@@ -439,7 +439,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5389 family: Post Cards, 6'' x 4'', 2 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5389" size="US-Letter" description="Post cards">
+  <Template brand="Avery" part="5389" size="US-Letter" _description="Post cards">
     <Meta category="card"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="6in" height="4in" round="0pt" waste="0pt">
@@ -451,7 +451,7 @@
   <!-- =================================================================== -->
   <!-- Avery 8195 family: Return address labels                            -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="8195" size="US-Letter" description="Return Address Labels">
+  <Template brand="Avery" part="8195" size="US-Letter" _description="Return Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="1.75in" height="0.666in" round="0.063in" x_waste="0in" y_waste="0in">
@@ -733,7 +733,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5526 family: Shipping Labels.                                 -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="5526" size="US-Letter" description="Shipping Labels">
+  <Template brand="Avery" part="5526" size="US-Letter" _description="Shipping Labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta category="mail"/>
@@ -754,7 +754,7 @@
   <!-- Avery labels in tech builitin 152 				    -->
   <!-- http://www.avery.com/help/tech_bulletin.jsp?tech_bull_code=152       -->
   <!-- ******************************************************************** -->
-  <Template brand="Avery" part="LSK-8" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-8" size="US-Letter" _description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="1.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -762,14 +762,14 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template brand="Avery" part="LSK-8.5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-8.5" size="US-Letter" _description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="1" width="1.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="20" x0="0.5in" y0="0.5in" dx="2.13in" dy="0.5in"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Avery" part="LSK-5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-5" size="US-Letter" _description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="2" width="1.75in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -777,14 +777,14 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template brand="Avery" part="LSK-5.5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-5.5" size="US-Letter" _description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="3" width="1.75in" height="0.5in" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="20" x0="0.5in" y0="0.3in" dx="2.05in" dy="0.5in"/>
     </Label-rectangle>
   </Template>
-  <Template brand="Avery" part="LSK-3" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-3" size="US-Letter" _description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="4" width="3.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -792,7 +792,7 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template brand="Avery" part="LSK-3.5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-3.5" size="US-Letter" _description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="5" width="3.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
diff --git a/glabels2/data/templates/brother-other-templates.xml b/glabels2/data/templates/brother-other-templates.xml
index 799195f4..6fb666bc 100644
--- a/glabels2/data/templates/brother-other-templates.xml
+++ b/glabels2/data/templates/brother-other-templates.xml
@@ -19,7 +19,7 @@
    *********************************************************************
   -->
 
-  <Template brand="Brother" part="DK-1201" size="Other" width="25.91mm" height="83.90mm" description="Standard Address Labels 29mm x 90mm">
+  <Template brand="Brother" part="DK-1201" size="Other" width="25.91mm" height="83.90mm" _description="Standard Address Labels 29mm x 90mm">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="25.91mm" height="83.90mm" round="0" x_waste="0" y_waste="0">
@@ -28,7 +28,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-1202" size="Other" width="58.93mm" height="93.20mm" description="Shipping Labels 62mm x 100mm">
+  <Template brand="Brother" part="DK-1202" size="Other" width="58.93mm" height="93.20mm" _description="Shipping Labels 62mm x 100mm">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="58.93mm" height="93.20mm" round="0" x_waste="0" y_waste="0">
@@ -37,7 +37,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Brother" part="DK-1204" size="Other" width="13.97mm" height="47.92mm" description="Multi Purpose Labels 17mm x 54mm">
+  <Template brand="Brother" part="DK-1204" size="Other" width="13.97mm" height="47.92mm" _description="Multi Purpose Labels 17mm x 54mm">
     <Meta category="label"/>
     <Label-rectangle id="0" width="13.97mm" height="47.92mm" round="0" x_waste="0" y_waste="0">
       <Markup-rect x1="-1.5mm" y1="-3mm" w="17mm" h="54mm" r="1.5mm" />
diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index ec34a52c..cdc41e81 100644
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -71,7 +71,7 @@
   <!-- =================================================================== -->
   <!-- Ednet 45021: Inkjet/Laser Labels 70x37mm                            -->
   <!-- =================================================================== -->
-  <Template brand="Ednet" part="45021" size="A4" description="Inkjet/Laser Labels 70x37mm">
+  <Template brand="Ednet" part="45021" size="A4" _description="Inkjet/Laser Labels 70x37mm">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198.425pt" height="104.882pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
@@ -106,7 +106,7 @@
   <!-- =================================================================== -->
   <!-- Herma 5079: CD/DVD Labels, 2 per sheet                              -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="5079" size="A4" description="CD/DVD Labels">
+  <Template brand="Herma" part="5079" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="164.409pt" hole="58.1102pt" waste="9pt">
@@ -223,7 +223,7 @@
   <!-- =================================================================== -->
   <!-- APLI 01293:  General Labels.                                        -->
   <!-- =================================================================== -->
-  <Template brand="Apli" part="01293" size="A4" description="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"/>
@@ -399,7 +399,7 @@
   <!-- ===================================================================-->
   <!-- Media Line CD/DVD Labels (face only), 2 per sheet                  -->
   <!-- ===================================================================-->
-  <Template brand="MediaLine" part="760-50475 A4 CD" size="A4" description="CD/DVD Labels (face only)">
+  <Template brand="MediaLine" part="760-50475 A4 CD" size="A4" _description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -411,7 +411,7 @@
   <!-- ===================================================================-->
   <!-- Encre.com Business Cards, 10 per sheet                             -->
   <!-- ===================================================================-->
-  <Template brand="Encre.com" part="BCV10" size="A4" description="Business Cards">  
+  <Template brand="Encre.com" part="BCV10" size="A4" _description="Business Cards">  
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="243.78" height="153.07">  
@@ -472,7 +472,7 @@
   <!-- =================================================================== -->
   <!-- Fellows 04715 CD/DVD Labels (Face only).                            -->
   <!-- =================================================================== -->
-  <Template brand="Fellows" part="04715" size="A4" description="CD Labels">
+  <Template brand="Fellows" part="04715" size="A4" _description="CD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -509,7 +509,7 @@
   <!-- =================================================================== -->
   <!-- DECAdry DLW-1786: Mailing Labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="DECAdry" part="DLW-1786" size="A4" description="Mailing Labels">
+  <Template brand="DECAdry" part="DLW-1786" size="A4" _description="Mailing Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="105mm" height="39mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -522,7 +522,7 @@
   <!-- =================================================================== -->
   <!-- DECAdry DLW-1787: Mailing Labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="DECAdry" part="DLW-1787" size="A4" description="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">
@@ -547,7 +547,7 @@
   <!-- =================================================================== -->
   <!-- Poundland 30 Labels.                                                -->
   <!-- =================================================================== -->
-  <Template brand="Poundland" part="30" size="A4" description="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"/>
@@ -558,7 +558,7 @@
   <!-- =================================================================== -->
   <!-- Sanwa LB-CDRJP.  CD Labels.                                         -->
   <!-- =================================================================== -->
-  <Template brand="Sanwa" part="LB-CDRJP" size="A4" description="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">
@@ -570,7 +570,7 @@
   <!-- =================================================================== -->
   <!-- Bruna 241301.  Mailing Labels.                                      -->
   <!-- =================================================================== -->
-  <Template brand="Bruna" part="241301" size="A4" description="Mailing Labels">
+  <Template brand="Bruna" part="241301" size="A4" _description="Mailing 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">
@@ -602,7 +602,7 @@
   <!-- Templates for A4 and A3 media, size 50 x 90 mm                       -->
   <!-- ******************************************************************** -->
   
-  <Template brand="Russian" part="A3 5x9" size="A3" description="Business Cards">
+  <Template brand="Russian" part="A3 5x9" size="A3" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="90mm" height="50mm" round="0">
@@ -611,7 +611,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Russian" part="A4 5x9" size="A4" description="Business Cards">
+  <Template brand="Russian" part="A4 5x9" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="50mm" height="90mm" round="0">
diff --git a/glabels2/data/templates/misc-other-templates.xml b/glabels2/data/templates/misc-other-templates.xml
index a953fa9d..4f57e745 100644
--- a/glabels2/data/templates/misc-other-templates.xml
+++ b/glabels2/data/templates/misc-other-templates.xml
@@ -6,7 +6,7 @@
   <!-- OfficeMax 86112: Multi-Purpose Labels, 2'' x 4'', 3 per sheet       -->
   <!-- =================================================================== -->
   <Template brand="OfficeMax" part="86112" size="Other" width="297pt" height="450pt"
-            description="Multi-Purpose Labels">
+            _description="Multi-Purpose Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="288pt" height="144pt" round="9pt" waste="0pt">
       <Markup-margin size="9pt"/>
diff --git a/glabels2/data/templates/zweckform-iso-templates.xml b/glabels2/data/templates/zweckform-iso-templates.xml
index 95eeff65..e3aecea4 100644
--- a/glabels2/data/templates/zweckform-iso-templates.xml
+++ b/glabels2/data/templates/zweckform-iso-templates.xml
@@ -66,7 +66,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3688: Ordnerruecken Labels                                -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="3688" size="A4" description="File Back Labels">
+  <Template brand="Zweckform" part="3688" size="A4" _description="File Back Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252pt" height="172.913pt" round="0pt" waste="0pt">
       <Markup-margin size="9.07087pt"/>
@@ -77,7 +77,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4732: Multi-purpose Stick+Lift labels                     -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="4732" size="A4" description="Multi-purpose Stick+Lift Labels">
+  <Template brand="Zweckform" part="4732" size="A4" _description="Multi-purpose Stick+Lift Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="102.047pt" height="48.189pt" round="5.66929pt" waste="0pt">
       <Markup-margin size="5.66929pt"/>
@@ -180,7 +180,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 6021: Allround Labels                                     -->
   <!-- =================================================================== -->
-  <Template brand="Zweckform" part="6021" size="A4" description="Allround Labels">
+  <Template brand="Zweckform" part="6021" size="A4" _description="Allround Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="130.392pt" height="47.9055pt" round="0pt" waste="0pt">
       <Markup-margin size="5pt"/>
-- 
2.39.5