From 724ad8e115dcfe409da65c0e9f7d89f490cece77 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 15 Apr 2018 13:40:24 -0400
Subject: [PATCH] Reconciled product database with 3.4.  Also tried to reduce
 the number of unique strings in database.

---
 templates/CMakeLists.txt               |   1 +
 templates/ascom-iso-templates.xml      |   4 +-
 templates/avery-iso-templates.xml      |  19 ++-
 templates/avery-us-templates.xml       |  42 ++++++-
 templates/begalabel-templates.xml      |  50 ++++----
 templates/dymo-other-templates.xml     |  12 ++
 templates/felga-templates.xml          |  46 +++++++
 templates/geha-iso-templates.xml       |   8 +-
 templates/hama-iso-templates.xml       |  30 ++---
 templates/herma-iso-templates.xml      |  15 ++-
 templates/misc-iso-templates.xml       |   4 +-
 templates/misc-us-templates.xml        |   2 +-
 templates/online-templates.xml         |  10 +-
 templates/pearl-iso-templates.xml      |  22 ++--
 templates/sheetlabels-us-templates.xml |   2 +-
 templates/vendors.xml                  |   1 +
 templates/zweckform-iso-templates.xml  |   6 +-
 translations/templates_C.ts            | 164 +++++++++----------------
 18 files changed, 258 insertions(+), 180 deletions(-)
 create mode 100644 templates/felga-templates.xml

diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
index a9e2daa..c9d56e4 100644
--- a/templates/CMakeLists.txt
+++ b/templates/CMakeLists.txt
@@ -21,6 +21,7 @@ set (template_files
   desmat-templates.xml
   dymo-other-templates.xml
   endisch-templates.xml
+  felga-templates.xml
   geha-iso-templates.xml
   hama-iso-templates.xml
   herma-iso-templates.xml
diff --git a/templates/ascom-iso-templates.xml b/templates/ascom-iso-templates.xml
index 14429ac..48969b5 100644
--- a/templates/ascom-iso-templates.xml
+++ b/templates/ascom-iso-templates.xml
@@ -310,9 +310,9 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Ascom ABP-515: CD/DVD inlet, 2 per sheet		                   -->
+  <!-- Ascom ABP-515: CD/DVD insert, 2 per sheet                           -->
   <!-- =================================================================== -->
-  <Template brand="Ascom" part="ABP-515" size="A4" _description="CD/DVD inlet">
+  <Template brand="Ascom" part="ABP-515" size="A4" _description="CD/DVD insert">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="34mm" height="114mm" round="0mm" x_waste="0mm" y_waste="0mm">
diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml
index e631979..e2037db 100644
--- a/templates/avery-iso-templates.xml
+++ b/templates/avery-iso-templates.xml
@@ -85,6 +85,19 @@
   </Template>
 
 
+  <!-- =================================================================== -->
+  <!-- Avery L6043 family: CD/DVD Labels, 2 per sheet                      -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="L6043" size="A4" _description="CD/DVD labels">
+    <Meta category="label"/>
+    <Meta category="media"/>
+    <Label-cd id="0" radius="58.7mm" hole="20.6mm" waste="3.175mm">
+      <Markup-margin size="3.2mm"/>
+      <Layout nx="1" ny="2" x0="46mm" y0="21.8mm" dx="123.75mm" dy="137mm"/>
+    </Label-cd>
+  </Template>
+
+
   <!-- =================================================================== -->
   <!-- Avery 6121 family: Multipurpose labels.                             -->
   <!-- =================================================================== -->
@@ -277,7 +290,7 @@
 
 
   <!-- =============================================================== -->
-  <!-- Avery J8435: CD/DVD inlets Booklet part                         -->
+  <!-- Avery J8435: CD/DVD inserts Booklet part                        -->
   <!-- =============================================================== -->
   <Template brand="Avery" part="8435A" size="A4" _description="CD/DVD booklet">
     <Meta category="media"/>
@@ -293,9 +306,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Avery J8435: CD/DVD inlets Inlet part                           -->
+  <!-- Avery J8435: CD/DVD inserts Insert part                         -->
   <!-- =============================================================== -->
-  <Template brand="Avery" part="8435B" size="A4" _description="CD/DVD inlet">
+  <Template brand="Avery" part="8435B" size="A4" _description="CD/DVD insert">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="122mm" round="0">
       <Markup-margin size="2mm"/>
diff --git a/templates/avery-us-templates.xml b/templates/avery-us-templates.xml
index 87aae27..ef85f2a 100644
--- a/templates/avery-us-templates.xml
+++ b/templates/avery-us-templates.xml
@@ -31,7 +31,7 @@
   <!-- =================================================================== -->
   <!-- Avery 3274.2 family: Small round stickers, 1_1/2'', 20 per sheet  x -->
   <!-- =================================================================== -->
-  <Template brand="Avery" part="3274.2" size="US-Letter" _description="Small round labels">
+  <Template brand="Avery" part="3274.2" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="0.75in">
@@ -883,6 +883,46 @@
     </Label-rectangle>
   </Template>
 
+
+  <!-- =================================================================== -->
+  <!-- Avery 89100 family: Binder Spine Inserts                            -->
+  <!-- =================================================================== -->
+  <Template brand="Avery" part="89101" size="US-Letter" description="Binder spine inserts">
+    <Label-rectangle id="0" width="0.5in" height="11in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="16" ny="1" x0="0.25in" y0="0in" dx="0.5in" dy="11in"/>
+    </Label-rectangle>
+  </Template>
+  <Template brand="Avery" part="89102" size="US-Letter" description="Binder spine inserts">
+    <Label-rectangle id="0" width="1in" height="11in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="8" ny="1" x0="0.25in" y0="0in" dx="1in" dy="11in"/>
+    </Label-rectangle>
+  </Template>
+  <Template brand="Avery" part="89103" equiv="89102"/>
+  <Template brand="Avery" part="89303" equiv="89102"/>
+  <Template brand="Avery" part="89104" size="US-Letter" description="Binder spine inserts">
+    <Label-rectangle id="0" width="1.5in" height="11in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="5" ny="1" x0="0.5in" y0="0in" dx="1.5in" dy="11in"/>
+    </Label-rectangle>
+  </Template>
+  <Template brand="Avery" part="89305" equiv="89104"/>
+  <Template brand="Avery" part="89106" size="US-Letter" description="Binder spine inserts">
+    <Label-rectangle id="0" width="2in" height="11in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="4" ny="1" x0="0.25in" y0="0in" dx="2in" dy="11in"/>
+    </Label-rectangle>
+  </Template>
+  <Template brand="Avery" part="89307" equiv="89106"/>
+  <Template brand="Avery" part="89109" size="US-Letter" description="Binder spine inserts">
+    <Label-rectangle id="0" width="2.5in" height="11in" round="0in" x_waste="0in" y_waste="0in">
+      <Markup-margin size="0.125in"/>
+      <Layout nx="3" ny="1" x0="0.5in" y0="0in" dx="2.5in" dy="11in"/>
+    </Label-rectangle>
+  </Template>
+
+
 </Glabels-templates>
 
 
diff --git a/templates/begalabel-templates.xml b/templates/begalabel-templates.xml
index 49393fa..732db9f 100644
--- a/templates/begalabel-templates.xml
+++ b/templates/begalabel-templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Glabels-templates>
 
-  <Template brand="Begalabel" part="RC-50" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-50" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/1-1-2-x-1-Rounded-Corner-Label-p15.html"/>
@@ -10,7 +10,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-150" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-150" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/1-1-4-x-2-3-8-Address-Labels-Media-Labels-p17.html"/>
@@ -19,7 +19,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-200" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-200" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/1-3-4-x-1-1-4-Barcode-Labels-Media-Labels-p18.html"/>
@@ -28,7 +28,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-250" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-250" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/1-3-4-x-1-2-Return-Address-Labels-Mailing-Labels-p19.html"/>
@@ -37,7 +37,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-300" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-300" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/2-1-4-x-3-4-Address-Labels-Mailing-Labels-p20.html"/>
@@ -46,7 +46,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-350" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-350" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/2-5-8-x-1-Address-Labels-Mailing-Labels-p7.html"/>
@@ -55,7 +55,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-400" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-400" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/2-5-8-x-1-1-16-Rounded-Corner-Label-p21.html"/>
@@ -64,7 +64,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-450" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-450" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-1-2-x-5-Shipping-Labels-Address-Labels-p22.html"/>
@@ -73,7 +73,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-500" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-500" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-3-4-x-1-1-4-Address-Labels-Shipping-Labels-p23.html"/>
@@ -82,7 +82,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-550" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-550" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-3-4-x-2-Shipping-Labels-Address-Labels-p24.html"/>
@@ -91,7 +91,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-600" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-600" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-3-4-x-3-Shipping-Labels-Address-Labels-p25.html"/>
@@ -100,7 +100,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-650" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-650" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-3-4-x-4-3-4-Shipping-Labels-Address-Labels-p26.html"/>
@@ -109,7 +109,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-700" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-700" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-3-8-x-2-1-3-Name-Badge-Labels-Name-Tag-Labels-p27.html"/>
@@ -118,7 +118,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-750" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-750" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-7-16-x-15-16-Filing-Labels-File-Folder-Labels-p28.html"/>
@@ -127,7 +127,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-800" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-800" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-7-16-x-2-3-Filing-Labels-File-Folder-Labels-p29.html"/>
@@ -136,7 +136,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-850" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-850" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/-3-x-5-8-Filing-Labels-File-Folder-Labels-p30.html"/>
@@ -145,7 +145,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-900" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-900" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/3-4-x-2-Rounded-Corner-Label-p31.html"/>
@@ -154,7 +154,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-950" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-950" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/4-x-1-Shipping-Labels-Address-Labels-p9.html"/>
@@ -163,7 +163,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-1000" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-1000" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/4-x-1-1-2-Shipping-Labels-Address-Labels-p32.html"/>
@@ -172,7 +172,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-1050" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-1050" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/4-x-1-1-3-Shipping-Labels-Address-Labels-p33.html"/>
@@ -181,7 +181,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-1100" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-1100" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/4-x-2-Shipping-Labels-Address-Labels-p10.html"/>
@@ -190,7 +190,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-1200" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-1200" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/4-x-3-1-3-Shipping-Labels-Address-Labels-p35.html"/>
@@ -199,7 +199,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-1225" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-1225" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/4-x-3-9-16-Label-Rounded-Corner-Label-p72.html"/>
@@ -208,7 +208,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-1240" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-1240" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/4-x-5-Shipping-Labels-Mailing-Labels-p265.html"/>
@@ -217,7 +217,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Begalabel" part="RC-1250" size="US-Letter" _description="Rounded rectangular labels">
+  <Template brand="Begalabel" part="RC-1250" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.begalabel.com/8-1-8-x-5-Shipping-Labels-p36.html"/>
diff --git a/templates/dymo-other-templates.xml b/templates/dymo-other-templates.xml
index f21494d..c96b6e1 100644
--- a/templates/dymo-other-templates.xml
+++ b/templates/dymo-other-templates.xml
@@ -51,6 +51,18 @@
     </Label-rectangle>
   </Template>
 
+  <!-- =================================================================== -->
+  <!-- Dymo 11356 Small Name Badge labels.                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Dymo" part="11356" size="Other" width="41mm" height="89mm" _description="Name badge labels">
+    <Meta category="label"/>
+    <Meta category="name-badge"/>
+    <Label-rectangle id="0" width="41mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="1" x0="0pt" y0="0pt" dx="19mm" dy="51mm"/>
+    </Label-rectangle>
+  </Template>
+
   <!-- =================================================================== -->
   <!-- Dymo 30256 Address labels.                                          -->
   <!-- =================================================================== -->
diff --git a/templates/felga-templates.xml b/templates/felga-templates.xml
new file mode 100644
index 0000000..4807a27
--- /dev/null
+++ b/templates/felga-templates.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<Glabels-templates xmlns="http://glabels.org/xmlns/3.0/">
+
+  <!-- =================================================================== -->
+  <!-- Felga Etichette                                                     -->
+  <!-- Labels for laser printers                                           -->
+  <!-- http://www.felga.it                                                 -->
+  <!-- =================================================================== -->
+
+  <Template brand="Felga" part="EP1220" size="Other" width="210mm" height="261mm" description="Plant labels">
+    <Label-rectangle id="0" width="20mm" height="100mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="0mm"/>
+      <Layout nx="10" ny="2" x0="5mm" y0="5mm" dx="20mm" dy="130mm"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Felga" part="ES210" size="Other" width="595.276pt" height="793.701pt" description="Plant labels">
+    <Meta category="user-defined"/>
+    <Label-rectangle id="0" width="595.276pt" height="36pt" round="0pt" x_waste="0pt" y_waste="0pt">
+      <Markup-margin size="0pt"/>
+      <Layout nx="1" ny="22" x0="0pt" y0="0pt" dx="595.276pt" dy="36pt"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Felga" part="EY210" size="A4" description="Plant labels">
+    <Label-rectangle id="0" width="210mm" height="19mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="0mm"/>
+      <Layout nx="1" ny="14" x0="0mm" y0="0mm" dx="210mm" dy="19mm"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Felga" part="PETFO-A5" size="A4" description="Plant labels">
+    <Label-rectangle id="0" width="210mm" height="148.5mm" round="0mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="0mm"/>
+      <Layout nx="1" ny="2" x0="0mm" y0="0mm" dx="210mm" dy="148.5mm"/>
+    </Label-rectangle>
+  </Template>
+
+  <Template brand="Felga" part="R1074" size="A4" description="Plant labels">
+    <Label-rectangle id="0" width="105mm" height="74.25mm" round="2mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="0mm"/>
+      <Layout nx="2" ny="4" x0="0mm" y0="0mm" dx="105mm" dy="74.25mm"/>
+    </Label-rectangle>
+  </Template>
+
+</Glabels-templates>
diff --git a/templates/geha-iso-templates.xml b/templates/geha-iso-templates.xml
index 11a476c..32b6511 100644
--- a/templates/geha-iso-templates.xml
+++ b/templates/geha-iso-templates.xml
@@ -117,7 +117,7 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- Geha Z20.  CD/DVD labels and inlet.                             	   -->
+  <!-- Geha Z20.  CD/DVD labels and insert.                                -->
   <!-- =================================================================== -->
   <Template brand="Geha" part="Z20-1" size="A4" _description="CD/DVD labels">
     <Meta category="label"/>
@@ -131,7 +131,7 @@
 
   <Template brand="Geha" part="Z21-1" equiv="Z20-1"/>
 
-  <Template brand="Geha" part="Z20-2" size="A4" _description="CD/DVD inlet">
+  <Template brand="Geha" part="Z20-2" size="A4" _description="CD/DVD insert">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta category="rectangle-label"/>
@@ -160,9 +160,9 @@
   <Template brand="Geha" part="Z23" equiv="Z22"/>
 
   <!-- =================================================================== -->
-  <!-- Geha Z24.    DVD inlets.		                          	   -->
+  <!-- Geha Z24.    DVD inserts.                                           -->
   <!-- =================================================================== -->
-  <Template brand="Geha" part="Z24" size="A4" _description="DVD inlet">
+  <Template brand="Geha" part="Z24" size="A4" _description="DVD insert">
     <Meta category="card"/>
     <Meta category="media"/>
     <Meta product_url="http://www.geha.de/index.php?id=1047&amp;pid=30248"/>
diff --git a/templates/hama-iso-templates.xml b/templates/hama-iso-templates.xml
index 74e7d61..e2a50bf 100644
--- a/templates/hama-iso-templates.xml
+++ b/templates/hama-iso-templates.xml
@@ -92,9 +92,9 @@
   <Template brand="Hama" part="50403" equiv="50402"/>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50430. CD/DVD inlets.				            -->
+  <!-- Hama 50430. CD/DVD inserts.				            -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50430" size="A4" _description="CD/DVD inlet">
+  <Template brand="Hama" part="50430" size="A4" _description="CD/DVD insert">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="119.5mm" height="119.5mm" round="0mm" x_waste="10mm" y_waste="0mm">
@@ -106,9 +106,9 @@
   <Template brand="Hama" part="50431" equiv="50430"/>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50432. CD/DVD inlets.				            -->
+  <!-- Hama 50432. CD/DVD inserts.				            -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50432-1" size="A4" _description="CD/DVD inlet (front)">
+  <Template brand="Hama" part="50432-1" size="A4" _description="CD/DVD insert (front)">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="151mm" height="121mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -118,7 +118,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Hama" part="50432-2" size="A4" _description="CD/DVD inlet (back)">
+  <Template brand="Hama" part="50432-2" size="A4" _description="CD/DVD insert (back)">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="151mm" height="117.5mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -131,9 +131,9 @@
   </Template>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50434. Zip disc inlets.			                    -->
+  <!-- Hama 50434. Zip disc inserts.			                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50434" size="A4" _description="Zip disc inlet">
+  <Template brand="Hama" part="50434" size="A4" _description="Zip disc insert">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="100mm" height="200mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -148,9 +148,9 @@
   </Template>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50435. DVD inlets.				                    -->
+  <!-- Hama 50435. DVD inserts.				                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50435" size="A4" _description="DVD inlet">
+  <Template brand="Hama" part="50435" size="A4" _description="DVD insert">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="184mm" height="275mm" round="0mm" x_waste="5mm" y_waste="5mm">
@@ -162,9 +162,9 @@
   </Template>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50436. VHS-C inlets.			                    -->
+  <!-- Hama 50436. VHS-C inserts.			                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50436" size="A4" _description="VHS-C inlet">
+  <Template brand="Hama" part="50436" size="A4" _description="VHS-C insert">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="98.5mm" height="91.5mm" round="0mm" x_waste="20mm" y_waste="20mm">
@@ -176,9 +176,9 @@
   </Template>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50437. Video-8 inlets.			                    -->
+  <!-- Hama 50437. Video-8 inserts.			                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50437" size="A4" _description="Video-8 inlet">
+  <Template brand="Hama" part="50437" size="A4" _description="Video-8 insert">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="98.5mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -191,9 +191,9 @@
   </Template>
 
   <!-- ==================================================================== -->
-  <!-- Hama 50438. VHS inlets.				                    -->
+  <!-- Hama 50438. VHS inserts.				                    -->
   <!-- ==================================================================== -->
-  <Template brand="Hama" part="50438" size="A4" _description="VHS inlet">
+  <Template brand="Hama" part="50438" size="A4" _description="VHS insert">
     <Meta category="card"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="189.5mm" height="256mm" round="0mm" x_waste="10.25mm" y_waste="20.5mm">
diff --git a/templates/herma-iso-templates.xml b/templates/herma-iso-templates.xml
index f85fa74..ad88d03 100644
--- a/templates/herma-iso-templates.xml
+++ b/templates/herma-iso-templates.xml
@@ -15,7 +15,7 @@
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Ordnerrucken, 6 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="Herma" part="4283" size="A4" _description="Small arch file labels">
+  <Template brand="Herma" part="4283" size="A4" _description="Arch file labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252" height="110.551" round="5">
       <Markup-margin size="5"/>
@@ -402,6 +402,19 @@
   <Template brand="Herma" part="10802" equiv="4103"/>
 
 
+  <!-- =================================================================== -->
+  <!-- Herma 10001: Rectangular Labels 25.4mm x 10mm, 189 per sheet        -->
+  <!-- =================================================================== -->
+  <Template brand="Herma" part="10001" size="A4" description="Rectangular labels">
+    <Meta category="label"/>
+    <Meta category="rectangle-label"/>
+    <Label-rectangle id="0" width="25.4mm" height="10mm" round="3mm" x_waste="0mm" y_waste="0mm">
+      <Markup-margin size="2mm"/>
+      <Layout nx="7" ny="27" x0="8mm" y0="14.4mm" dx="28.2mm" dy="10mm"/>
+    </Label-rectangle>
+  </Template>
+
+  
 </Glabels-templates>
 
 
diff --git a/templates/misc-iso-templates.xml b/templates/misc-iso-templates.xml
index 8e97583..56e2186 100644
--- a/templates/misc-iso-templates.xml
+++ b/templates/misc-iso-templates.xml
@@ -104,7 +104,7 @@
   <!-- =================================================================== -->
   <!-- Best Office Self-adhesive labels.                                   -->
   <!-- =================================================================== -->
-  <Template brand="Best Office" part="75753" size="A4" _description="Self-adhesive labels">
+  <Template brand="Best Office" part="75753" size="A4" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Label-rectangle id="0" width="70mm" height="36mm" round="0mm" x_waste="0mm" y_waste="0mm">
@@ -258,7 +258,7 @@
   <!-- =================================================================== -->
   <!-- EPSON Photo Stickers, 17 x 24 mm, 16 per sheet                      -->
   <!-- =================================================================== -->
-  <Template brand="Epson" part="S041144" size="A6" _description="Photo stickers">
+  <Template brand="Epson" part="S041144" size="A6" _description="Photo labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="48" height="68" round="7">
       <Markup-margin size="5"/>
diff --git a/templates/misc-us-templates.xml b/templates/misc-us-templates.xml
index dc30848..5cde0af 100644
--- a/templates/misc-us-templates.xml
+++ b/templates/misc-us-templates.xml
@@ -319,7 +319,7 @@
   <!-- =================================================================== -->
   <!-- Tough-Tags TTLW-2016 Microtube labels, 85 per sheet.                -->
   <!-- =================================================================== -->
-  <Template brand="Tough-Tags" part="TTLW-2016" size="US-Letter" _description="Microtube labels">
+  <Template brand="Tough-Tags" part="TTLW-2016" size="US-Letter" _description="Tube labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="92.16" height="36" round="5">
       <Markup-margin size="5"/>
diff --git a/templates/online-templates.xml b/templates/online-templates.xml
index 19b5b5f..0b296ac 100644
--- a/templates/online-templates.xml
+++ b/templates/online-templates.xml
@@ -267,7 +267,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL2319" size="US-Letter" _description="Reverse automobile window stickers">
+  <Template brand="Online Labels" part="OL2319" size="US-Letter" _description="Window stickers">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL2319.htm"/>
@@ -794,7 +794,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL9800" size="US-Letter" _description="Reverse automobile window stickers">
+  <Template brand="Online Labels" part="OL9800" size="US-Letter" _description="Window stickers">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL9800.htm"/>
@@ -1041,7 +1041,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template brand="Online Labels" part="OL338" size="US-Letter" _description="Reverse addendum stickers">
+  <Template brand="Online Labels" part="OL338" size="US-Letter" _description="Window stickers">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL338.htm"/>
@@ -1574,7 +1574,7 @@
     </Label-round>
   </Template>
 
-  <Template brand="Online Labels" part="OL320 (round)" size="US-Letter" _description="Round and rectangular labels">
+  <Template brand="Online Labels" part="OL320 (round)" size="US-Letter" _description="Round labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL320.htm"/>
@@ -1583,7 +1583,7 @@
       <Layout nx="1" ny="1" x0="2.75in" y0="5.25in" dx="5.5in" dy="5.5in"/>
     </Label-round>
   </Template>
-  <Template brand="Online Labels" part="OL320 (rectangle)" size="US-Letter" _description="Round and rectangular labels">
+  <Template brand="Online Labels" part="OL320 (rectangle)" size="US-Letter" _description="Rectangular labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.onlinelabels.com/OL320.htm"/>
diff --git a/templates/pearl-iso-templates.xml b/templates/pearl-iso-templates.xml
index c5af757..c6971b4 100644
--- a/templates/pearl-iso-templates.xml
+++ b/templates/pearl-iso-templates.xml
@@ -69,7 +69,7 @@
   <!-- =================================================================== -->
   <!-- PEARL: Self-adhesive film, 210mm x 297mm, 1 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="PE-8350" size="A4" _description="Self-adhesive film weatherproof">
+  <Template brand="PEARL" part="PE-8350" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-PE8350-2010.shtml"/>
@@ -84,7 +84,7 @@
   <!-- =================================================================== -->
   <!-- PEARL: Self-adhesive film, 210mm x 297mm, 1 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="PE-8351" size="A4" _description="Self-adhesive film transparent">
+  <Template brand="PEARL" part="PE-8351" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-PE8351-2200.shtml"/>
@@ -116,7 +116,7 @@
   <!-- =================================================================== -->
   <!-- PEARL: Self-adhesive window film, 210mm x 297mm, 1 per sheet        -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-5081" size="A4" _description="Self-adhesive window film">
+  <Template brand="PEARL" part="VM-5081" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM5081-2200.shtml"/>
@@ -146,7 +146,7 @@
   <!-- =================================================================== -->
   <!-- PEARL: Self-adhesive film, 210mm x 297mm, 1 per sheet               -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-5220" size="A4" _description="Self-adhesive film weatherproof">
+  <Template brand="PEARL" part="VM-5220" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM5220-2200.shtml"/>
@@ -298,7 +298,7 @@
   <!-- =================================================================== -->
   <!-- PEARL: Self-adhesive abels, 210mm x 297mm, 1 per sheet              -->
   <!-- =================================================================== -->
-  <Template brand="PEARL" part="VM-6252" size="A4" _description="Self-adhesive labels">
+  <Template brand="PEARL" part="VM-6252" size="A4" _description="Full-page labels">
     <Meta category="label"/>
     <Meta category="rectangle-label"/>
     <Meta product_url="http://www.pearl.de/a-VM6252-2202.shtml"/>
@@ -339,10 +339,10 @@
   <Template brand="PEARL" part="VM-8015" equiv="VM-8005"/>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Inlet for DVD boxes, 182mm x 276mm, 1 per sheet              -->
+  <!-- PEARL: Insert for DVD boxes, 182mm x 276mm, 1 per sheet             -->
   <!-- =================================================================== -->
 
-  <Template brand="PEARL" part="VM-6630" size="A4" _description="DVD inlet">
+  <Template brand="PEARL" part="VM-6630" size="A4" _description="DVD insert">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM6630-2211.shtml"/>
@@ -356,10 +356,10 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Inlet for CD boxes (front), 120mm x 120mm, 1 per sheet       -->
+  <!-- PEARL: Insert for CD boxes (front), 120mm x 120mm, 1 per sheet      -->
   <!-- =================================================================== -->
 
-  <Template brand="PEARL" part="VM-5513-1" size="A4" _description="CD/DVD inlet (front)">
+  <Template brand="PEARL" part="VM-5513-1" size="A4" _description="CD/DVD insert (front)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM5513-2214.shtml"/>
@@ -370,10 +370,10 @@
   </Template>
 
   <!-- =================================================================== -->
-  <!-- PEARL: Inlet for CD boxes (back), 150mm x 117.5mm, 1 per sheet      -->
+  <!-- PEARL: Insert for CD boxes (back), 150mm x 117.5mm, 1 per sheet     -->
   <!-- =================================================================== -->
 
-  <Template brand="PEARL" part="VM-5513-2" size="A4" _description="CD/DVD inlet (back)">
+  <Template brand="PEARL" part="VM-5513-2" size="A4" _description="CD/DVD insert (back)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Meta product_url="http://www.pearl.de/a-VM5513-2214.shtml"/>
diff --git a/templates/sheetlabels-us-templates.xml b/templates/sheetlabels-us-templates.xml
index 43cbf3d..7fadfd4 100644
--- a/templates/sheetlabels-us-templates.xml
+++ b/templates/sheetlabels-us-templates.xml
@@ -349,7 +349,7 @@
   <!-- =================================================================== -->
   <!-- SheetLabels: Elliptical labels, 10 per sheet                        -->
   <!-- =================================================================== -->  
-  <Template brand="SheetLabels" part="SL201" size="US-Letter" _description="Oval bottle/jar labels">
+  <Template brand="SheetLabels" part="SL201" size="US-Letter" _description="Bottle/jar labels">
     <Meta category="label"/>
     <Meta category="elliptical-label"/>
     <Meta product_url="http://www.sheet-labels.com/labels/SL201"/>
diff --git a/templates/vendors.xml b/templates/vendors.xml
index b32a040..2de8009 100644
--- a/templates/vendors.xml
+++ b/templates/vendors.xml
@@ -16,6 +16,7 @@
   <Vendor name="DataBecker"         url="http://www.databecker.de/shop/zubehoer/index.php"/>
   <Vendor name="Dymo"               url="http://global.dymo.com/"/>
   <Vendor name="Endisch"            url="http://www.endihaft.de/en/"/>
+  <Vendor name="Felga"              url="http://www.felga.it"/>
   <Vendor name="Geha"               url="http://www.geha.de/index.php?id=1041"/>
   <Vendor name="Great Gizmos"       url="http://www.greatgizmos.co.uk/product_ranges.html"/>
   <Vendor name="Hema"               url="http://hema.nl/nl-nl/winkel/kantoor/papier.aspx"/>
diff --git a/templates/zweckform-iso-templates.xml b/templates/zweckform-iso-templates.xml
index 262c5d7..1dd030d 100644
--- a/templates/zweckform-iso-templates.xml
+++ b/templates/zweckform-iso-templates.xml
@@ -217,7 +217,7 @@
 
 
   <!-- =============================================================== -->
-  <!-- Zweckform J8435: CD/DVD inlets Booklet part                     -->
+  <!-- Zweckform J8435: CD/DVD inserts Booklet part                    -->
   <!-- =============================================================== -->
   <Template brand="Zweckform" part="J8435A" size="A4" _description="CD/DVD booklet">
     <Meta category="media"/>
@@ -232,9 +232,9 @@
 
 
   <!-- =============================================================== -->
-  <!-- Zweckform J8435: CD/DVD inlets Inlet part                       -->
+  <!-- Zweckform J8435: CD/DVD inserts Insert part                     -->
   <!-- =============================================================== -->
-  <Template brand="Zweckform" part="J8435B" size="A4" _description="CD/DVD inlet">
+  <Template brand="Zweckform" part="J8435B" size="A4" _description="CD/DVD insert">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="122mm" round="0">
       <Markup-margin size="2mm"/>
diff --git a/translations/templates_C.ts b/translations/templates_C.ts
index ade044a..d663007 100644
--- a/translations/templates_C.ts
+++ b/translations/templates_C.ts
@@ -63,18 +63,6 @@
         <source>CD/DVD center hub labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>CD/DVD inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD inlet (back)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD/DVD inlet (front)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>CD/DVD labels</source>
         <translation type="unfinished"></translation>
@@ -91,10 +79,6 @@
         <source>CD/DVD labels (rectangles)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>CD/DVD labels (spine labels)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>CD/DVD labels (spine only)</source>
         <translation type="unfinished"></translation>
@@ -127,10 +111,6 @@
         <source>DLT labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>DVD inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Digital media labels</source>
         <translation type="unfinished"></translation>
@@ -143,10 +123,6 @@
         <source>Diskette labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Divider labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Elliptical labels</source>
         <translation type="unfinished"></translation>
@@ -199,10 +175,6 @@
         <source>ID labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Index cards</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Labels</source>
         <translation type="unfinished"></translation>
@@ -211,10 +183,6 @@
         <source>Large address labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Large round labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Lever arch file labels</source>
         <translation type="unfinished"></translation>
@@ -243,10 +211,6 @@
         <source>Metal tin container labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Microtube labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mini CD/DVD labels</source>
         <translation type="unfinished"></translation>
@@ -299,14 +263,6 @@
         <source>Photo products</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Photo stickers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Post cards</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Printable mousepad</source>
         <translation type="unfinished"></translation>
@@ -319,26 +275,10 @@
         <source>Return address labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Reverse addendum stickers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reverse automobile window stickers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Round and rectangular labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Round labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Rounded rectangular labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>SD card labels</source>
         <translation type="unfinished"></translation>
@@ -347,30 +287,10 @@
         <source>Seal labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Self-adhesive film transparent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Self-adhesive film weatherproof</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Self-adhesive labels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Self-adhesive window film</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Shipping labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Small round labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Square labels</source>
         <translation type="unfinished"></translation>
@@ -379,10 +299,6 @@
         <source>Target stickers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Tent cards</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Trapezoid labels</source>
         <translation type="unfinished"></translation>
@@ -391,14 +307,6 @@
         <source>Triangular labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>VHS inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VHS-C inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Video labels (face only)</source>
         <translation type="unfinished"></translation>
@@ -411,14 +319,6 @@
         <source>Video tape spine labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Video-8 inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zip disc inlet</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Zip disc labels</source>
         <translation type="unfinished"></translation>
@@ -443,10 +343,6 @@
         <source>File labels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Oval bottle/jar labels</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>VHS face labels</source>
         <translation type="unfinished"></translation>
@@ -460,11 +356,67 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small arch file labels</source>
+        <source>Tube labels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tube labels</source>
+        <source>CD/DVD insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD insert (back)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD insert (front)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD/DVD labels (spine labels)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVD insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Divider labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Index cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large round labels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tent cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VHS insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VHS-C insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video-8 insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Window stickers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zip disc insert</source>
         <translation type="unfinished"></translation>
     </message>
 </context>