[glabels/glabels-3_4] Reconcile with newer translations in master.



commit 836c82cf5c45644a8ab44f5aed5acf27898f454d
Author: Jim Evins <evins snaught com>
Date:   Fri Apr 27 22:53:37 2018 -0400

    Reconcile with newer translations in master.

 po/eo.po | 2997 ++++++++++++++++++++++++++++++++++++++------------------------
 po/fi.po | 1057 ++++++++++++++++------
 2 files changed, 2608 insertions(+), 1446 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index c1814a1..90f5f65 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,24 +1,24 @@
 # Esperanto translation for glabels.
-# Copyright (C) 2003 - 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the glabels package.
-#
 # Antonio C. CODAZZI "la Filozofo" <f_sophia libero it>, 2007.
-# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011.
-#
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2011, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2011-10-04 17:58+0000\n"
-"PO-Revision-Date: 2011-11-10 21:04+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=glabel";
+"s&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-02-27 16:34+0000\n"
+"PO-Revision-Date: 2017-06-11 01:24+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
-"Language-Team: Esperanto <gnome-l10n-eo lists launchpad net>\n"
+"Language-Team: Esperanto <gnome-eo-list gnome org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"X-Generator: KBabel 1.0.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../src/bc-backends.c:81
 msgid "Built-in"
@@ -42,7 +42,7 @@ msgstr "POSTNET-11 (DPBC)"
 
 #: ../src/bc-backends.c:113
 msgid "CEPNET"
-msgstr ""
+msgstr "CEPNET"
 
 #: ../src/bc-backends.c:116
 msgid "One Code"
@@ -88,7 +88,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A aŭ UPC-E)"
 
-#: ../src/bc-backends.c:151 ../src/bc-backends.c:395
+#: ../src/bc-backends.c:151 ../src/bc-backends.c:398
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -100,7 +100,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc-backends.c:160 ../src/bc-backends.c:398
+#: ../src/bc-backends.c:160 ../src/bc-backends.c:401
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -112,7 +112,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc-backends.c:169 ../src/bc-backends.c:332
+#: ../src/bc-backends.c:169 ../src/bc-backends.c:335
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -132,7 +132,7 @@ msgstr "Kodo 128C"
 msgid "Code 128B"
 msgstr "Kodo 128B"
 
-#: ../src/bc-backends.c:187 ../src/bc-backends.c:329
+#: ../src/bc-backends.c:187 ../src/bc-backends.c:332
 msgid "Interleaved 2 of 5"
 msgstr "Interleaved 2 of 5"
 
@@ -209,7 +209,7 @@ msgid "Code 49"
 msgstr "Kodo 49"
 
 #: ../src/bc-backends.c:263
-msgid "Code 128 (Mode C supression)"
+msgid "Code 128 (Mode C suppression)"
 msgstr ""
 
 #: ../src/bc-backends.c:266
@@ -221,167 +221,170 @@ msgid "Data Matrix"
 msgstr ""
 
 #: ../src/bc-backends.c:272
-msgid "Deutsche Post Leitcode"
+msgid "Data Matrix (GS1)"
 msgstr ""
 
 #: ../src/bc-backends.c:275
-msgid "Deutsche Post Identcode"
+msgid "Deutsche Post Leitcode"
 msgstr ""
 
 #: ../src/bc-backends.c:278
-msgid "Dutch Post KIX Code"
+msgid "Deutsche Post Identcode"
 msgstr ""
 
 #: ../src/bc-backends.c:281
-#| msgid "EAN-8"
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc-backends.c:284
 msgid "EAN"
 msgstr "EAN"
 
-#: ../src/bc-backends.c:284
+#: ../src/bc-backends.c:287
 msgid "Grid Matrix"
 msgstr ""
 
-#: ../src/bc-backends.c:287
+#: ../src/bc-backends.c:290
 msgid "GS1-128"
-msgstr ""
+msgstr "GS1-128"
 
-#: ../src/bc-backends.c:290
+#: ../src/bc-backends.c:293
 msgid "GS1 DataBar-14"
-msgstr ""
+msgstr "GS1 DataBar-14"
 
-#: ../src/bc-backends.c:299
+#: ../src/bc-backends.c:302
 msgid "GS1 DataBar-14 Stacked"
-msgstr ""
+msgstr "GS1 DataBar-14 Stacked"
 
-#: ../src/bc-backends.c:302
+#: ../src/bc-backends.c:305
 msgid "GS1 DataBar-14 Stacked Omni."
-msgstr ""
+msgstr "GS1 DataBar-14 Stacked Omni."
 
-#: ../src/bc-backends.c:305
+#: ../src/bc-backends.c:308
 msgid "GS1 DataBar Extended Stacked"
 msgstr ""
 
-#: ../src/bc-backends.c:308
+#: ../src/bc-backends.c:311
 msgid "HIBC Code 128"
 msgstr ""
 
-#: ../src/bc-backends.c:311
+#: ../src/bc-backends.c:314
 msgid "HIBC Code 39"
 msgstr ""
 
-#: ../src/bc-backends.c:314
+#: ../src/bc-backends.c:317
 msgid "HIBC Data Matrix"
 msgstr ""
 
-#: ../src/bc-backends.c:317
+#: ../src/bc-backends.c:320
 msgid "HIBC QR Code"
 msgstr ""
 
-#: ../src/bc-backends.c:320
+#: ../src/bc-backends.c:323
 msgid "HIBC PDF417"
-msgstr ""
+msgstr "HIBC PDF417"
 
-#: ../src/bc-backends.c:323
+#: ../src/bc-backends.c:326
 msgid "HIBC Micro PDF417"
-msgstr ""
+msgstr "HIBC Micro PDF417"
 
-#: ../src/bc-backends.c:326
+#: ../src/bc-backends.c:329
 msgid "HIBC Aztec Code"
 msgstr ""
 
-#: ../src/bc-backends.c:335
+#: ../src/bc-backends.c:338
 msgid "ITF-14"
-msgstr ""
+msgstr "ITF-14"
 
-#: ../src/bc-backends.c:338
+#: ../src/bc-backends.c:341
 msgid "Japanese Postal"
 msgstr ""
 
-#: ../src/bc-backends.c:341
+#: ../src/bc-backends.c:344
 msgid "Korean Postal"
 msgstr ""
 
-#: ../src/bc-backends.c:344
+#: ../src/bc-backends.c:347
 msgid "LOGMARS"
-msgstr ""
+msgstr "LOGMARS"
 
-#: ../src/bc-backends.c:347
+#: ../src/bc-backends.c:350
 msgid "Maxicode"
 msgstr ""
 
-#: ../src/bc-backends.c:350
+#: ../src/bc-backends.c:353
 msgid "Micro PDF417"
-msgstr ""
+msgstr "Micro PDF417"
 
-#: ../src/bc-backends.c:353
+#: ../src/bc-backends.c:356
 msgid "Micro QR Code"
 msgstr ""
 
-#: ../src/bc-backends.c:356
+#: ../src/bc-backends.c:359
 msgid "MSI Plessey"
 msgstr ""
 
-#: ../src/bc-backends.c:359
+#: ../src/bc-backends.c:362
 msgid "NVE-18"
-msgstr ""
+msgstr "NVE-18"
 
-#: ../src/bc-backends.c:362
+#: ../src/bc-backends.c:365
 msgid "PDF417"
-msgstr ""
+msgstr "PDF417"
 
-#: ../src/bc-backends.c:365
+#: ../src/bc-backends.c:368
 msgid "PDF417 Truncated"
 msgstr ""
 
-#: ../src/bc-backends.c:368
+#: ../src/bc-backends.c:371
 msgid "PLANET"
-msgstr ""
+msgstr "PLANET"
 
-#: ../src/bc-backends.c:371
+#: ../src/bc-backends.c:374
 msgid "PostNet"
-msgstr ""
+msgstr "PostNet"
 
-#: ../src/bc-backends.c:374
+#: ../src/bc-backends.c:377
 msgid "Pharmacode"
-msgstr ""
+msgstr "Pharmacode"
 
-#: ../src/bc-backends.c:377
+#: ../src/bc-backends.c:380
 msgid "Pharmacode 2-track"
-msgstr ""
+msgstr "Pharmacode 2-track"
 
-#: ../src/bc-backends.c:380
+#: ../src/bc-backends.c:383
 msgid "Pharmazentral Nummer (PZN)"
 msgstr ""
 
-#: ../src/bc-backends.c:383
+#: ../src/bc-backends.c:386
 msgid "QR Code"
 msgstr ""
 
-#: ../src/bc-backends.c:386
+#: ../src/bc-backends.c:389
 msgid "Royal Mail 4-State"
 msgstr ""
 
-#: ../src/bc-backends.c:389
+#: ../src/bc-backends.c:392
 msgid "Telepen"
-msgstr ""
+msgstr "Telepen"
 
-#: ../src/bc-backends.c:392
+#: ../src/bc-backends.c:395
 msgid "Telepen Numeric"
 msgstr ""
 
-#: ../src/bc-backends.c:401
+#: ../src/bc-backends.c:404
 msgid "USPS One Code"
 msgstr ""
 
-#: ../src/bc-backends.c:404
+#: ../src/bc-backends.c:407
 msgid "UK Plessey"
 msgstr ""
 
-#: ../src/bc-backends.c:411
+#: ../src/bc-backends.c:414
 msgid "IEC16022 (DataMatrix)"
 msgstr ""
 
-#: ../src/bc-backends.c:418
+#: ../src/bc-backends.c:421
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -391,7 +394,7 @@ msgstr "Defaŭlta koloro"
 
 #: ../src/color-combo-menu.c:83
 msgid "Dark Red"
-msgstr "malhela ruĝo"
+msgstr "Malhela ruĝo"
 
 #: ../src/color-combo-menu.c:84
 msgid "Brown"
@@ -403,7 +406,7 @@ msgstr ""
 
 #: ../src/color-combo-menu.c:86
 msgid "Dark Green"
-msgstr "malhela verdo"
+msgstr "Malhela verdo"
 
 #: ../src/color-combo-menu.c:87
 msgid "Dark Cyan"
@@ -415,7 +418,7 @@ msgstr ""
 
 #: ../src/color-combo-menu.c:89
 msgid "Dark Violet"
-msgstr "malhela violkoloro"
+msgstr "Malhela violkoloro"
 
 #: ../src/color-combo-menu.c:91
 msgid "Red"
@@ -423,16 +426,15 @@ msgstr "Ruĝo"
 
 #: ../src/color-combo-menu.c:92
 msgid "Orange"
-msgstr "oranĝkoloro"
+msgstr "Oranĝkoloro"
 
 #: ../src/color-combo-menu.c:93
 msgid "Dark Yellow"
-msgstr ""
+msgstr "Malehela flavo"
 
 #: ../src/color-combo-menu.c:94
-#, fuzzy
 msgid "Medium green"
-msgstr "nebrila verdo"
+msgstr "Nebrila verdo"
 
 #: ../src/color-combo-menu.c:95
 msgid "Turquoise"
@@ -440,11 +442,11 @@ msgstr ""
 
 #: ../src/color-combo-menu.c:96
 msgid "Blue"
-msgstr "bluo"
+msgstr "Bluo"
 
 #: ../src/color-combo-menu.c:97
 msgid "Purple"
-msgstr "purpuro"
+msgstr "Purpuro"
 
 #: ../src/color-combo-menu.c:99
 msgid "Salmon"
@@ -452,23 +454,23 @@ msgstr ""
 
 #: ../src/color-combo-menu.c:100
 msgid "Gold"
-msgstr "oro"
+msgstr "Oro"
 
 #: ../src/color-combo-menu.c:101
 msgid "Yellow"
-msgstr "flavo"
+msgstr "Flavo"
 
 #: ../src/color-combo-menu.c:102
 msgid "Green"
-msgstr "verdo"
+msgstr "Verdo"
 
 #: ../src/color-combo-menu.c:103
 msgid "Cyan"
-msgstr "cejano"
+msgstr "Cejano"
 
 #: ../src/color-combo-menu.c:104
 msgid "SkyBlue"
-msgstr "ĉielbluo"
+msgstr "Ĉielbluo"
 
 #: ../src/color-combo-menu.c:105
 msgid "Violet"
@@ -476,7 +478,7 @@ msgstr "Violkoloro"
 
 #: ../src/color-combo-menu.c:107
 msgid "Pink"
-msgstr "rozkoloro"
+msgstr "Rozkoloro"
 
 #: ../src/color-combo-menu.c:108
 msgid "Khaki"
@@ -484,15 +486,15 @@ msgstr ""
 
 #: ../src/color-combo-menu.c:109
 msgid "Light Yellow"
-msgstr "hela flavo"
+msgstr "Hela flavo"
 
 #: ../src/color-combo-menu.c:110
 msgid "Light Green"
-msgstr "hela verdo"
+msgstr "Hela verdo"
 
 #: ../src/color-combo-menu.c:111
 msgid "Light Cyan"
-msgstr "hela cejano"
+msgstr "Hela cejano"
 
 #: ../src/color-combo-menu.c:112
 msgid "Slate Gray"
@@ -504,7 +506,7 @@ msgstr ""
 
 #: ../src/color-combo-menu.c:115
 msgid "White"
-msgstr "blanko"
+msgstr "Blanko"
 
 #: ../src/color-combo-menu.c:117
 #, no-c-format
@@ -533,7 +535,7 @@ msgstr "60% grizo"
 
 #: ../src/color-combo-menu.c:126
 msgid "Black"
-msgstr "nigro"
+msgstr "Nigro"
 
 #: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 msgid "Custom Color"
@@ -544,85 +546,93 @@ msgstr "Propra Koloro"
 msgid "Custom Color #%u"
 msgstr "Propra koloro #%u"
 
-#: ../src/critical-error-handler.c:70
+#: ../src/critical-error-handler.c:72
 msgid "gLabels Fatal Error!"
 msgstr ""
 
-#: ../src/file.c:84
+#: ../src/file.c:85
 msgid "New Label or Card"
 msgstr "Nova Etikedo aŭ Karto"
 
-#: ../src/file.c:175 ../src/label.c:601 ../src/label.c:645
+#. Translators: dialog title
+#: ../src/file.c:174 ../src/label.c:602 ../src/label.c:646
 msgid "Label properties"
 msgstr "Ecoj de etikedo"
 
-#: ../src/file.c:267 ../src/file.c:557
+#. Translators: assistent dialog title
+#: ../src/file.c:203
+#, fuzzy
+#| msgid "Label properties"
+msgid "Choose label properties"
+msgstr "Ecoj de etikedo"
+
+#: ../src/file.c:295 ../src/file.c:597
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/file.c:272 ../src/file.c:562
+#: ../src/file.c:300 ../src/file.c:602
 msgid "gLabels documents"
 msgstr "Dokumentoj de gLabels"
 
-#: ../src/file.c:319 ../src/file.c:620
+#: ../src/file.c:347 ../src/file.c:660
 msgid "Empty file name selection"
 msgstr "Elektado de nomon de vakua dosiero"
 
-#: ../src/file.c:322 ../src/file.c:338
+#: ../src/file.c:350 ../src/file.c:366
 msgid "Please select a file or supply a valid file name"
 msgstr "Bonvolu indiki dosieron aŭ validan dosiernomon"
 
-#: ../src/file.c:335
+#: ../src/file.c:363
 msgid "File does not exist"
-msgstr "la dosiero ne ekzistas"
+msgstr "La dosiero ne ekzistas"
 
-#: ../src/file.c:410
+#: ../src/file.c:438
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Estas neeble malfermi dosieron \"%s\""
 
-#: ../src/file.c:413
+#: ../src/file.c:441
 msgid "Not a supported file format"
 msgstr "La formato de dosiero ne estas subtenita"
 
-#: ../src/file.c:491 ../src/file.c:670
+#: ../src/file.c:519 ../src/file.c:710
 #, c-format
 msgid "Could not save file \"%s\""
-msgstr "estas neeble konservi dosieron \"%s\""
+msgstr "Ne eblas konservi dosieron \"%s\""
 
-#: ../src/file.c:495 ../src/file.c:674
+#: ../src/file.c:523 ../src/file.c:714
 msgid "Error encountered during save.  The file is still not saved."
-msgstr "Eraro dum konservado. la dosiero ankoraŭ ne estas konservita."
+msgstr "Eraro dum konservado.  La dosiero ankoraŭ ne estas konservita."
 
-#: ../src/file.c:535
+#: ../src/file.c:565
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Konservi \"%s\" kiel"
 
-#: ../src/file.c:623
+#: ../src/file.c:663
 msgid "Please supply a valid file name"
 msgstr "Bonvolu indiki validan dosiernomon"
 
-#: ../src/file.c:644
+#: ../src/file.c:684
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Ĉu mi devas anstataŭigi dosieron \"%s\"?"
 
-#: ../src/file.c:648
+#: ../src/file.c:688
 msgid "File already exists."
 msgstr "La dosiero jam ekzistas."
 
-#: ../src/file.c:744
+#: ../src/file.c:784
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 "Ĉu mi devas konservi la modifojn de la dokumento \"%s\" antaŭ ol fermi?"
 
-#: ../src/file.c:748
+#: ../src/file.c:788
 msgid "Your changes will be lost if you don't save them."
 msgstr "La modifoj estos perditaj se oni ne konservas ilin."
 
-#: ../src/file.c:751
+#: ../src/file.c:791
 msgid "Close without saving"
 msgstr "Fermi sen konservi"
 
@@ -706,7 +716,7 @@ msgstr "unua etikedo de unua folio (defaŭlte 1)"
 msgid "first"
 msgstr "unua"
 
-#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print outlines (to test printer alignment)"
 msgstr "presi konturojn (por testi alliniĝon de la presilo)"
 
@@ -714,7 +724,7 @@ msgstr "presi konturojn (por testi alliniĝon de la presilo)"
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "presi inverse (ekz. iun spegulitan bildon)"
 
-#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print crop marks"
 msgstr "presi liniojn de tranĉo"
 
@@ -781,98 +791,135 @@ msgid "Create box object"
 msgstr "Krei * objekton"
 
 #: ../src/label-box.c:230 ../src/label-ellipse.c:232
-#: ../data/ui/property-bar.ui.h:3
+#: ../data/ui/property-bar.ui.h:12
 msgid "Fill color"
 msgstr "Koloro de plenigo"
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../data/ui/property-bar.ui.h:8
+#: ../data/ui/property-bar.ui.h:13
 msgid "Line color"
 msgstr "Koloro de linio"
 
 #: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
-#: ../data/ui/property-bar.ui.h:9
+#: ../data/ui/property-bar.ui.h:14
 msgid "Line width"
 msgstr "Larĝo de linio"
 
-#: ../src/label.c:405
+#: ../src/label.c:406
 msgid "Untitled"
 msgstr "Sen nomo"
 
-#: ../src/label.c:719 ../src/ui.c:420
+#. Translators: A rectangular label dimensions. first param is numeric value
+#. of width, second is numeric value of height and third is unit. Example:
+#. "60 × 22.5 mm (width / height)"
+#. Translators: A elliptical label dimensions. first param is numeric value of
+#. width, second is numeric value of height and third is unit. Example:
+#. "60 × 22.5 mm (width / height)"
+#: ../src/label.c:751 ../src/label.c:776
+#, c-format
+msgid "%s × %s %s (width × height)"
+msgstr ""
+
+#. Translators: A rounded rectangular label dimensions. first param is numeric
+#. value of width, second is numeric value of height, third is numeric value
+#. of round and fourth is unit. Example:
+#. "50 × 30 / 1.5 mm (width × height / round)"
+#: ../src/label.c:758
+#, c-format
+msgid "%s × %s / %s %s (width × height / round)"
+msgstr ""
+
+#. Translators: A round label dimensions. first param is numeric value of
+#. diameter and second is unit. Example:
+#. "120.5 mm (diameter)"
+#: ../src/label.c:788
+#, c-format
+#| msgid "%.5g %s diameter"
+msgid "%s %s (diameter)"
+msgstr "%s %s (diametro)"
+
+#. Translators: A CD/DVD label dimensions. first param is numeric value of
+#. diameter, second is numeric value of hole and third is unit. Example:
+#. "120.5 / 30 mm (diameter / hole)"
+#: ../src/label.c:806
+#, c-format
+msgid "%s / %s %s (diameter / hole)"
+msgstr ""
+
+#: ../src/label.c:835 ../src/ui.c:420
 msgid "Merge properties"
 msgstr "Ecoj de kunfando"
 
-#: ../src/label.c:1215 ../src/ui.c:213
+#: ../src/label.c:1331 ../src/ui.c:213
 msgid "Delete"
 msgstr "Forigi"
 
-#: ../src/label.c:1248 ../src/ui.c:322
+#: ../src/label.c:1366 ../src/ui.c:322
 msgid "Bring to front"
 msgstr "Porti fronten"
 
-#: ../src/label.c:1284 ../src/ui.c:329
+#: ../src/label.c:1402 ../src/ui.c:329
 msgid "Send to back"
 msgstr "Sendi malantaŭen"
 
-#: ../src/label.c:1325
+#: ../src/label.c:1443
 msgid "Rotate"
 msgstr "Rotacio"
 
-#: ../src/label.c:1360 ../src/ui.c:336
+#: ../src/label.c:1480 ../src/ui.c:336
 msgid "Rotate left"
 msgstr "Turni maldekstren"
 
-#: ../src/label.c:1393 ../src/ui.c:343
+#: ../src/label.c:1515 ../src/ui.c:343
 msgid "Rotate right"
 msgstr "Turni dekstren"
 
-#: ../src/label.c:1428 ../src/ui.c:350
+#: ../src/label.c:1552 ../src/ui.c:350
 msgid "Flip horizontally"
 msgstr "Renversi horizontale"
 
-#: ../src/label.c:1463 ../src/ui.c:357
+#: ../src/label.c:1589 ../src/ui.c:357
 msgid "Flip vertically"
 msgstr "Renversi vertikale"
 
-#: ../src/label.c:1503 ../src/ui.c:364
+#: ../src/label.c:1631 ../src/ui.c:364
 msgid "Align left"
 msgstr ""
 
-#: ../src/label.c:1560 ../src/ui.c:378
+#: ../src/label.c:1688 ../src/ui.c:378
 msgid "Align right"
 msgstr "Laŭlinnigi dekstren"
 
-#: ../src/label.c:1621
+#: ../src/label.c:1749
 #, fuzzy
 msgid "Align horizontal center"
 msgstr "Laŭlinnigi horizontale centre"
 
-#: ../src/label.c:1697
+#: ../src/label.c:1825
 msgid "Align tops"
 msgstr "Laŭlinnigi supre"
 
-#: ../src/label.c:1754
+#: ../src/label.c:1882
 #, fuzzy
 msgid "Align bottoms"
 msgstr "Laŭlinnigi objektojn sube"
 
-#: ../src/label.c:1815
+#: ../src/label.c:1943
 #, fuzzy
 msgid "Align vertical center"
 msgstr "Laŭliniigi verticale centre"
 
-#: ../src/label.c:1893 ../src/ui.c:406
+#: ../src/label.c:2021 ../src/ui.c:406
 #, fuzzy
 msgid "Center horizontally"
 msgstr "Centre horizontale"
 
-#: ../src/label.c:1940 ../src/ui.c:413
+#: ../src/label.c:2068 ../src/ui.c:413
 #, fuzzy
 msgid "Center vertically"
 msgstr "Centre vertikale"
 
-#: ../src/label.c:2628 ../src/label.c:2670 ../src/label.c:2696 ../src/ui.c:206
+#: ../src/label.c:2789 ../src/label.c:2831 ../src/label.c:2857 ../src/ui.c:206
 msgid "Paste"
 msgstr "Enmeti"
 
@@ -881,11 +928,11 @@ msgstr "Enmeti"
 msgid "Create ellipse object"
 msgstr "Krei elipsan objekton"
 
-#: ../src/label-image.c:200 ../src/ui.c:310
+#: ../src/label-image.c:199 ../src/ui.c:310
 msgid "Create image object"
 msgstr "Krei bildan objekton"
 
-#: ../src/label-image.c:333 ../src/label-image.c:474
+#: ../src/label-image.c:332 ../src/label-image.c:473
 msgid "Set image"
 msgstr ""
 
@@ -893,67 +940,88 @@ msgstr ""
 msgid "Create line object"
 msgstr "Krei linian objekton"
 
-#: ../src/label-object.c:394 ../src/label-object.c:428
+#: ../src/label-object.c:392 ../src/label-object.c:423
 msgid "Move"
 msgstr "Movi"
 
-#: ../src/label-object.c:479
+#: ../src/label-object.c:474
 msgid "Resize"
 msgstr "Aligrandigi"
 
-#: ../src/label-object.c:1217
+#: ../src/label-object.c:1258
 msgid "Shadow state"
 msgstr ""
 
-#: ../src/label-object.c:1260
+#: ../src/label-object.c:1301
 msgid "Shadow offset"
 msgstr ""
 
-#: ../src/label-object.c:1308
+#: ../src/label-object.c:1349
 msgid "Shadow color"
 msgstr "Ombra koloro"
 
-#: ../src/label-object.c:1351
+#: ../src/label-object.c:1392
 msgid "Shadow opacity"
 msgstr ""
 
-#: ../src/label-text.c:281 ../src/ui.c:282
+#. Translators: Button label to choose different template
+#: ../src/label-properties-dialog.c:163
+msgid "Choose _other…"
+msgstr ""
+
+#: ../src/label-properties-dialog.c:164 ../src/ui.c:162
+msgid "_Close"
+msgstr "_Fermi"
+
+#. Translators: first param is numeric value of horizontal margine, second
+#. is numeric value of vertical margine and third is unit. Example:
+#. "10 / 12.5 mm (horizontal / vertical)"
+#: ../src/label-properties-dialog.c:282
+#, c-format
+msgid "%s / %s %s (horizontal / vertical)"
+msgstr ""
+
+#: ../src/label-text.c:293 ../src/ui.c:282
 msgid "Create text object"
 msgstr "Krei tekstan objekton"
 
-#: ../src/label-text.c:453
+#: ../src/label-text.c:467
 msgid "Typing"
 msgstr "Tajpado"
 
-#: ../src/label-text.c:586 ../data/ui/property-bar.ui.h:4
+#: ../src/label-text.c:601 ../data/ui/property-bar.ui.h:1
 msgid "Font family"
 msgstr "Tiparfamilio"
 
-#: ../src/label-text.c:624 ../data/ui/property-bar.ui.h:5
+#: ../src/label-text.c:639 ../data/ui/property-bar.ui.h:2
 msgid "Font size"
 msgstr "Tipargrando"
 
-#: ../src/label-text.c:657
+#: ../src/label-text.c:672
 msgid "Font weight"
 msgstr "Tiparpezo"
 
-#: ../src/label-text.c:690 ../data/ui/property-bar.ui.h:6
+#: ../src/label-text.c:705 ../data/ui/property-bar.ui.h:4
 msgid "Italic"
 msgstr "Kursivo"
 
-#: ../src/label-text.c:723
+#: ../src/label-text.c:738
 msgid "Align text"
 msgstr ""
 
-#: ../src/label-text.c:756
+#: ../src/label-text.c:771
+msgid "Vertically align text"
+msgstr ""
+
+#: ../src/label-text.c:804
 msgid "Line spacing"
 msgstr "Linia interspaco"
 
-#: ../src/label-text.c:789 ../data/ui/property-bar.ui.h:11
+#: ../src/label-text.c:837 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Koloro de teksto"
 
-#: ../src/label-text.c:933
+#: ../src/label-text.c:997
 msgid "Auto shrink"
 msgstr ""
 
@@ -984,9 +1052,8 @@ msgid "This action will permanently delete this template."
 msgstr ""
 
 #: ../src/media-select.c:990
-#, fuzzy
 msgid "No recent templates found."
-msgstr "Neniu * ŝablono estis trovita!"
+msgstr "Ne trovis pasintan ŝablonon."
 
 #: ../src/media-select.c:992
 msgid "Try selecting a template in the \"Search all\" tab."
@@ -1004,7 +1071,7 @@ msgstr ""
 
 #: ../src/media-select.c:1179
 msgid "No custom templates found."
-msgstr "Neniu propra ŝablono estis trovita!"
+msgstr "Ne trovis propran ŝablonon."
 
 #: ../src/media-select.c:1181
 msgid ""
@@ -1078,7 +1145,7 @@ msgstr "Elekti"
 msgid "Record/Field"
 msgstr "Rikordo/Kampo"
 
-#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:10
+#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:24
 msgid "Data"
 msgstr "Datumoj"
 
@@ -1091,63 +1158,67 @@ msgid "Fixed"
 msgstr "Fiksite"
 
 #. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1054
+#: ../src/mini-preview.c:1051
 msgid "Up"
 msgstr "Supren"
 
-#: ../src/new-label-dialog.c:203
+#: ../src/new-label-dialog.c:214
+#, fuzzy
+#| msgid "Select Product"
+msgctxt "Title of dialog page to select a stationary product"
 msgid "Select Product"
 msgstr "Elekti produkton"
 
-#: ../src/new-label-dialog.c:215
+#: ../src/new-label-dialog.c:227 ../data/ui/new-label-dialog.ui.h:3
 #, fuzzy
 msgid "Choose Orientation"
 msgstr "Elekti orientadon"
 
-#: ../src/new-label-dialog.c:229
+#: ../src/new-label-dialog.c:242
 msgid "Review"
 msgstr "Recenzo"
 
 #: ../src/object-editor-bc-page.c:97 ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:335
-#: ../src/ui-property-bar.c:277
+#: ../src/object-editor-text-page.c:102 ../src/prefs-dialog.c:335
+#: ../src/ui-property-bar.c:289
 msgid "Default"
 msgstr "Defaŭlto"
 
-#: ../src/object-editor.c:161 ../src/object-editor.c:470
+#: ../src/object-editor.c:161 ../src/object-editor.c:472
 msgid "Object properties"
 msgstr "Ecoj de objekto"
 
 #: ../src/object-editor.c:314
+#, fuzzy
 msgid "Box object properties"
-msgstr "Ecoj de Fako"
+msgstr "Ecoj de fako"
 
 #: ../src/object-editor.c:333
 msgid "Ellipse object properties"
-msgstr "Ecoj de Elipso"
+msgstr "Ecoj de elipso"
 
 #: ../src/object-editor.c:352
 msgid "Line object properties"
-msgstr "Ecoj de Linio"
+msgstr "Ecoj de linio"
 
 #: ../src/object-editor.c:369
 msgid "Image object properties"
-msgstr "Ecoj de Bildo"
+msgstr "Ecoj de bildo"
 
 #: ../src/object-editor.c:386
 msgid "Text object properties"
-msgstr "Ecoj de Teksto"
+msgstr "Ecoj de teksto"
 
 #: ../src/object-editor.c:408
 msgid "Barcode object properties"
-msgstr "Ecoj de Strekkodo"
+msgstr "Ecoj de strekkodo"
 
 #: ../src/object-editor-edit-page.c:76
 msgid "Insert merge field"
 msgstr "Enigi kampon de kunfando"
 
 #: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
-#: ../src/ui-property-bar.c:287
+#: ../src/ui-property-bar.c:299
 msgid "No Fill"
 msgstr "Neniu plenigo"
 
@@ -1165,7 +1236,7 @@ msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
 #: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:338
-#: ../src/ui-property-bar.c:297
+#: ../src/ui-property-bar.c:309
 msgid "No Line"
 msgstr "Neniu linio"
 
@@ -1173,14 +1244,14 @@ msgstr "Neniu linio"
 msgid "Lock aspect ratio."
 msgstr ""
 
-#: ../src/prefs-dialog.c:168 ../data/ui/prefs-dialog.ui.h:21
+#: ../src/prefs-dialog.c:168 ../data/ui/prefs-dialog.ui.h:1
 msgid "gLabels Preferences"
 msgstr "Agordoj de gLabels"
 
 #. TODO: Is this the actual part #?
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:215
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-#: ../templates/misc-iso-templates.xml.h:24
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Labels"
 msgstr "Etikedoj"
 
@@ -1291,7 +1362,6 @@ msgid "_Alignment"
 msgstr "_Alliniĝo"
 
 #: ../src/ui.c:103
-#| msgid "Centers"
 msgid "C_enter"
 msgstr "C_entri"
 
@@ -1360,10 +1430,6 @@ msgstr "_Desegnilo de Modeloj..."
 msgid "Create a custom template"
 msgstr "Krei personigitan modelon"
 
-#: ../src/ui.c:162
-msgid "_Close"
-msgstr "_Fermi"
-
 #: ../src/ui.c:164
 msgid "Close the current file"
 msgstr "Fermi la nunan dosieron"
@@ -1374,7 +1440,7 @@ msgstr "_Eliro"
 
 #: ../src/ui.c:171
 msgid "Quit the program"
-msgstr "Ĉesi el programo"
+msgstr "Ĉesi la programon"
 
 #: ../src/ui.c:178 ../src/ui.c:180 ../src/ui.c:976
 msgid "Undo"
@@ -1450,7 +1516,7 @@ msgstr "Malpliigi zomon"
 
 #: ../src/ui.c:257
 msgid "Zoom 1 to 1"
-msgstr "Zomo je _1:1"
+msgstr "Zomo je 1 al 1"
 
 #: ../src/ui.c:259
 msgid "Restore scale to 100%"
@@ -1473,7 +1539,7 @@ msgstr "Reĝimo de elektado"
 msgid "Select, move and modify objects"
 msgstr "Elekti, movi kaj redakti objektojn"
 
-#: ../src/ui.c:280 ../src/view-text.c:94 ../data/ui/object-editor.ui.h:30
+#: ../src/ui.c:280 ../src/view-text.c:94 ../data/ui/object-editor.ui.h:2
 #: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Teksto"
@@ -1487,8 +1553,8 @@ msgstr "Skatolo"
 msgid "Create box/rectangle object"
 msgstr "Krei objekton de areo/rektangulo"
 
-#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:19
-#: ../data/ui/prefs-dialog.ui.h:9
+#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:20
 msgid "Line"
 msgstr "Linio"
 
@@ -1500,7 +1566,7 @@ msgstr "Elipso"
 msgid "Create ellipse/circle object"
 msgstr "Krei objekton de elipse/circlo"
 
-#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:16
+#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:20
 msgid "Image"
 msgstr "Bildo"
 
@@ -1660,9 +1726,7 @@ msgstr ""
 
 #: ../src/ui-commands.c:1166
 msgid "translator-credits"
-msgstr ""
-"Antonio C. CODAZZI, 2007.\n"
-"Kristjan SCHMIDT, 2011."
+msgstr "Antonio C. CODAZZI, Kristjan SCHMIDT"
 
 #: ../src/ui-commands.c:1169
 msgid ""
@@ -1686,7 +1750,7 @@ msgstr ""
 "aŭ ADAPTADO AL IU APARTA CELO.  Vidu la Ĝeneralan Publikan\n"
 "Permesilon de GNU por pli da detaloj.\n"
 
-#: ../src/warning-handler.c:69
+#: ../src/warning-handler.c:71
 msgid "gLabels Error!"
 msgstr "Eraro de gLabels!"
 
@@ -1694,7 +1758,7 @@ msgstr "Eraro de gLabels!"
 msgid "(none) - gLabels"
 msgstr "(nenio) - gLabels"
 
-#: ../src/window.c:482
+#: ../src/window.c:484
 msgid "(modified)"
 msgstr "(modifita)"
 
@@ -1752,7 +1816,6 @@ msgstr "%d por folio"
 
 #: ../libglabels/lgl-template.c:759 ../libglabels/lgl-template.c:767
 #: ../libglabels/lgl-template.c:779 ../libglabels/lgl-template.c:787
-#, fuzzy
 msgid "diameter"
 msgstr "diametro"
 
@@ -1760,14 +1823,14 @@ msgstr "diametro"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:42
-#: ../data/ui/prefs-dialog.ui.h:22
+#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:15
+#: ../data/ui/prefs-dialog.ui.h:19
 msgid "points"
 msgstr "punktoj"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:40
-#: ../data/ui/template-designer.ui.h:66
+#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/template-designer.ui.h:15
 msgid "inches"
 msgstr "coloj"
 
@@ -1794,433 +1857,556 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "Format:"
-msgstr "Formato:"
+#: ../data/ui/label-properties-dialog.ui.h:1
+#| msgid "Labels"
+msgid "Label"
+msgstr "Etikedo"
 
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "Location:"
-msgstr "Lokiĝo:"
+#: ../data/ui/label-properties-dialog.ui.h:2
+#: ../data/ui/new-label-dialog.ui.h:15
+msgid "Vendor:"
+msgstr "Vendisto:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:3
-msgid "Record selection/preview"
-msgstr "Elektado/Antaŭmontro de rikordo"
+#: ../data/ui/label-properties-dialog.ui.h:3
+#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
+msgid "Part #:"
+msgstr "Parto #:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:4
-msgid "Select all"
-msgstr "Elekti ĉiujn"
+#: ../data/ui/label-properties-dialog.ui.h:4 ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/template-designer.ui.h:9
+msgid "Description:"
+msgstr "Priskribo:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:5
-msgid "Source"
-msgstr "Fonto"
+#: ../data/ui/label-properties-dialog.ui.h:5
+msgid "Dimensions:"
+msgstr ""
 
-#: ../data/ui/merge-properties-dialog.ui.h:6
-msgid "Unselect all"
-msgstr "Malelekti ĉiujn"
+#: ../data/ui/label-properties-dialog.ui.h:6
+msgid "Medium size:"
+msgstr ""
+
+#: ../data/ui/label-properties-dialog.ui.h:7
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Layout:"
+msgstr "Aspekto:"
+
+#: ../data/ui/label-properties-dialog.ui.h:8
+#| msgid "3. Margin"
+msgid "Margins:"
+msgstr "Marĝenoj:"
+
+#: ../data/ui/label-properties-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:13
+msgid "Similar products:"
+msgstr ""
+
+#: ../data/ui/label-properties-dialog.ui.h:10
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "Options"
+msgstr "Opcioj"
+
+#: ../data/ui/label-properties-dialog.ui.h:11
+msgid "Orientation:"
+msgstr "Orientiĝo:"
+
+#: ../data/ui/label-properties-dialog.ui.h:12
+#| msgid "Normal"
+msgid "_Normal"
+msgstr "_Normale"
+
+#: ../data/ui/label-properties-dialog.ui.h:13
+#| msgid "Rotated"
+msgid "_Rotated"
+msgstr "_Turnite"
 
 #: ../data/ui/media-select.ui.h:1
+msgid "Recent"
+msgstr "Lasttempaj"
+
+#: ../data/ui/media-select.ui.h:2
 msgid "Brand:"
 msgstr ""
 
-#: ../data/ui/media-select.ui.h:2
+#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:10
+#: ../data/ui/template-designer.ui.h:12
+msgid "Page size:"
+msgstr "Grando de paĝo:"
+
+#: ../data/ui/media-select.ui.h:4
 msgid "Category:"
 msgstr "Kategorio:"
 
-#: ../data/ui/media-select.ui.h:3
+#: ../data/ui/media-select.ui.h:5
+msgid "Search all"
+msgstr "Serĉi ĉiujn"
+
+#: ../data/ui/media-select.ui.h:6
 msgid "Custom"
 msgstr "Personigite"
 
-#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
-#: ../data/ui/template-designer.ui.h:46
-msgid "Page size:"
-msgstr "Grando de paĝo:"
+#: ../data/ui/merge-properties-dialog.ui.h:1
+msgid "Format:"
+msgstr "Formato:"
 
-#: ../data/ui/media-select.ui.h:5
-msgid "Recent"
-msgstr "Lasttempaj"
+#: ../data/ui/merge-properties-dialog.ui.h:2
+msgid "Location:"
+msgstr "Lokiĝo:"
 
-#: ../data/ui/media-select.ui.h:6
-msgid "Search all"
-msgstr "Serĉi ĉiujn"
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Source"
+msgstr "Fonto"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
+msgid "Select all"
+msgstr "Elekti ĉiujn"
+
+#: ../data/ui/merge-properties-dialog.ui.h:5
+msgid "Unselect all"
+msgstr "Malelekti ĉiujn"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
+msgid "Record selection/preview"
+msgstr "Elektado/Antaŭmontro de rikordo"
 
 #: ../data/ui/new-label-dialog.ui.h:1
+msgid "Select Product"
+msgstr "Elekti produkton"
+
+#: ../data/ui/new-label-dialog.ui.h:2
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
 "your own."
 msgstr ""
 
-#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:29
-msgid "Description:"
-msgstr "Priskribo:"
-
-#: ../data/ui/new-label-dialog.ui.h:3
-msgid "Label size:"
-msgstr "Grando de etikedo:"
-
 #: ../data/ui/new-label-dialog.ui.h:4
-msgid "Layout:"
-msgstr "Aspekto:"
+msgid "Select orientation of label content."
+msgstr ""
 
 #: ../data/ui/new-label-dialog.ui.h:5
 msgid "Normal"
 msgstr "Normale"
 
-#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:47
-msgid "Part #:"
-msgstr "Parto #:"
-
-#: ../data/ui/new-label-dialog.ui.h:8
-msgid "Please review and confirm your selection."
-msgstr ""
-
-#: ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:6
 msgid "Rotated"
 msgstr "Turnite"
 
-#: ../data/ui/new-label-dialog.ui.h:10
-msgid "Select orientation of label content."
-msgstr ""
+#: ../data/ui/new-label-dialog.ui.h:7
+#, fuzzy
+#| msgid "Remove all selections"
+msgid "Review Selection"
+msgstr "Forigi ĉiujn elektaĵojn"
 
-#: ../data/ui/new-label-dialog.ui.h:11
-msgid "Similar products:"
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
 msgstr ""
 
-#: ../data/ui/new-label-dialog.ui.h:12
-msgid "Vendor:"
-msgstr "Vendisto:"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Label size:"
+msgstr "Grando de etikedo:"
 
 #: ../data/ui/object-editor.ui.h:1
-msgid " "
-msgstr " "
+msgid "dialog1"
+msgstr "fenestr1"
 
 #: ../data/ui/object-editor.ui.h:3
-#, no-c-format
-msgid "%"
-msgstr "%"
+msgid "Family:"
+msgstr "Familio:"
 
-#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:2
-msgid "Alignment:"
-msgstr "Alliniĝo:"
+#: ../data/ui/object-editor.ui.h:4
+msgid "Size:"
+msgstr "Grando:"
 
 #: ../data/ui/object-editor.ui.h:5
-msgid "Allow merge to automatically shrink text"
-msgstr ""
+msgid "Style:"
+msgstr "Stilo:"
 
-#: ../data/ui/object-editor.ui.h:6
-msgid "Angle:"
-msgstr "Angulo:"
+#: ../data/ui/object-editor.ui.h:6 ../data/ui/prefs-dialog.ui.h:14
+msgid "Color:"
+msgstr "Koloro:"
 
 #: ../data/ui/object-editor.ui.h:7
-msgid "Backend:"
-msgstr "Interno:"
+msgid " "
+msgstr " "
 
 #: ../data/ui/object-editor.ui.h:8
-msgid "Checksum"
-msgstr "Kontrolsumo"
+msgid "key:"
+msgstr "ŝlosilo:"
 
-#: ../data/ui/object-editor.ui.h:9 ../data/ui/prefs-dialog.ui.h:3
-msgid "Color:"
-msgstr "Koloro:"
+#: ../data/ui/object-editor.ui.h:9 ../data/ui/prefs-dialog.ui.h:15
+msgid "Alignment:"
+msgstr "Alliniĝo:"
 
-#: ../data/ui/object-editor.ui.h:11
-msgid "Enable shadow"
-msgstr ""
+#: ../data/ui/object-editor.ui.h:10
+#, fuzzy
+#| msgid "Alignment:"
+msgid "Vertical alignment:"
+msgstr "Alliniĝo:"
+
+#: ../data/ui/object-editor.ui.h:11 ../data/ui/prefs-dialog.ui.h:16
+msgid "Line Spacing:"
+msgstr "Interspaco:"
 
 #: ../data/ui/object-editor.ui.h:12
-msgid "Family:"
-msgstr "Familio:"
+msgid "Allow merge to automatically shrink text"
+msgstr ""
 
 #: ../data/ui/object-editor.ui.h:13
-msgid "File:"
-msgstr "Dosiero:"
-
-#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:5
-msgid "Fill"
-msgstr "Plenigo"
+msgid "Style"
+msgstr "Stilo"
 
-#: ../data/ui/object-editor.ui.h:15 ../data/ui/template-designer.ui.h:33
-msgid "Height:"
-msgstr "Alto:"
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/template-designer.ui.h:13
+msgid "Width:"
+msgstr "Larĝo:"
 
-#: ../data/ui/object-editor.ui.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Ŝlosilo:"
 
-#: ../data/ui/object-editor.ui.h:18
-msgid "Length:"
-msgstr "Longo:"
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:21
+msgid "Fill"
+msgstr "Plenigo"
 
-#: ../data/ui/object-editor.ui.h:20 ../data/ui/prefs-dialog.ui.h:10
-msgid "Line Spacing:"
-msgstr "Interspaco:"
+#: ../data/ui/object-editor.ui.h:19
+msgid "File:"
+msgstr "Dosiero:"
 
 #: ../data/ui/object-editor.ui.h:21
 msgid "Literal:"
 msgstr "Literalo:"
 
 #: ../data/ui/object-editor.ui.h:22
-msgid "Opacity:"
-msgstr "Opakeco:"
+msgid "format:"
+msgstr "formato:"
 
 #: ../data/ui/object-editor.ui.h:23
-msgid "Position"
-msgstr "Lokiĝo"
-
-#: ../data/ui/object-editor.ui.h:24
-msgid "Reset image size"
-msgstr "Restarigi grandon de bildo"
+msgid "digits:"
+msgstr "ciferoj:"
 
 #: ../data/ui/object-editor.ui.h:25
-msgid "Shadow"
-msgstr "Ombro"
+msgid "Backend:"
+msgstr "Interno:"
 
 #: ../data/ui/object-editor.ui.h:26
-msgid "Size"
-msgstr "Grando"
-
-#: ../data/ui/object-editor.ui.h:27
-msgid "Size:"
-msgstr "Grando:"
+msgid "Checksum"
+msgstr "Kontrolsumo"
 
-#: ../data/ui/object-editor.ui.h:28
-msgid "Style"
-msgstr "Stilo"
+#: ../data/ui/object-editor.ui.h:27 ../data/ui/template-designer.ui.h:14
+msgid "Height:"
+msgstr "Alto:"
 
 #: ../data/ui/object-editor.ui.h:29
-msgid "Style:"
-msgstr "Stilo:"
+msgid "Reset image size"
+msgstr "Restarigi grandon de bildo"
 
-#: ../data/ui/object-editor.ui.h:31 ../data/ui/prefs-dialog.ui.h:20
-#: ../data/ui/template-designer.ui.h:65
-msgid "Width:"
-msgstr "Larĝo:"
+#: ../data/ui/object-editor.ui.h:30
+msgid "Size"
+msgstr "Grando"
+
+#: ../data/ui/object-editor.ui.h:31
+msgid "Length:"
+msgstr "Longo:"
 
 #: ../data/ui/object-editor.ui.h:32
-msgid "X Offset:"
-msgstr ""
+msgid "Angle:"
+msgstr "Angulo:"
 
 #: ../data/ui/object-editor.ui.h:33
-msgid "X:"
-msgstr "X:"
+msgid "degrees"
+msgstr "gradoj"
 
 #: ../data/ui/object-editor.ui.h:34
-msgid "Y Offset:"
-msgstr ""
+msgid "X:"
+msgstr "X:"
 
 #: ../data/ui/object-editor.ui.h:35
 msgid "Y:"
 msgstr "Y:"
 
 #: ../data/ui/object-editor.ui.h:36
-msgid "degrees"
-msgstr "gradoj"
+msgid "Position"
+msgstr "Lokiĝo"
 
 #: ../data/ui/object-editor.ui.h:37
-msgid "dialog1"
-msgstr "fenestr1"
+msgid "Enable shadow"
+msgstr ""
 
 #: ../data/ui/object-editor.ui.h:38
-msgid "digits:"
-msgstr "ciferoj:"
+msgid "X Offset:"
+msgstr ""
 
 #: ../data/ui/object-editor.ui.h:39
-msgid "format:"
-msgstr "formato:"
+msgid "Y Offset:"
+msgstr ""
 
-#: ../data/ui/object-editor.ui.h:41
-#| msgid "Key:"
-msgid "key:"
-msgstr "ŝlosilo:"
+#: ../data/ui/object-editor.ui.h:40
+msgid "Opacity:"
+msgstr "Opakeco:"
+
+#: ../data/ui/object-editor.ui.h:42
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: ../data/ui/prefs-dialog.ui.h:1
+#: ../data/ui/object-editor.ui.h:43
+msgid "Shadow"
+msgstr "Ombro"
+
+#: ../data/ui/prefs-dialog.ui.h:2
+msgid "Select locale specific behavior."
+msgstr "Elekti nacian specifan agmanieron."
+
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "   "
 msgstr "   "
 
 #: ../data/ui/prefs-dialog.ui.h:4
-msgid "Default page size"
-msgstr "Defaŭlta paĝgrando"
+msgid "Points"
+msgstr "Punktoj"
+
+#: ../data/ui/prefs-dialog.ui.h:5
+msgid "Inches"
+msgstr "Coloj"
 
 #: ../data/ui/prefs-dialog.ui.h:6
-msgid "Font:"
-msgstr "Tiparo:"
+msgid "Millimeters"
+msgstr "Milimetroj"
 
 #: ../data/ui/prefs-dialog.ui.h:7
+msgid "Units"
+msgstr "Unuoj"
+
+#: ../data/ui/prefs-dialog.ui.h:8 ../templates/paper-sizes.xml.h:3
+msgid "US Letter"
+msgstr "US·Letero"
+
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/ui/prefs-dialog.ui.h:8
-msgid "Inches"
-msgstr "Coloj"
+#: ../data/ui/prefs-dialog.ui.h:10
+msgid "Default page size"
+msgstr "Defaŭlta paĝgrando"
 
 #: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "Nacia"
 
 #: ../data/ui/prefs-dialog.ui.h:12
-msgid "Millimeters"
-msgstr "Milimetroj"
+msgid "Select default properties for new objects."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
 #: ../data/ui/prefs-dialog.ui.h:13
+msgid "Font:"
+msgstr "Tiparo:"
+
+#: ../data/ui/prefs-dialog.ui.h:22
 msgid "Object defaults"
 msgstr "Defaŭltoj de objekto"
 
-#: ../data/ui/prefs-dialog.ui.h:14
-msgid "Points"
-msgstr "Punktoj"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Sheets:"
+msgstr "Folioj:"
 
-#: ../data/ui/prefs-dialog.ui.h:15
-msgid "Select default properties for new objects."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "from:"
+msgstr "de:"
 
-#: ../data/ui/prefs-dialog.ui.h:16
-msgid "Select locale specific behavior."
-msgstr "Elekti nacian specifan agmanieron."
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "to:"
+msgstr "ĝis:"
 
-#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
-msgid "US Letter"
-msgstr "US·Letero"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies"
+msgstr "Ekzempleroj"
 
-#: ../data/ui/prefs-dialog.ui.h:19
-msgid "Units"
-msgstr "Unuoj"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+msgid "Start on label"
+msgstr "Starto en etikedo"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "on 1st sheet"
+msgstr "en 1a folio"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Copies:"
+msgstr "Ekzempleroj:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "Collate"
+msgstr "Laŭkajere"
 
-#: ../data/ui/property-bar.ui.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "Merge Control"
+msgstr "Kontrolo de kunfando"
+
+#: ../data/ui/property-bar.ui.h:3
 msgid "Bold"
 msgstr "Dika"
 
-#: ../data/ui/property-bar.ui.h:2
+#: ../data/ui/property-bar.ui.h:5
+msgid "Left align"
+msgstr "Laŭliniigi maldekstren"
+
+#: ../data/ui/property-bar.ui.h:6
 msgid "Center align"
 msgstr "Laŭlinigi centre"
 
 #: ../data/ui/property-bar.ui.h:7
-msgid "Left align"
-msgstr "Laŭliniigi maldekstren"
-
-#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "Laŭliniigi dekstren"
 
-#: ../data/ui/template-designer.ui.h:1
-msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
-msgstr "(es., \"Etichette di spedizione,\" \"Vizitkartoj,\" ...)"
+#: ../data/ui/property-bar.ui.h:8
+#, fuzzy
+#| msgid "Flip vertically"
+msgid "Top vertical align"
+msgstr "Renversi vertikale"
 
-#: ../data/ui/template-designer.ui.h:2
-msgid "(e.g., 8163A)"
-msgstr "(es. 8163A)"
+#: ../data/ui/property-bar.ui.h:9
+#, fuzzy
+msgid "Center vertical align"
+msgstr "Centre vertikale"
 
-#: ../data/ui/template-designer.ui.h:3
-msgid "(e.g., Avery, Acme, ...)"
-msgstr "(es. Avery, Acme, ...)"
+#: ../data/ui/property-bar.ui.h:10
+msgid "Bottom vertical align"
+msgstr ""
+
+#: ../data/ui/template-designer.ui.h:1
+msgid ""
+"Welcome to the gLabels Template Designer.\n"
+"\n"
+"This dialog will assist you in the creation of a custom gLabels template."
+msgstr ""
+"Bonvenon! Tiu ĉi estas desegnilo de modeloj por gLabels.\n"
+"\n"
+"Tio helpos vin por krei personigitan modelon por gLabels."
 
 #: ../data/ui/template-designer.ui.h:4
-msgid "1. Outer radius:"
-msgstr "1. Ekstera radiuso:"
+msgid ""
+"Please enter the following identifying information about the template "
+"stationery."
+msgstr ""
 
 #: ../data/ui/template-designer.ui.h:5
-msgid "1. Radius:"
-msgstr "1. Radiuso:"
-
-#: ../data/ui/template-designer.ui.h:6
-msgid "1. Width:"
-msgstr "1. Larĝo:"
+msgid "Brand/Manufacturer:"
+msgstr "Marca/Produttore:"
 
 #: ../data/ui/template-designer.ui.h:7
-msgid "2. Height:"
-msgstr "2. Alto:"
+msgid "(e.g., 8163A)"
+msgstr "(es. 8163A)"
 
 #: ../data/ui/template-designer.ui.h:8
-msgid "2. Inner radius:"
-msgstr "2. Interna radiuso:"
-
-#: ../data/ui/template-designer.ui.h:9
-msgid "2. Waste (overprint allowed):"
-msgstr "2. Forĵetaĵo (surskrivebla):"
+msgid "(e.g., Avery, Acme, ...)"
+msgstr "(eks. Avery, Acme, ...)"
 
 #: ../data/ui/template-designer.ui.h:10
-msgid "3. Clipping width:"
-msgstr ""
+msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
+msgstr "(es., \"Etichette di spedizione,\" \"Vizitkartoj,\" ...)"
 
 #: ../data/ui/template-designer.ui.h:11
-msgid "3. Margin"
-msgstr "3. Marĝeno"
-
-#: ../data/ui/template-designer.ui.h:12
-msgid "3. Round (radius of corner):"
-msgstr "3. Rondo (radiuso de angulo):"
-
-#: ../data/ui/template-designer.ui.h:13
-#| msgid "2. Waste (overprint allowed):"
-msgid "3. Waste (overprint allowed):"
-msgstr "3. Forĵetaĵo (surskrivebla):"
-
-#: ../data/ui/template-designer.ui.h:14
-msgid "4. Clipping height:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:15
-msgid "4. Horiz. waste (overprint allowed):"
-msgstr "4. Horiz. forĵetaĵo (surskrivebla):"
+msgid "Please select the page size of the template stationery."
+msgstr "Bonvolu elekti grandon de paĝo por modelo de skribvaroj."
 
 #: ../data/ui/template-designer.ui.h:16
-#| msgid "3. Margin"
-msgid "4. Margin"
-msgstr "4. Marĝeno"
+msgid "Please select the basic shape of the labels or cards."
+msgstr ""
 
 #: ../data/ui/template-designer.ui.h:17
-msgid "5. Vert. waste (overprint allowed):"
-msgstr "5. Vert. forĵetaĵo (surskrivebla):"
+msgid "Rectangular or square (can have rounded corners)"
+msgstr "Rektangula aŭ kvadra (ankaŭ kun rondaj anguloj)"
 
 #: ../data/ui/template-designer.ui.h:18
-msgid "5. Waste (overprint allowed):"
-msgstr "5. Forĵetaĵo (surskrivebla):"
+msgid "Round"
+msgstr "Ronda"
 
 #: ../data/ui/template-designer.ui.h:19
-msgid "6. Margin"
-msgstr "6. Marĝeno"
+msgid "Elliptical"
+msgstr ""
 
 #: ../data/ui/template-designer.ui.h:20
-msgid "Brand/Manufacturer:"
-msgstr "Marca/Produttore:"
-
-#: ../data/ui/template-designer.ui.h:21
 msgid "CD/DVD (including credit card CDs)"
 msgstr "KD/DVD"
 
-#: ../data/ui/template-designer.ui.h:22
+#: ../data/ui/template-designer.ui.h:21
 msgid ""
-"Congratulations!\n"
-"\n"
-"You have completed the gLabels Template Designer.\n"
-"If you wish to accept and save your design, click \"Apply.\"\n"
-"\n"
-"Otherwise, you may click \"Cancel\" to abandon your design\n"
-"or \"Back\" to continue editing this design."
+"Please enter the following size parameters of a single label or card in your "
+"template."
 msgstr ""
-"Gratulojn!\n"
-"\n"
-"Vi finis Desegnilon de Modelojn por gLabels.\n"
-"Se vi volas konservi tiun ĉi projekton, alklaku sur \"Apliki\".\n"
-"\n"
-"Male, alklaku sur \"Nuligi\" por nuligi\n"
-"vian projekton tutan aŭ \"Retroen\" por ankoraŭ redakti tiun ĉi desegnon."
+"Bonvolu enmeti menditajn parametrojn de grando por unu etikedo aŭ karto en "
+"la modelo."
+
+#: ../data/ui/template-designer.ui.h:22
+msgid "1. Width:"
+msgstr "1. Larĝo:"
+
+#: ../data/ui/template-designer.ui.h:23
+msgid "2. Height:"
+msgstr "2. Alto:"
+
+#: ../data/ui/template-designer.ui.h:24
+msgid "3. Round (radius of corner):"
+msgstr "3. Rondo (radiuso de angulo):"
+
+#: ../data/ui/template-designer.ui.h:25
+msgid "4. Horiz. waste (overprint allowed):"
+msgstr "4. Horiz. forĵetaĵo (surskrivebla):"
+
+#: ../data/ui/template-designer.ui.h:26
+msgid "6. Margin"
+msgstr "6. Marĝeno"
+
+#: ../data/ui/template-designer.ui.h:27
+msgid "5. Vert. waste (overprint allowed):"
+msgstr "5. Vert. forĵetaĵo (surskrivebla):"
+
+#: ../data/ui/template-designer.ui.h:28
+msgid "3. Waste (overprint allowed):"
+msgstr "3. Forĵetaĵo (surskrivebla):"
+
+#: ../data/ui/template-designer.ui.h:29
+msgid "4. Margin"
+msgstr "4. Marĝeno"
 
 #: ../data/ui/template-designer.ui.h:30
-msgid "Distance from left edge (x0):"
-msgstr "Distanco el maldekstra rando (x0):"
+msgid ""
+"Please enter the following size parameters of a single label in your "
+"template."
+msgstr ""
+"Bonvolu enmeti menditajn parametrojn de grando por unu etikedo en la modelo."
 
 #: ../data/ui/template-designer.ui.h:31
-msgid "Distance from top edge (y0):"
-msgstr "Distanco el supra rando (y0):"
+msgid "1. Radius:"
+msgstr "1. Radiuso:"
 
 #: ../data/ui/template-designer.ui.h:32
-msgid "Elliptical"
-msgstr ""
+msgid "2. Waste (overprint allowed):"
+msgstr "2. Forĵetaĵo (surskrivebla):"
+
+#: ../data/ui/template-designer.ui.h:33
+msgid "3. Margin"
+msgstr "3. Marĝeno"
 
 #: ../data/ui/template-designer.ui.h:34
-msgid "Horizontal pitch (dx):"
-msgstr "Horizontala kvanto (dx):"
+msgid "1. Outer radius:"
+msgstr "1. Ekstera radiuso:"
 
 #: ../data/ui/template-designer.ui.h:35
+msgid "2. Inner radius:"
+msgstr "2. Interna radiuso:"
+
+#: ../data/ui/template-designer.ui.h:36
+msgid "3. Clipping width:"
+msgstr ""
+
+#: ../data/ui/template-designer.ui.h:37
+msgid "4. Clipping height:"
+msgstr ""
+
+#: ../data/ui/template-designer.ui.h:38
+msgid "5. Waste (overprint allowed):"
+msgstr "5. Forĵetaĵo (surskrivebla):"
+
+#: ../data/ui/template-designer.ui.h:39
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -2229,559 +2415,583 @@ msgid ""
 "The second example illustrates when two layouts are needed."
 msgstr ""
 
-#: ../data/ui/template-designer.ui.h:40
-msgid "Layout #1"
-msgstr "Aspekto #1"
+#: ../data/ui/template-designer.ui.h:44
+msgid ""
+"Templates needing only\n"
+"one layout."
+msgstr ""
+"Modeloj necesas nur \n"
+"unu aspekton."
 
-#: ../data/ui/template-designer.ui.h:41
-msgid "Layout #2"
-msgstr "Aspekto #2"
+#: ../data/ui/template-designer.ui.h:46
+msgid ""
+"Templates needing\n"
+"two layouts."
+msgstr ""
+"Modeloj necesas\n"
+"du aspektojn."
 
-#: ../data/ui/template-designer.ui.h:42
+#: ../data/ui/template-designer.ui.h:48
 msgid ""
 "Note: if more than 2 layouts are required, the template must be edited "
 "manually."
 msgstr ""
 
-#: ../data/ui/template-designer.ui.h:43
-msgid "Number across (nx):"
-msgstr "Numero transverse (nx):"
-
-#: ../data/ui/template-designer.ui.h:44
-msgid "Number down (ny):"
-msgstr "Numero sube (ny):"
-
-#: ../data/ui/template-designer.ui.h:45
+#: ../data/ui/template-designer.ui.h:49
 msgid "Number of layouts:"
 msgstr "Nombro da aspektoj:"
 
-#: ../data/ui/template-designer.ui.h:48
-msgid ""
-"Please enter the following identifying information about the template "
-"stationery."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:49
+#: ../data/ui/template-designer.ui.h:50
 msgid "Please enter the following layout information."
 msgstr "Bonvolu enmeti menditajn informojn."
 
-#: ../data/ui/template-designer.ui.h:50
-msgid ""
-"Please enter the following size parameters of a single label in your "
-"template."
-msgstr ""
-"Bonvolu enmeti menditajn parametrojn de grando por unu etikedo en la modelo."
-
 #: ../data/ui/template-designer.ui.h:51
-msgid ""
-"Please enter the following size parameters of a single label or card in your "
-"template."
-msgstr ""
-"Bonvolu enmeti menditajn parametrojn de grando por unu etikedo aŭ karto en "
-"la modelo."
+msgid "Layout #1"
+msgstr "Aspekto #1"
 
 #: ../data/ui/template-designer.ui.h:52
-msgid "Please select the basic shape of the labels or cards."
-msgstr ""
+msgid "Layout #2"
+msgstr "Aspekto #2"
 
 #: ../data/ui/template-designer.ui.h:53
-msgid "Please select the page size of the template stationery."
-msgstr "Bonvolu elekti grandon de paĝo por modelo de skribvaroj."
+msgid "Number across (nx):"
+msgstr "Numero transverse (nx):"
 
 #: ../data/ui/template-designer.ui.h:54
-msgid "Print test sheet"
-msgstr "Presi paĝon de elprovo"
+msgid "Number down (ny):"
+msgstr "Numero sube (ny):"
 
 #: ../data/ui/template-designer.ui.h:55
-msgid "Rectangular or square (can have rounded corners)"
-msgstr "Rektangula aŭ kvadra (ankaŭ kun rondaj anguloj)"
+msgid "Distance from left edge (x0):"
+msgstr "Distanco el maldekstra rando (x0):"
 
 #: ../data/ui/template-designer.ui.h:56
-msgid "Round"
-msgstr "Ronda"
+msgid "Distance from top edge (y0):"
+msgstr "Distanco el supra rando (y0):"
 
 #: ../data/ui/template-designer.ui.h:57
-msgid ""
-"Templates needing\n"
-"two layouts."
-msgstr ""
-"Modeloj necesas\n"
-"du aspektojn."
-
-#: ../data/ui/template-designer.ui.h:59
-msgid ""
-"Templates needing only\n"
-"one layout."
-msgstr ""
-"Modeloj necesas nur \n"
-"unu aspekton."
+msgid "Horizontal pitch (dx):"
+msgstr "Horizontala kvanto (dx):"
 
-#: ../data/ui/template-designer.ui.h:61
+#: ../data/ui/template-designer.ui.h:58
 msgid "Vertical pitch (dy):"
 msgstr "Vertikala kvanto (dy):"
 
-#: ../data/ui/template-designer.ui.h:62
+#: ../data/ui/template-designer.ui.h:59
+msgid "Print test sheet"
+msgstr "Presi paĝon de elprovo"
+
+#: ../data/ui/template-designer.ui.h:60
 msgid ""
-"Welcome to the gLabels Template Designer.\n"
+"Congratulations!\n"
 "\n"
-"This dialog will assist you in the creation of a custom gLabels template."
+"You have completed the gLabels Template Designer.\n"
+"If you wish to accept and save your design, click \"Apply.\"\n"
+"\n"
+"Otherwise, you may click \"Cancel\" to abandon your design\n"
+"or \"Back\" to continue editing this design."
 msgstr ""
-"Bonvenon! Tiu ĉi estas Desegnilo de Modeloj por gLabels.\n"
+"Gratulojn!\n"
 "\n"
-"Tio helpos vin por krei personigitan modelon por gLabels."
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "Collate"
-msgstr "Laŭkajere"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-msgid "Copies"
-msgstr "Ekzempleroj"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "Copies:"
-msgstr "Ekzempleroj:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
-msgid "Merge Control"
-msgstr "Kontrolo de kunfando"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
-msgid "Options"
-msgstr "Opcioj"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
-msgid "Sheets:"
-msgstr "Folioj:"
+"Vi finis Desegnilon de Modelojn por gLabels.\n"
+"Se vi volas konservi tiun ĉi projekton, alklaku sur \"Apliki\".\n"
+"\n"
+"Male, alklaku sur \"Nuligi\" por nuligi\n"
+"vian projekton tutan aŭ \"Retroen\" por ankoraŭ redakti tiun ĉi desegnon."
 
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
-msgid "Start on label"
-msgstr "Starto en etikedo"
+#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+#| msgid "Labels"
+msgid "gLabels"
+msgstr "gLabels"
 
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
-msgid "from:"
-msgstr "de:"
+#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+msgid "Create labels, business cards and media covers"
+msgstr "Krei etikedojn, vizitkartojn kaj kovrilojn de plurmediaĵoj"
 
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
-msgid "on 1st sheet"
-msgstr "en 1a folio"
+#: ../data/appdata/glabels-3.appdata.xml.in.h:3
+msgid ""
+"gLabels is a program for creating labels and business cards. It is designed "
+"to work with various laser/ink-jet peel-off label and business card sheets "
+"that you'll find at most office supply stores."
+msgstr ""
 
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
-msgid "to:"
-msgstr "ĝis:"
+#: ../data/appdata/glabels-3.appdata.xml.in.h:4
+msgid ""
+"gLabels can be used to design address labels, name tags, price tags, cd/dvd "
+"labels, or just about anything else that is organized in a regular pattern "
+"on a sheet of paper. Labels (or cards) can contain text, images, lines, "
+"shapes, and barcodes. gLabels also includes a document-merge feature which "
+"lets you print a unique label for each record from an external data source, "
+"such as a CSV file or an Evolution address book."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
-msgid "Controls maximum number of recent files tracked."
-msgstr ""
+msgid "Show/hide main toolbar."
+msgstr "Montri/kaŝi la ĉefan ilobreton."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:2
-#, fuzzy
-#| msgid "Show tooltips in the drawing toolbar"
-msgid "Controls visibility of drawing toolbar."
-msgstr "Vidigi sugestojn en la ilobreto de desegno"
+#| msgid "Show tooltips in the main toolbar"
+msgid "Controls visibility of main toolbar."
+msgstr "Vidigi sugestojn en la ĉefa ilobreto."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:3
-msgid "Controls visibility of grid."
+msgid "Show/hide drawing toolbar."
 msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:4
-#, fuzzy
-#| msgid "Show tooltips in the main toolbar"
-msgid "Controls visibility of main toolbar."
-msgstr "Vidigi sugestojn en la ĉefa ilobreto"
+#| msgid "Show tooltips in the drawing toolbar"
+msgid "Controls visibility of drawing toolbar."
+msgstr "Vidigi sugestojn en la ilobreto de desegno."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:5
-#, fuzzy
-#| msgid "Change the visibility of markup lines in the current window"
-msgid "Controls visibility of markup lines."
-msgstr "Ŝanĝi videblecon de linioj de demarkacio en nuna fenestro"
+#| msgid "Show tooltips in the property toolbar"
+msgid "Show/hide property toolbar."
+msgstr "Montri/kaŝi la ĉefan ilobreton."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:6
-#, fuzzy
 #| msgid "Show tooltips in the property toolbar"
 msgid "Controls visibility of property toolbar."
-msgstr "Vidigi sugestojn en la ilobreto de ecoj"
+msgstr "Vidigi sugestojn en la ilobreto de ecoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:7
-msgid "Default fill color."
+msgid "Show/hide grid."
 msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:8
-msgid "Default font family."
-msgstr "Defaŭlta tiparfamilio."
+msgid "Controls visibility of grid."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:9
-msgid "Default font italic flag."
+msgid "Show/hide markup."
 msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:10
-msgid "Default font size."
-msgstr "Defaŭlta tipargrando."
+#| msgid "Change the visibility of markup lines in the current window"
+msgid "Controls visibility of markup lines."
+msgstr "Ŝanĝi videblecon de linioj de demarkacio en nuna fenestro."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:11
-msgid "Default font weight."
-msgstr "Defaŭlta tiparpezo."
+msgid "Maximum recent files."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:12
-msgid "Default line color."
-msgstr "Defaŭlta linia koloro."
+msgid "Controls maximum number of recent files tracked."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:13
-#| msgid "Line width"
-msgid "Default line width."
-msgstr "Defaŭlta linia larĝo."
+msgid "Units."
+msgstr "Unuoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:14
-msgid "Default page size."
-msgstr "Defaŭlta paĝgrando."
+msgid "The default unit of measurement."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:15
-#, fuzzy
-msgid "Default text alignment."
-msgstr "Defaŭlta tekst*"
+msgid "Default page size."
+msgstr "Defaŭlta paĝgrando."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:16
-msgid "Default text color."
-msgstr "Defaŭlta tekstkoloro."
+msgid "The preferred page size when searching templates."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:17
-msgid "Default text line spacing."
-msgstr ""
+msgid "Default font family."
+msgstr "Defaŭlta tiparfamilio."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:18
-msgid "Maximum recent files."
-msgstr ""
+#, fuzzy
+#| msgid "Select default properties for new objects."
+msgid "The default font family for new text objects."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:19
-msgid "Recent colors."
-msgstr ""
+msgid "Default font size."
+msgstr "Defaŭlta tipargrando."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:20
-msgid "Recent fonts."
-msgstr ""
+#, fuzzy
+#| msgid "Select default properties for new objects."
+msgid "The default font size for new text objects."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:21
-msgid "Recent templates."
-msgstr ""
+msgid "Default font weight."
+msgstr "Defaŭlta tiparpezo."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:22
-msgid "Recently created custom colors."
-msgstr ""
+#, fuzzy
+#| msgid "Select default properties for new objects."
+msgid "The default font weight for new text objects."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:23
-msgid "Recently used font families."
+msgid "Default font italic flag."
 msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:24
-msgid "Recently used templates."
-msgstr ""
+#, fuzzy
+#| msgid "Select default properties for new objects."
+msgid "The default font italic state for new text objects."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:25
-#| msgid "Show tooltips in the drawing toolbar"
-msgid "Show/hide drawing toolbar."
-msgstr ""
+msgid "Default text color."
+msgstr "Defaŭlta tekstkoloro."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:26
-msgid "Show/hide grid."
-msgstr ""
+msgid "The default color of text for new text objects (0xRRGGBBAA)."
+msgstr "La defaŭlta koloro de novaj tekstobjektoj (0xRRGGBBAA)."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:27
-#| msgid "Show tooltips in the main toolbar"
-msgid "Show/hide main toolbar."
-msgstr "Montri/Kaŝi la ĉefan ilobreton."
+msgid "Default text alignment."
+msgstr "Defaŭlta tekst*."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:28
-msgid "Show/hide markup."
-msgstr ""
+#, fuzzy
+#| msgid "Select default properties for new objects."
+msgid "The default text alignment for new text objects."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:29
-#, fuzzy
-#| msgid "Show tooltips in the property toolbar"
-msgid "Show/hide property toolbar."
-msgstr "Montri/Kaŝi la ĉefan ilobreton."
+msgid "Default text line spacing."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:30
-#| msgid "Select default properties for new objects."
-msgid "The default color of text for new text objects (0xRRGGBBAA)."
-msgstr "La defaŭlta koloro de novaj tekstobjektoj (0xRRGGBBAA)."
-
-#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:31
 #, fuzzy
 #| msgid "Select default properties for new objects."
-msgid "The default fill color new objects (0xRRGGBBAA)."
+msgid "The default line spacing for new text objects."
 msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:31
+msgid "Default line width."
+msgstr "Defaŭlta linia larĝo."
+
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:32
 #, fuzzy
 #| msgid "Select default properties for new objects."
-msgid "The default font family for new text objects."
+msgid "The default line width for new objects."
 msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:33
-#, fuzzy
-#| msgid "Select default properties for new objects."
-msgid "The default font italic state for new text objects."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+msgid "Default line color."
+msgstr "Defaŭlta linia koloro."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:34
-#, fuzzy
 #| msgid "Select default properties for new objects."
-msgid "The default font size for new text objects."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+msgid "The default line color new objects (0xRRGGBBAA)."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj (0xRRGGBBAA)."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:35
-#, fuzzy
-#| msgid "Select default properties for new objects."
-msgid "The default font weight for new text objects."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+msgid "Default fill color."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:36
-#, fuzzy
 #| msgid "Select default properties for new objects."
-msgid "The default line color new objects (0xRRGGBBAA)."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+msgid "The default fill color new objects (0xRRGGBBAA)."
+msgstr "Elekti defaŭltajn ecojn por novaj objektoj (0xRRGGBBAA)."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:37
-#, fuzzy
-#| msgid "Select default properties for new objects."
-msgid "The default line spacing for new text objects."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+msgid "Recent templates."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:38
-#, fuzzy
-#| msgid "Select default properties for new objects."
-msgid "The default line width for new objects."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+msgid "Recently used templates."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:39
-#, fuzzy
-#| msgid "Select default properties for new objects."
-msgid "The default text alignment for new text objects."
-msgstr "Elekti defaŭltajn ecojn por novaj objektoj."
+msgid "Recent fonts."
+msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:40
-msgid "The default unit of measurement."
+msgid "Recently used font families."
 msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:41
-msgid "The preferred page size when searching templates."
+msgid "Recent colors."
 msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:42
-msgid "Units."
-msgstr "Unuoj."
+msgid "Recently created custom colors."
+msgstr ""
 
 #: ../data/desktop/glabels-3.0.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "Krei etikedojn, vizitkartojn kaj kovrilojn de plurmediaĵoj"
-
-#: ../data/desktop/glabels-3.0.desktop.in.h:2
 msgid "gLabels Label Designer 3"
 msgstr ""
 
+#: ../data/desktop/glabels-3.0.desktop.in.h:3
+msgid "label;card;print;office;barcode;"
+msgstr ""
+
 #: ../data/mime/glabels-3.0.xml.in.h:1
 msgid "gLabels Project File"
-msgstr "Dosiero de Projekto de gLabels"
+msgstr "Dosiero de projekto de gLabels"
 
-#. Envelopes
+#. Most popular (at top of list)
 #: ../templates/paper-sizes.xml.h:2
-#, fuzzy
-msgid "#10 Envelope"
-msgstr "Koverto #10"
+msgid "A4"
+msgstr "A4"
+
+#. Other US paper sizes
+#: ../templates/paper-sizes.xml.h:5
+msgid "US Legal"
+msgstr "US Legal"
+
+#: ../templates/paper-sizes.xml.h:6
+msgid "US Executive"
+msgstr "US Executive"
 
 #. Other ISO A series sizes
-#: ../templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:8
 msgid "A0"
 msgstr "A0"
 
-#: ../templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:9
 msgid "A1"
 msgstr "A1"
 
-#: ../templates/paper-sizes.xml.h:6
-msgid "A10"
-msgstr "A10"
-
-#: ../templates/paper-sizes.xml.h:7
+#: ../templates/paper-sizes.xml.h:10
 msgid "A2"
 msgstr "A2"
 
-#: ../templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A3"
 msgstr "A3"
 
-#. Most popular (at top of list)
-#: ../templates/paper-sizes.xml.h:10
-msgid "A4"
-msgstr "A4"
-
-#: ../templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:12
 msgid "A5"
 msgstr "A5"
 
-#: ../templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:13
 msgid "A6"
 msgstr "A6"
 
-#: ../templates/paper-sizes.xml.h:13
+#: ../templates/paper-sizes.xml.h:14
 msgid "A7"
 msgstr "A7"
 
-#: ../templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:15
 msgid "A8"
 msgstr "A8"
 
-#: ../templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:16
 msgid "A9"
 msgstr "A9"
 
-#. ISO B series sizes
 #: ../templates/paper-sizes.xml.h:17
+msgid "A10"
+msgstr "A10"
+
+#. ISO B series sizes
+#: ../templates/paper-sizes.xml.h:19
 msgid "B0"
 msgstr "B0"
 
-#: ../templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:20
 msgid "B1"
 msgstr "B1"
 
-#: ../templates/paper-sizes.xml.h:19
-msgid "B10"
-msgstr "B10"
-
-#: ../templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:21
 msgid "B2"
 msgstr "B2"
 
-#: ../templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:22
 msgid "B3"
 msgstr "B3"
 
-#: ../templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:23
 msgid "B4"
 msgstr "B4"
 
-#: ../templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:24
 msgid "B5"
 msgstr "B5"
 
-#: ../templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:25
 msgid "B6"
 msgstr "B6"
 
-#: ../templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:26
 msgid "B7"
 msgstr "B7"
 
-#: ../templates/paper-sizes.xml.h:26
+#: ../templates/paper-sizes.xml.h:27
 msgid "B8"
 msgstr "B8"
 
-#: ../templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:28
 msgid "B9"
 msgstr "B9"
 
-#: ../templates/paper-sizes.xml.h:28
+#: ../templates/paper-sizes.xml.h:29
+msgid "B10"
+msgstr "B10"
+
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:31
+msgid "#10 Envelope"
+msgstr "Koverto #10"
+
+#: ../templates/paper-sizes.xml.h:32
+msgid "Monarch Envelope"
+msgstr "Koverto Monarch"
+
+#: ../templates/paper-sizes.xml.h:33
 msgid "C5"
 msgstr "C5"
 
-#: ../templates/paper-sizes.xml.h:29
+#: ../templates/paper-sizes.xml.h:34
 msgid "C6"
 msgstr "C6"
 
-#: ../templates/paper-sizes.xml.h:30
+#: ../templates/paper-sizes.xml.h:35
 msgid "DL"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:31
-#, fuzzy
-msgid "Monarch Envelope"
-msgstr "Koverto Monarch"
+#. ISO 217
+#: ../templates/paper-sizes.xml.h:37
+#| msgid "A0"
+msgid "RA0"
+msgstr "RA0"
 
-#: ../templates/paper-sizes.xml.h:32
-msgid "US Executive"
-msgstr "US Executive"
+#: ../templates/paper-sizes.xml.h:38
+#| msgid "A1"
+msgid "RA1"
+msgstr "RA1"
 
-#. Other US paper sizes
-#: ../templates/paper-sizes.xml.h:34
-msgid "US Legal"
-msgstr "US Legal"
+#: ../templates/paper-sizes.xml.h:39
+#| msgid "A2"
+msgid "RA2"
+msgstr "RA2"
 
-#: ../templates/categories.xml.h:1
-msgid "Any card"
+#: ../templates/paper-sizes.xml.h:40
+#| msgid "A3"
+msgid "RA3"
+msgstr "RA3"
+
+#: ../templates/paper-sizes.xml.h:41
+#| msgid "A4"
+msgid "RA4"
+msgstr "RA4"
+
+#: ../templates/paper-sizes.xml.h:42
+msgid "SRA0"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:43
+msgid "SRA1"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:44
+msgid "SRA2"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:45
+msgid "SRA3"
 msgstr ""
 
-#: ../templates/categories.xml.h:2
+#: ../templates/paper-sizes.xml.h:46
+msgid "SRA4"
+msgstr ""
+
+#: ../templates/categories.xml.h:1
 msgid "Any label"
 msgstr "Iu etikedo"
 
-#. ===================================================================
 #. ====================================================================
 #. ===================================================================
-#: ../templates/categories.xml.h:3 ../templates/dataline-iso-templates.xml.h:4
-#: ../templates/geha-iso-templates.xml.h:8
-#: ../templates/hama-iso-templates.xml.h:6
-#: ../templates/pearl-iso-templates.xml.h:8
+#: ../templates/categories.xml.h:2 ../templates/begalabel-templates.xml.h:3
+#: ../templates/endisch-templates.xml.h:1
+#: ../templates/hama-iso-templates.xml.h:4
+#: ../templates/hisago-templates.xml.h:7 ../templates/online-templates.xml.h:66
+#: ../templates/pearl-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:8
+#: ../templates/sheetlabels-us-templates.xml.h:16
 #, fuzzy
-msgid "Business cards"
-msgstr "Vizitkartoj"
-
-#: ../templates/categories.xml.h:4
-msgid "CD/DVD or other media"
-msgstr ""
+msgid "Round labels"
+msgstr "Plenrondaj etikedoj"
 
 #. ===================================================================
-#: ../templates/categories.xml.h:5 ../templates/pearl-iso-templates.xml.h:28
+#: ../templates/categories.xml.h:3 ../templates/begalabel-templates.xml.h:4
+#: ../templates/endisch-templates.xml.h:2 ../templates/hisago-templates.xml.h:9
+#: ../templates/online-templates.xml.h:67
+#: ../templates/pearl-iso-templates.xml.h:58
+#: ../templates/rayfilm-templates.xml.h:9
 #, fuzzy
 #| msgid "Shipping labels"
 msgid "Elliptical labels"
 msgstr "Etikedo por ekspedo"
 
-#: ../templates/categories.xml.h:6
+#. ====================================================================
+#: ../templates/categories.xml.h:4 ../templates/endisch-templates.xml.h:4
+#: ../templates/hama-iso-templates.xml.h:41
+#: ../templates/hisago-templates.xml.h:8 ../templates/online-templates.xml.h:17
+#: ../templates/rayfilm-templates.xml.h:2
 #, fuzzy
-msgid "Foldable cards"
-msgstr "Vizitkartoj"
-
-#: ../templates/categories.xml.h:7
-msgid "Mailing/shipping products"
-msgstr ""
-
-#: ../templates/categories.xml.h:8
-msgid "Photo products"
-msgstr ""
+msgid "Square labels"
+msgstr "Kvardaj etikedoj"
 
 #. ===================================================================
 #. ====================================================================
 #. ===================================================================
+#. OP920-R
 #. ********************************************************************
-#: ../templates/categories.xml.h:9 ../templates/ascom-iso-templates.xml.h:6
-#: ../templates/hama-iso-templates.xml.h:29
-#: ../templates/herma-iso-templates.xml.h:18
-#: ../templates/jac-iso-templates.xml.h:8
-#, fuzzy
+#. ===================================================================
+#: ../templates/categories.xml.h:5 ../templates/ascom-iso-templates.xml.h:4
+#: ../templates/begalabel-templates.xml.h:2
+#: ../templates/endisch-templates.xml.h:3
+#: ../templates/hama-iso-templates.xml.h:27
+#: ../templates/herma-iso-templates.xml.h:20
+#: ../templates/hisago-templates.xml.h:5 ../templates/igepa-templates.xml.h:1
+#: ../templates/jac-iso-templates.xml.h:4 ../templates/online-templates.xml.h:7
+#: ../templates/rayfilm-templates.xml.h:1
+#: ../templates/sheetlabels-us-templates.xml.h:2
 msgid "Rectangular labels"
-msgstr "Rektangulaj Etikedoj"
+msgstr "Rektangulaj etikedoj"
+
+#: ../templates/categories.xml.h:6
+msgid "Any card"
+msgstr ""
 
+#. ===================================================================
 #. ====================================================================
 #. ===================================================================
-#: ../templates/categories.xml.h:10 ../templates/hama-iso-templates.xml.h:31
-#: ../templates/pearl-iso-templates.xml.h:54
+#: ../templates/categories.xml.h:7 ../templates/dataline-iso-templates.xml.h:6
+#: ../templates/geha-iso-templates.xml.h:4
+#: ../templates/hama-iso-templates.xml.h:8
+#: ../templates/pearl-iso-templates.xml.h:38
 #, fuzzy
-msgid "Round labels"
-msgstr "Plenrondaj etikedoj"
+msgid "Business cards"
+msgstr "Vizitkartoj"
 
-#. ====================================================================
-#: ../templates/categories.xml.h:11 ../templates/hama-iso-templates.xml.h:33
+#: ../templates/categories.xml.h:8
 #, fuzzy
-msgid "Square labels"
-msgstr "Kvardaj etikedoj"
+#| msgid "Name Badge Labels"
+msgid "Name Badge"
+msgstr "Nomŝildetoj"
 
-#. ===================================================================
-#. ===============================================================
-#: ../templates/ascom-iso-templates.xml.h:2
-#: ../templates/avery-iso-templates.xml.h:12
-#: ../templates/zweckform-iso-templates.xml.h:10
-msgid "CD Inlet"
-msgstr "CD Inlet"
+#: ../templates/categories.xml.h:9
+msgid "CD/DVD or other media"
+msgstr ""
+
+#: ../templates/categories.xml.h:10
+msgid "Mailing/shipping products"
+msgstr ""
+
+#: ../templates/categories.xml.h:11
+#, fuzzy
+msgid "Foldable cards"
+msgstr "Vizitkartoj"
+
+#: ../templates/categories.xml.h:12
+msgid "Photo products"
+msgstr ""
+
+#: ../templates/categories.xml.h:13
+#, fuzzy
+#| msgid "Mailing labels"
+msgid "Filing labels"
+msgstr "Etikedoj por poŝto"
 
 #. TODO: Is this the real part #?
 #. ============================================================
@@ -2790,280 +3000,345 @@ msgstr "CD Inlet"
 #. ===================================================================
 #. TODO: What is the actual part #?
 #. ===================================================================
-#: ../templates/ascom-iso-templates.xml.h:4
-#: ../templates/avery-iso-templates.xml.h:30
+#: ../templates/ascom-iso-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:34
 #: ../templates/databecker-iso-templates.xml.h:10
-#: ../templates/hama-iso-templates.xml.h:27
-#: ../templates/herma-iso-templates.xml.h:16
-#: ../templates/misc-iso-templates.xml.h:30
-#: ../templates/zweckform-iso-templates.xml.h:28
+#: ../templates/hama-iso-templates.xml.h:29
+#: ../templates/herma-iso-templates.xml.h:18
+#: ../templates/misc-iso-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Rectangular Labels"
 msgstr "Rektangulaj Etikedoj"
 
 #. ===================================================================
-#: ../templates/ascom-iso-templates.xml.h:8
-#: ../templates/avery-us-templates.xml.h:46
-#: ../templates/geha-iso-templates.xml.h:29
+#: ../templates/ascom-iso-templates.xml.h:6
+#: ../templates/avery-us-templates.xml.h:40
+#: ../templates/geha-iso-templates.xml.h:15
 #: ../templates/meritline-us-templates.xml.h:18
-#: ../templates/worldlabel-us-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Spine Labels"
-msgstr "Etikedoj por videokasedo (dorso)"
+msgstr "Etikedoj por videokasedo"
 
 #. ===================================================================
-#. ********************************************************************
+#. ===============================================================
+#: ../templates/ascom-iso-templates.xml.h:8
+#: ../templates/avery-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:26
+msgid "CD Inlet"
+msgstr "CD Inlet"
+
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
-#: ../templates/avery-iso-templates.xml.h:2
-#: ../templates/databecker-iso-templates.xml.h:2
-#: ../templates/dymo-other-templates.xml.h:4
-#: ../templates/geha-iso-templates.xml.h:2
-#: ../templates/maco-us-templates.xml.h:2
-#: ../templates/meritline-us-templates.xml.h:2
-#: ../templates/pearl-iso-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:1
-#: ../templates/zweckform-iso-templates.xml.h:2
-msgid "Address Labels"
-msgstr "Etikedo por adreso"
+msgid "Square Labels"
+msgstr "Kvardaj etikedoj"
 
 #. ===================================================================
-#. ============================================================
-#. ===================================================================
-#. TODO: Is this the actual part #?
-#. ============================================================
 #: ../templates/avery-us-templates.xml.h:4
-#: ../templates/avery-iso-templates.xml.h:8
-#: ../templates/databecker-iso-templates.xml.h:4
-#: ../templates/dataline-iso-templates.xml.h:2
-#: ../templates/decadry-iso-templates.xml.h:2
-#: ../templates/misc-us-templates.xml.h:4
-#: ../templates/misc-iso-templates.xml.h:6
-#: ../templates/zweckform-iso-templates.xml.h:6
-msgid "Business Cards"
-msgstr "Vizitkartoj"
+msgid "Small Round Labels"
+msgstr "Malgrandaj rondigitaj etikedoj"
 
 #. ===================================================================
-#. ===============================================================
-#. ===================================================================
-#. ********************************************************************
-#. ===================================================================
 #: ../templates/avery-us-templates.xml.h:6
-#: ../templates/avery-iso-templates.xml.h:14
-#: ../templates/geha-iso-templates.xml.h:11
-#: ../templates/herma-iso-templates.xml.h:10
-#: ../templates/jac-iso-templates.xml.h:2
-#: ../templates/misc-us-templates.xml.h:8
-#: ../templates/misc-iso-templates.xml.h:10
-#: ../templates/misc-other-templates.xml.h:2
-#: ../templates/pearl-iso-templates.xml.h:24
-#: ../templates/worldlabel-us-templates.xml.h:2
-#: ../templates/zweckform-iso-templates.xml.h:12
-msgid "CD/DVD Labels"
-msgstr "Etikedoj por KD/DVD"
+msgid "Large Round Labels"
+msgstr "Grandaj rondigitaj etikedoj"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:8
-msgid "CD/DVD Labels (Disc Labels)"
-msgstr "Etikedoj por KD/DVD (Etikedoj por diskoj)"
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:5
+#, fuzzy
+msgid "File Folder Labels"
+msgstr "Arkaj etikedoj por dosieroj"
 
 #. ===================================================================
+#. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:10
-msgid "CD/DVD Labels (Spine Labels)"
-msgstr "Etikedoj por KD/DVD (Etikedoj por diskoj)"
+#: ../templates/dataline-iso-templates.xml.h:10
+#: ../templates/meritline-us-templates.xml.h:6
+#: ../templates/sheetlabels-us-templates.xml.h:6
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+msgid "Shipping Labels"
+msgstr "Etikedoj por ekspedo"
 
 #. ===================================================================
+#. ********************************************************************
+#. ===================================================================
 #: ../templates/avery-us-templates.xml.h:12
-#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/databecker-iso-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:14
+#: ../templates/geha-iso-templates.xml.h:25
+#: ../templates/maco-us-templates.xml.h:2
 #: ../templates/meritline-us-templates.xml.h:4
+#: ../templates/pearl-iso-templates.xml.h:2
+#: ../templates/sheetlabels-us-templates.xml.h:4
 #: ../templates/worldlabel-us-templates.xml.h:3
-msgid "Diskette Labels"
-msgstr "Etikedoj por disketoj"
+#: ../templates/zweckform-iso-templates.xml.h:4
+msgid "Address Labels"
+msgstr "Etikedo por adreso"
 
-#. the LSK labels can be torn in half down the center
+#. ===================================================================
+#. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:14
-#, fuzzy
-msgid "Divider Labels"
-msgstr "Etikedoj por KD"
+#: ../templates/dymo-other-templates.xml.h:2
+#: ../templates/meritline-us-templates.xml.h:8
+#: ../templates/sheetlabels-us-templates.xml.h:8
+#: ../templates/worldlabel-us-templates.xml.h:2
+msgid "Return Address Labels"
+msgstr "Etikedoj por adreso de sendinto"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:16
-#: ../templates/avery-other-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/meritline-us-templates.xml.h:12
+#: ../templates/sheetlabels-us-templates.xml.h:10
+#: ../templates/worldlabel-us-templates.xml.h:9
 #, fuzzy
-msgid "File Folder Labels"
-msgstr "Arkaj etikedoj por dosieroj"
+msgid "Round Labels"
+msgstr "Plenrondaj etikedoj"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:18
-#: ../templates/worldlabel-us-templates.xml.h:5
-msgid "Filing Labels"
-msgstr ""
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/meritline-us-templates.xml.h:14
+#: ../templates/sheetlabels-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:8
+msgid "Diskette Labels"
+msgstr "Etikedoj por disketoj"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:20
-#: ../templates/meritline-us-templates.xml.h:6
-#: ../templates/worldlabel-us-templates.xml.h:6
-msgid "Full Sheet Labels"
-msgstr "Paĝo plena da ekikedoj"
+msgid "Tent Cards"
+msgstr ""
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:22
-#, fuzzy
-msgid "ID Labels"
-msgstr "Etikedoj por KD"
+#: ../templates/sheetlabels-us-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:7
+msgid "Filing Labels"
+msgstr ""
 
 #. ===================================================================
+#. ============================================================
+#. ===================================================================
+#. TODO: Is this the actual part #?
+#. ============================================================
 #: ../templates/avery-us-templates.xml.h:24
-#, fuzzy
-msgid "Index Cards"
+#: ../templates/avery-iso-templates.xml.h:18
+#: ../templates/databecker-iso-templates.xml.h:2
+#: ../templates/dataline-iso-templates.xml.h:4
+#: ../templates/decadry-iso-templates.xml.h:6
+#: ../templates/misc-us-templates.xml.h:23
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:15
+#: ../templates/zweckform-iso-templates.xml.h:28
+msgid "Business Cards"
 msgstr "Vizitkartoj"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:26
-msgid "Large Round Labels"
-msgstr "Grandaj rondigitaj etikedoj"
+#, fuzzy
+msgid "Index Cards"
+msgstr "Vizitkartoj"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:28
-msgid "Name Badge Labels"
-msgstr "Nomŝildetoj"
+msgid "Post cards"
+msgstr ""
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:30
-msgid "Post cards"
-msgstr ""
+msgid "Name Badge Labels"
+msgstr "Nomŝildetoj"
 
 #. ===================================================================
+#. ===============================================================
+#. ===================================================================
 #. ********************************************************************
+#. ===================================================================
 #: ../templates/avery-us-templates.xml.h:32
-#: ../templates/dymo-other-templates.xml.h:12
-#: ../templates/meritline-us-templates.xml.h:10
-#: ../templates/worldlabel-us-templates.xml.h:8
-msgid "Return Address Labels"
-msgstr "Etikedoj por adreso de sendinto"
+#: ../templates/avery-iso-templates.xml.h:6
+#: ../templates/begalabel-templates.xml.h:5
+#: ../templates/geha-iso-templates.xml.h:10
+#: ../templates/herma-iso-templates.xml.h:14
+#: ../templates/igepa-templates.xml.h:5 ../templates/jac-iso-templates.xml.h:2
+#: ../templates/mayspies-templates.xml.h:1
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:24
+#: ../templates/misc-other-templates.xml.h:2
+#: ../templates/pearl-iso-templates.xml.h:64
+#: ../templates/rayfilm-templates.xml.h:10
+#: ../templates/sheetlabels-us-templates.xml.h:14
+#: ../templates/worldlabel-us-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:8
+msgid "CD/DVD Labels"
+msgstr "Etikedoj por KD/DVD"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
-#: ../templates/maco-us-templates.xml.h:3
-#: ../templates/meritline-us-templates.xml.h:12
-#: ../templates/misc-us-templates.xml.h:30
-#: ../templates/worldlabel-us-templates.xml.h:9
-#, fuzzy
-msgid "Round Labels"
-msgstr "Plenrondaj etikedoj"
+#: ../templates/sheetlabels-us-templates.xml.h:20
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr "Etikedoj por KD/DVD (Etikedoj por diskoj)"
 
 #. ===================================================================
-#. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:36
-#: ../templates/dataline-iso-templates.xml.h:10
-#: ../templates/meritline-us-templates.xml.h:14
-#: ../templates/uline-us-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:10
-msgid "Shipping Labels"
-msgstr "Etikedoj por ekspedo"
+msgid "CD/DVD Labels (Spine Labels)"
+msgstr "Etikedoj por KD/DVD (Etikedoj por diskoj)"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:38
-msgid "Small Round Labels"
-msgstr "Malgrandaj rondigitaj etikedoj"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:40
-msgid "Square Labels"
-msgstr "Kvardaj etikedoj"
+#: ../templates/geha-iso-templates.xml.h:17
+#: ../templates/meritline-us-templates.xml.h:16
+#: ../templates/sheetlabels-us-templates.xml.h:24
+#: ../templates/worldlabel-us-templates.xml.h:10
+msgid "Video Tape Face Labels"
+msgstr "Etikedoj por videokasedo"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:42
-msgid "Tent Cards"
-msgstr ""
+#, fuzzy
+msgid "ID Labels"
+msgstr "Etikedoj por KD"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:44
-#: ../templates/geha-iso-templates.xml.h:27
-#: ../templates/meritline-us-templates.xml.h:16
-#: ../templates/worldlabel-us-templates.xml.h:11
-msgid "Video Tape Face Labels"
-msgstr "Etikedoj por videokasedo (faco)"
+#: ../templates/meritline-us-templates.xml.h:10
+#: ../templates/worldlabel-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr "Paĝo plena da ekikedoj"
+
+#. the LSK labels can be torn in half down the center
+#: ../templates/avery-us-templates.xml.h:46
+#, fuzzy
+msgid "Divider Labels"
+msgstr "Etikedoj por KD"
+
+#. ===================================================================
+#. ============================================================
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/cablelabel-templates.xml.h:2
+#, fuzzy
+msgid "Mini Labels"
+msgstr "Etikedoj por Mini-KD"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:4
-#: ../templates/misc-iso-templates.xml.h:2
-msgid "Address labels"
-msgstr "Etikedoj por adreso"
+msgid "Self-Adhesive Name Badges (Acetate Silk)"
+msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:8
 #, fuzzy
 msgid "Allround labels"
 msgstr "Plenrondaj etikedoj"
 
-#. ===============================================================
+#. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:10
-#: ../templates/zweckform-iso-templates.xml.h:8
-msgid "CD Booklet"
-msgstr "CD Booklet"
+#: ../templates/decadry-iso-templates.xml.h:2
+#: ../templates/misc-iso-templates.xml.h:14
+#: ../templates/online-templates.xml.h:21
+msgid "Mailing labels"
+msgstr "Etikedoj por poŝto"
 
 #. ===================================================================
-#. ====================================================================
-#: ../templates/avery-iso-templates.xml.h:18
-#: ../templates/hama-iso-templates.xml.h:17
-msgid "Diskette labels"
-msgstr "Etikedoj por disketoj"
+#: ../templates/avery-iso-templates.xml.h:12
+#: ../templates/dymo-other-templates.xml.h:6
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/online-templates.xml.h:53
+msgid "Address labels"
+msgstr "Etikedoj por adreso"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:20
-msgid "Identification Labels"
-msgstr ""
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/hisago-templates.xml.h:6 ../templates/online-templates.xml.h:26
+msgid "Shipping labels"
+msgstr "Etikedo por ekspedo"
 
 #. ===============================================================
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:22
 #: ../templates/decadry-iso-templates.xml.h:4
-#: ../templates/herma-iso-templates.xml.h:14
-#: ../templates/misc-us-templates.xml.h:20
-#: ../templates/misc-iso-templates.xml.h:26
-#: ../templates/zweckform-iso-templates.xml.h:20
+#: ../templates/herma-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:21
+#: ../templates/misc-iso-templates.xml.h:6
+#: ../templates/sheetlabels-us-templates.xml.h:28
+#: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Mailing Labels"
 msgstr "Etikedoj por poŝto"
 
-#. ===================================================================
+#. ===============================================================
 #: ../templates/avery-iso-templates.xml.h:24
-#: ../templates/decadry-iso-templates.xml.h:6
-msgid "Mailing labels"
-msgstr "Etikedoj por poŝto"
+#: ../templates/zweckform-iso-templates.xml.h:24
+msgid "CD Booklet"
+msgstr "CD Booklet"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:26
+#: ../templates/avery-iso-templates.xml.h:28
 msgid "Mini Address Labels"
 msgstr "Eta etikedoj por adreso"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:28
-#, fuzzy
-msgid "Mini Labels"
-msgstr "Etikedoj por Mini-KD"
+#: ../templates/avery-iso-templates.xml.h:30
+msgid "Identification Labels"
+msgstr ""
 
 #. ===================================================================
+#. ====================================================================
 #: ../templates/avery-iso-templates.xml.h:32
-msgid "Shipping labels"
-msgstr "Etikedo por ekspedo"
+#: ../templates/hama-iso-templates.xml.h:31
+msgid "Diskette labels"
+msgstr "Etikedoj por disketoj"
 
-#: ../templates/brother-other-templates.xml.h:1
-msgid "Multi Purpose Labels 17mm x 54mm"
-msgstr ""
+#: ../templates/begalabel-templates.xml.h:1
+msgid "Rounded rectangular labels"
+msgstr "Rektangulaj etikedoj"
 
-#: ../templates/brother-other-templates.xml.h:2
+#: ../templates/begalabel-templates.xml.h:6
 #, fuzzy
+#| msgid "Cassette Labels"
+msgid "Cassette Tape Face"
+msgstr "Etikedoj por kasedoj"
+
+#.
+#. *********************************************************************
+#. *********************************************************************
+#. Labels for the Brother QL-500/550/650 PC Label Printers
+#.
+#. These templates are based on the exact media sizes and measurements
+#. in version 1.1 of the 'Brother-QL-500-ptouch.ppd' file.  If these
+#. don't work for you, try the old versions (e.g. DK-11201-old) of
+#. these templates.
+#.
+#. Currently only have templates for a few of the popular sizes.
+#.
+#. *********************************************************************
+#. *********************************************************************
+#.
+#: ../templates/brother-other-templates.xml.h:16
+msgid "Standard Address Labels 29mm x 90mm"
+msgstr "Etikedoj por adreso de sendinto 29mm x 90mm"
+
+#: ../templates/brother-other-templates.xml.h:17
 msgid "Shipping Labels 62mm x 100mm"
-msgstr "Etikedoj por ekspedo"
+msgstr "Etikedoj por ekspedo 62mm x 100mm"
+
+#: ../templates/brother-other-templates.xml.h:18
+msgid "Multi Purpose Labels 17mm x 54mm"
+msgstr ""
+
+#: ../templates/brother-other-templates.xml.h:19
+msgid "Standard Address Labels 38mm x 90mm"
+msgstr "Etikedoj por adreso de sendinto 38mm x 90mm"
 
 #.
 #. *********************************************************************
 #. *********************************************************************
 #. Labels for the Brother QL-500/550/650 PC Label Printers
 #.
-#. These templates work with the Brother Linux Printer CUPS Driver.  It
-#. is unknown if these work correctly with the foomatic print driver for
-#. these printers.
+#. These are the older templates that worked with the Brother Linux
+#. Printer CUPS Driver.  They do not work correctly with newer versions
+#. of the foomatic drivers.
 #.
 #. One difference from typical templates is that the template size is
 #. not the actual media size - it is the size of the printable area,
@@ -3073,88 +3348,152 @@ msgstr "Etikedoj por ekspedo"
 #. *********************************************************************
 #. *********************************************************************
 #.
-#: ../templates/brother-other-templates.xml.h:20
-#, fuzzy
-msgid "Standard Address Labels 29mm x 90mm"
-msgstr "Etikedoj por adreso de sendinto"
+#: ../templates/brother-other-templates.xml.h:37
+msgid "Standard Address Labels 29mm x 90mm (Old)"
+msgstr "Etikedoj por adreso de sendinto 29mm x 90mm (malnova)"
 
-#: ../templates/brother-other-templates.xml.h:21
-#, fuzzy
-msgid "Standard Address Labels 38mm x 90mm"
-msgstr "Etikedoj por adreso de sendinto"
+#: ../templates/brother-other-templates.xml.h:38
+msgid "Shipping Labels 62mm x 100mm (Old)"
+msgstr "Etikedoj por ekspedo 62mm x 100mm (malnova)"
+
+#: ../templates/brother-other-templates.xml.h:39
+msgid "Multi Purpose Labels 17mm x 54mm (Old)"
+msgstr "Mikrotubaj etikedoj 17mm x 54mm (malnova)"
+
+#: ../templates/brother-other-templates.xml.h:40
+msgid "Standard Address Labels 38mm x 90mm (Old)"
+msgstr "Etikedoj por adreso de sendinto 38mm x 90mm (malnova)"
 
 #. ===================================================================
-#: ../templates/databecker-iso-templates.xml.h:6
-#: ../templates/misc-iso-templates.xml.h:8
-msgid "CD Labels"
-msgstr "Etikedoj por KD"
+#: ../templates/canon-other-templates.xml.h:2
+#, fuzzy
+#| msgid "CD/DVD Labels"
+msgid "CD/DVD Tray"
+msgstr "Etikedoj por KD/DVD"
 
 #. ===================================================================
-#: ../templates/databecker-iso-templates.xml.h:8
+#: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "Etikedoj kun standarta formato por KD/DVD (nur faco)"
 
 #. ===================================================================
+#. ============================================================
+#. ===================================================================
+#: ../templates/databecker-iso-templates.xml.h:8
+#: ../templates/desmat-templates.xml.h:2
+#: ../templates/misc-iso-templates.xml.h:22
+msgid "CD Labels"
+msgstr "Etikedoj por KD"
+
+#. ===================================================================
 #. ====================================================================
-#: ../templates/dataline-iso-templates.xml.h:6
-#: ../templates/hama-iso-templates.xml.h:13
-#| msgid "CD/DVD Labels"
+#. ===================================================================
+#. OL6075
+#: ../templates/dataline-iso-templates.xml.h:2
+#: ../templates/hama-iso-templates.xml.h:35
+#: ../templates/misc-iso-templates.xml.h:34
+#: ../templates/online-templates.xml.h:83
 msgid "CD/DVD labels"
 msgstr "Etikedoj por KD/DVD"
 
 #. ===================================================================
 #: ../templates/dataline-iso-templates.xml.h:8
-#: ../templates/pearl-iso-templates.xml.h:42
+#: ../templates/pearl-iso-templates.xml.h:60
 msgid "Membership cards"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:2
-msgid "3.5in Diskette"
-msgstr ""
+#: ../templates/dymo-other-templates.xml.h:4
+#, fuzzy
+msgid "Multipurpose Labels"
+msgstr "Mikrotubaj etikedoj"
 
 #. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:8
 #, fuzzy
 msgid "File Folder"
 msgstr "Koloro de plenigo"
 
 #. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:8
+#: ../templates/dymo-other-templates.xml.h:10
+#, fuzzy
+#| msgid "Name Badge Labels"
+msgid "Name Badges"
+msgstr "Nomŝildetoj"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:12
 msgid "Hanging Folder"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:10
-#: ../templates/geha-iso-templates.xml.h:19
+#: ../templates/dymo-other-templates.xml.h:16
+#: ../templates/geha-iso-templates.xml.h:23
 #, fuzzy
 msgid "Large Address Labels"
 msgstr "Etikedo por adreso"
 
 #. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:18
 #, fuzzy
 msgid "Shipping Address Labels"
 msgstr "Eta etikedoj por adreso"
 
 #. ===================================================================
-#. ====================================================================
+#: ../templates/endisch-templates.xml.h:5 ../templates/hisago-templates.xml.h:3
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/rayfilm-templates.xml.h:3
+msgid "Labels A6"
+msgstr ""
+
 #. ===================================================================
-#: ../templates/geha-iso-templates.xml.h:4
-#: ../templates/hama-iso-templates.xml.h:2
-#: ../templates/herma-iso-templates.xml.h:4
-msgid "Arch File Labels"
-msgstr "Arkaj etikedoj por dosieroj"
+#: ../templates/endisch-templates.xml.h:6 ../templates/hisago-templates.xml.h:2
+#: ../templates/pearl-iso-templates.xml.h:22
+#: ../templates/rayfilm-templates.xml.h:4
+msgid "Labels A5"
+msgstr ""
+
+#. *******************************************************************
+#. ===================================================================
+#: ../templates/endisch-templates.xml.h:7 ../templates/hisago-templates.xml.h:1
+#: ../templates/igepa-templates.xml.h:3 ../templates/jac-iso-templates.xml.h:6
+#: ../templates/pearl-iso-templates.xml.h:6
+#: ../templates/rayfilm-templates.xml.h:5
+msgid "Labels A4"
+msgstr ""
+
+#: ../templates/endisch-templates.xml.h:8
+#: ../templates/rayfilm-templates.xml.h:6
+#| msgid "Labels"
+msgid "Labels A3"
+msgstr "Etikedoj A3"
+
+#: ../templates/endisch-templates.xml.h:9
+#: ../templates/rayfilm-templates.xml.h:7
+#| msgid "Labels"
+msgid "Labels SRA3"
+msgstr "Etikedoj SRA3"
+
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:2
+msgid "Flyer paper"
+msgstr ""
 
 #. ===================================================================
+#. ====================================================================
 #: ../templates/geha-iso-templates.xml.h:6
+#: ../templates/hama-iso-templates.xml.h:25
+msgid "Greeting cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:8
 #, fuzzy
 #| msgid "Arch File Labels"
 msgid "Arch File inserts"
 msgstr "Arkaj etikedoj por dosieroj"
 
-#: ../templates/geha-iso-templates.xml.h:9
-#| msgid "CD Inlet"
+#: ../templates/geha-iso-templates.xml.h:11
 msgid "CD/DVD Inlet"
 msgstr ""
 
@@ -3162,406 +3501,751 @@ msgstr ""
 #. ====================================================================
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:13
-#: ../templates/hama-iso-templates.xml.h:15
-#: ../templates/pearl-iso-templates.xml.h:26
-#| msgid "CD Inlet"
+#: ../templates/hama-iso-templates.xml.h:17
+#: ../templates/pearl-iso-templates.xml.h:32
 msgid "DVD inlet"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/geha-iso-templates.xml.h:15
-msgid "Flyer paper"
-msgstr ""
-
-#. ===================================================================
 #. ====================================================================
-#: ../templates/geha-iso-templates.xml.h:17
-#: ../templates/hama-iso-templates.xml.h:19
-msgid "Greeting cards"
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:19
+#: ../templates/hama-iso-templates.xml.h:6
+#: ../templates/pearl-iso-templates.xml.h:12
+msgid "Photo labels"
 msgstr ""
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:21
-#: ../templates/misc-other-templates.xml.h:4
-#, fuzzy
-msgid "Multi-Purpose Labels"
-msgstr "Mikrotubaj etikedoj"
-
-#. ===================================================================
-#: ../templates/geha-iso-templates.xml.h:23
 msgid "Passport photo labels"
 msgstr ""
 
 #. ===================================================================
 #. ====================================================================
 #. ===================================================================
-#: ../templates/geha-iso-templates.xml.h:25
-#: ../templates/hama-iso-templates.xml.h:23
-#: ../templates/pearl-iso-templates.xml.h:50
-msgid "Photo labels"
-msgstr ""
+#: ../templates/geha-iso-templates.xml.h:27
+#: ../templates/hama-iso-templates.xml.h:37
+#: ../templates/herma-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr "Arkaj etikedoj por dosieroj"
 
-#. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:4
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:29
+#: ../templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-other-templates.xml.h:4
 #, fuzzy
-#| msgid "Arch File Labels"
-msgid "Arch File labels"
-msgstr "Arkaj etikedoj por dosieroj"
+msgid "Multi-Purpose Labels"
+msgstr "Mikrotubaj etikedoj"
 
 #. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:8
-#| msgid "CD Inlet"
-msgid "CD inlet"
+#: ../templates/hama-iso-templates.xml.h:2
+msgid "Printable mousepad"
 msgstr ""
 
-#. ===================================================================
-#: ../templates/hama-iso-templates.xml.h:9
-#: ../templates/pearl-iso-templates.xml.h:20
-#| msgid "CD Inlet"
-msgid "CD inlet (back)"
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:10
+msgid "CD inlet"
 msgstr ""
 
 #. ====================================================================
 #. ===================================================================
-#: ../templates/hama-iso-templates.xml.h:11
-#: ../templates/pearl-iso-templates.xml.h:22
-#, fuzzy
+#: ../templates/hama-iso-templates.xml.h:12
+#: ../templates/pearl-iso-templates.xml.h:34
 msgid "CD inlet (front)"
-msgstr "Porti _Fronten"
-
-#. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:21
-msgid "Mini Disc labels"
-msgstr "Etikedoj por Mini-KD"
+msgstr "KD-libreto (fronto)"
 
-#. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:25
-msgid "Printable mousepad"
-msgstr ""
+#. ===================================================================
+#: ../templates/hama-iso-templates.xml.h:13
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "CD inlet (back)"
+msgstr "KD-libreto (malfronto)"
 
 #. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:35
-msgid "VHS inlet"
+#: ../templates/hama-iso-templates.xml.h:15
+msgid "Zip disc inlet"
 msgstr ""
 
 #. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:37
-#| msgid "CD Inlet"
+#: ../templates/hama-iso-templates.xml.h:19
 msgid "VHS-C inlet"
 msgstr ""
 
 #. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:39
+#: ../templates/hama-iso-templates.xml.h:21
 msgid "Video-8 inlet"
 msgstr ""
 
 #. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:41
-msgid "Zip disc inlet"
+#: ../templates/hama-iso-templates.xml.h:23
+msgid "VHS inlet"
 msgstr ""
 
 #. ====================================================================
-#: ../templates/hama-iso-templates.xml.h:43
+#: ../templates/hama-iso-templates.xml.h:33
 #, fuzzy
 msgid "Zip disc labels"
 msgstr "Etikedoj por disketoj"
 
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:39
+#, fuzzy
+#| msgid "Arch File Labels"
+msgid "Arch File labels"
+msgstr "Arkaj etikedoj por dosieroj"
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:43
+msgid "Mini Disc labels"
+msgstr "Etikedoj por Mini-KD"
+
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:2
-#: ../templates/zweckform-iso-templates.xml.h:4
-msgid "Allround Labels"
-msgstr "Plenrondaj etikedoj"
+msgid "Arch File Labels (small)"
+msgstr "Arkaj etikedoj por dosieroj (etaj)"
 
 #. ===================================================================
-#: ../templates/herma-iso-templates.xml.h:6
+#: ../templates/herma-iso-templates.xml.h:4
 msgid "Arch File Labels (large)"
 msgstr "Arkaj etikedoj por dosieroj (grandaj)"
 
 #. ===================================================================
-#: ../templates/herma-iso-templates.xml.h:8
-msgid "Arch File Labels (small)"
-msgstr "Arkaj etikedoj por dosieroj (etaj)"
+#: ../templates/herma-iso-templates.xml.h:10
+#: ../templates/zweckform-iso-templates.xml.h:18
+msgid "Allround Labels"
+msgstr "Plenrondaj etikedoj"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:12
+msgid "Video Labels (face only)"
+msgstr "Etikedoj por video (nur frontispico)"
+
+#. ===================================================================
+#: ../templates/herma-iso-templates.xml.h:16
 msgid "Diskette Labels (face only)"
 msgstr "Etikedoj por disketoj (nur faco)"
 
 #. ===================================================================
-#: ../templates/herma-iso-templates.xml.h:20
-msgid "Video Labels (face only)"
-msgstr "Etikedoj por video (nur frontispico)"
+#: ../templates/igepa-templates.xml.h:2 ../templates/online-templates.xml.h:28
+#: ../templates/pearl-iso-templates.xml.h:18
+msgid "Floppy disk labels"
+msgstr "Etikedoj por disketoj"
 
-#. *******************************************************************
 #. ===================================================================
-#: ../templates/jac-iso-templates.xml.h:4
-#: ../templates/pearl-iso-templates.xml.h:36
-msgid "Labels A4"
-msgstr ""
+#: ../templates/igepa-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:2
+msgid "Lever Arch File Labels"
+msgstr "Levilaj arkaj etikedoj por dosieroj"
 
 #. *******************************************************************
-#: ../templates/jac-iso-templates.xml.h:6
-#| msgid "CD Labels"
+#: ../templates/jac-iso-templates.xml.h:8
 msgid "PVC labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/meritline-us-templates.xml.h:8
+#: ../templates/meritline-us-templates.xml.h:2
 msgid "Mini-CD Labels"
 msgstr "Etikedoj por Mini-KD"
 
 #. ===================================================================
 #: ../templates/microapp-templates.xml.h:2
-#| msgid "Rectangular Labels"
 msgid "Standard Labels"
 msgstr ""
 
 #. ===================================================================
+#. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:2
-msgid "Business Card CD"
-msgstr "Vizitkarto KD"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:6
-msgid "CD Template Rectangles"
-msgstr "Modelaj Rektanguloj por KD"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:10
-msgid "CD/DVD Labels (Face Only)"
+#: ../templates/misc-iso-templates.xml.h:26
+msgid "CD/DVD Labels (face only)"
 msgstr "Etikedoj por KD/DVD (nur faco)"
 
 #. ===================================================================
-#. TODO: Is this the actual part #?
-#: ../templates/misc-us-templates.xml.h:12
-#: ../templates/misc-iso-templates.xml.h:12
-msgid "CD/DVD Labels (face only)"
+#: ../templates/misc-us-templates.xml.h:4
+msgid "CD/DVD Labels (Face Only)"
 msgstr "Etikedoj por KD/DVD (nur faco)"
 
 #. TODO: Is this the actual part #?
-#: ../templates/misc-us-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:6
 msgid "Cassette Labels"
 msgstr "Etikedoj por kasedoj"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:16
-msgid "DLT Labels"
-msgstr "Etikedoj DLT"
+#: ../templates/misc-us-templates.xml.h:10
+msgid "Slimline CD Case (rightside up)"
+msgstr "Subtila KD-ujo (dekstrosupra)"
+
+#: ../templates/misc-us-templates.xml.h:11
+msgid "Slimline CD Case (upside down)"
+msgstr "Subtila KD-ujo (kaposuba)"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:18
-msgid "Jewel Case Booklet"
-msgstr ""
+#: ../templates/misc-us-templates.xml.h:13
+msgid "CD Template Rectangles"
+msgstr "Modelaj Rektanguloj por KD"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:22
-msgid "Microtube labels"
-msgstr "Mikrotubaj etikedoj"
+#: ../templates/misc-us-templates.xml.h:15
+msgid "Business Card CD"
+msgstr "Vizitkarto KD"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:24
-msgid "PRO CD Labels 2-up (CD spine only)"
-msgstr "Etikedoj por PRO CD (nur KD-dorso)"
+#: ../templates/misc-us-templates.xml.h:17
+msgid "Jewel Case Booklet"
+msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:26
-msgid "PRO CD Labels 2-up (Face only)"
-msgstr "Etikedoj por PRO CD (nur faco)"
+#: ../templates/misc-us-templates.xml.h:19
+msgid "DLT Labels"
+msgstr "Etikedoj DLT"
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
-#: ../templates/misc-us-templates.xml.h:28
-#: ../templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-us-templates.xml.h:25
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "PRO CD Labels 2-up (face only)"
 msgstr "Etikedoj por PRO CD (nur faco)"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:32
-msgid "Slimline CD Case (rightside up)"
-msgstr "Subtila KD-ujo (dekstrosupra)"
+#: ../templates/misc-us-templates.xml.h:27
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr "Etikedoj por PRO CD (nur faco)"
 
-#: ../templates/misc-us-templates.xml.h:33
-msgid "Slimline CD Case (upside down)"
-msgstr "Subtila KD-ujo (kaposuba)"
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:29
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr "Etikedoj por PRO CD (nur KD-dorso)"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:4
-#: ../templates/pearl-iso-templates.xml.h:6
-msgid "Bottle labels"
-msgstr "Etikedoj por boteloj"
+#: ../templates/misc-us-templates.xml.h:31
+msgid "Microtube labels"
+msgstr "Mikrotubaj etikedoj"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:14
-msgid "EPSON Photo Stickers 16"
-msgstr "EPSON Photo Stickers 16"
+#: ../templates/misc-iso-templates.xml.h:8
+msgid "General Labels"
+msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:16
-msgid "Etiketten"
-msgstr "Etiketten"
+#: ../templates/misc-iso-templates.xml.h:10
+#: ../templates/pearl-iso-templates.xml.h:28
+msgid "Self-adhesive labels"
+msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:18
+#: ../templates/misc-iso-templates.xml.h:16
 msgid "Fridge Magnet Stickers"
 msgstr "Magnetaĵoj por fridujo"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:20
-msgid "General Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:22
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:32
-#: ../templates/pearl-iso-templates.xml.h:62
-msgid "Self-adhesive labels"
-msgstr ""
+#: ../templates/misc-iso-templates.xml.h:20
+msgid "EPSON Photo Stickers 16"
+msgstr "EPSON Photo Stickers 16"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:34
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Universal Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:4
-msgid "Address Labels (STAMPIT)"
-msgstr "Etikedoj por adreso (STAMPIT)"
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/pearl-iso-templates.xml.h:16
+#: ../templates/sheetlabels-us-templates.xml.h:26
+msgid "Bottle labels"
+msgstr "Etikedoj por boteloj"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:10
-msgid "Business cards glossy, both sides printable"
+#: ../templates/misc-iso-templates.xml.h:40
+msgid "Etiketten"
+msgstr "Etiketten"
+
+#: ../templates/online-templates.xml.h:1
+msgid "SD Card labels, library book labels, classification labels"
 msgstr ""
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:12
+#: ../templates/online-templates.xml.h:2
+msgid "Jar labels, candle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:3
 #, fuzzy
-msgid "Business cards high glossy"
-msgstr "Vizitkartoj"
+msgid "Barcode labels"
+msgstr "Kvardaj etikedoj"
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:14
+#: ../templates/online-templates.xml.h:4
+msgid "Classification labels, library book labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:5
 #, fuzzy
-msgid "Business cards punched"
-msgstr "Vizitkartoj"
+#| msgid "Bottle labels"
+msgid "Water bottle labels"
+msgstr "Etikedoj por boteloj"
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:16
+#: ../templates/online-templates.xml.h:6
+msgid "Jar labels, pot labels, candle labels"
+msgstr ""
+
+#. OL120
+#: ../templates/online-templates.xml.h:9
+msgid "Medical chart labels"
+msgstr "Rektangulaj etikedoj"
+
+#. OL8325
+#: ../templates/online-templates.xml.h:11
 #, fuzzy
-msgid "Business cards punched dull"
-msgstr "Vizitkartoj"
+#| msgid "Microtube labels"
+msgid "Lip balm tube labels"
+msgstr "Mikrotubaj etikedoj"
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:18
+#. OL2162
+#: ../templates/online-templates.xml.h:13
 #, fuzzy
-msgid "Business cards punched glossy"
-msgstr "Vizitkartoj"
+#| msgid "Return Address Labels"
+msgid "Return address labels"
+msgstr "Etikedoj por adreso de sendinto"
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:30
-msgid "Floppy disk labels"
+#: ../templates/online-templates.xml.h:14
+msgid "File labels, return address labels, medical chart labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:15
+msgid "Jar labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:16
+#, fuzzy
+msgid "Jar labels"
+msgstr "Kvardaj etikedoj"
+
+#: ../templates/online-templates.xml.h:18
+msgid "Wine bottle labels, nutritional labels"
+msgstr ""
+
+#. OL1102
+#: ../templates/online-templates.xml.h:20
+msgid "Digital video labels"
+msgstr "Video-etikedoj"
+
+#: ../templates/online-templates.xml.h:22
+msgid "Pot labels, coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:23
+#, fuzzy
+#| msgid "Any label"
+msgid "Candy labels"
+msgstr "Iu etikedo"
+
+#: ../templates/online-templates.xml.h:24
+msgid "Reverse automobile window stickers"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:25
+msgid "Jar labels, candy labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:27
+msgid "Address labels, barcode labels, candy labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:29
+msgid "VHS face labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:30
+msgid "Jar labels, pot labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:31
+#, fuzzy
+msgid "File folder labels"
+msgstr "Arkaj etikedoj por dosieroj"
+
+#: ../templates/online-templates.xml.h:32
+msgid "Metal tin container labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:33
+msgid "Bookplate labels, coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:34
+#, fuzzy
+#| msgid "Shipping labels"
+msgid "Amazon FBA shipping labels"
+msgstr "Etikedo por ekspedo"
+
+#: ../templates/online-templates.xml.h:35
+msgid "Jar labels, coffee and tea labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:36
+msgid "Jar labels, pot labels, coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:37
+#, fuzzy
+#| msgid "Diskette labels"
+msgid "Digital media labels"
 msgstr "Etikedoj por disketoj"
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:32
+#: ../templates/online-templates.xml.h:38
+msgid "Jar labels, Coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:39
 #, fuzzy
-msgid "Foldable business cards"
+#| msgid "Bottle labels"
+msgid "Wine bottle labels"
+msgstr "Etikedoj por boteloj"
+
+#: ../templates/online-templates.xml.h:40
+#, fuzzy
+#| msgid "Mailing labels"
+msgid "Mail Order Manager labels"
+msgstr "Etikedoj por poŝto"
+
+#: ../templates/online-templates.xml.h:41
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Liquor bottle labels"
+msgstr "Etikedoj por boteloj"
+
+#: ../templates/online-templates.xml.h:42
+#, fuzzy
+#| msgid "Microtube labels"
+msgid "Metal tin container labels"
+msgstr "Mikrotubaj etikedoj"
+
+#: ../templates/online-templates.xml.h:43
+msgid "Hershey's® chocolate labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:44
+msgid "VHS labels, jar labels, book labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:45
+#, fuzzy
+#| msgid "Shipping labels"
+msgid "USPS® shipping labels"
+msgstr "Etikedo por ekspedo"
+
+#: ../templates/online-templates.xml.h:46
+msgid "Jar labels, candle labels, metal tin container labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:47
+msgid "Jar labels, water bottle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:48
+msgid "Jar labels, water bottle labels, wine bottle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:49
+#, fuzzy
+#| msgid "Any label"
+msgid "PayPal® label"
+msgstr "Iu etikedo"
+
+#: ../templates/online-templates.xml.h:50
+msgid "Water bottle labels, jar labels, candle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:51
+msgid "Medical chart labels, barcode labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:52
+msgid "Pot labels, barcode labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:54
+#, fuzzy
+#| msgid "Start on label"
+msgid "Nutritional labels"
+msgstr "Starto en etikedo"
+
+#: ../templates/online-templates.xml.h:55
+#, fuzzy
+#| msgid "CD Labels"
+msgid "CD case labels"
+msgstr "Etikedoj por KD"
+
+#: ../templates/online-templates.xml.h:56
+#, fuzzy
+msgid "Business card size labels"
 msgstr "Vizitkartoj"
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:34
-msgid "Foldable business cards glossy/dull"
+#: ../templates/online-templates.xml.h:57
+msgid "Reverse addendum stickers"
 msgstr ""
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:38
-msgid "Labels A5"
+#: ../templates/online-templates.xml.h:58
+msgid "Wine bottle labels, shipping labels, UPS® WorldShip® labels"
 msgstr ""
 
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:40
-msgid "Labels A6"
+#: ../templates/online-templates.xml.h:59
+#, fuzzy
+msgid "Coffee and tea labels"
+msgstr "Plenrondaj etikedoj"
+
+#: ../templates/online-templates.xml.h:60
+msgid "Water bottle labels, shipping labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:61
+#, fuzzy
+msgid "VICS labels"
+msgstr "Etikedoj por KD"
+
+#: ../templates/online-templates.xml.h:62
+#, fuzzy
+#| msgid "Full Sheet Labels"
+msgid "Full sheet labels with back slit"
+msgstr "Paĝo plena da ekikedoj"
+
+#: ../templates/online-templates.xml.h:63
+#, fuzzy
+#| msgid "Full Sheet Labels"
+msgid "Full sheet labels"
+msgstr "Paĝo plena da ekikedoj"
+
+#: ../templates/online-templates.xml.h:64
+#, fuzzy
+#| msgid "Shipping labels"
+msgid "Lip balm labels"
+msgstr "Etikedo por ekspedo"
+
+#: ../templates/online-templates.xml.h:65
+msgid "Paper hole reinforcement labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:68
+msgid "Candle labels, lip balm labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:69
+#, fuzzy
+msgid "Seal labels"
+msgstr "Kvardaj etikedoj"
+
+#: ../templates/online-templates.xml.h:70
+msgid "Jar labels, candle labels, lip balm labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:71
+msgid "Jar labels, nutritional labels, pot labels, soap labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:72
+msgid ""
+"Jar labels, nutritional labels, soap labels, candle labels, coffee and tea "
+"labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:73
+msgid "Jar labels, candle labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:74
+msgid "Nutritional labels, soap labels, coffee and tea labels, candle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:75
+msgid "Beer bottle labels, jar labels, nutritional labels, soap labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:76
+msgid "Beer bottle label, jar label"
 msgstr ""
 
+#: ../templates/online-templates.xml.h:77
+#, fuzzy
+#| msgid "Fridge Magnet Stickers"
+msgid "Target stickers"
+msgstr "Magnetaĵoj por fridujo"
+
+#: ../templates/online-templates.xml.h:78
+msgid "Round and rectangular labels"
+msgstr "Rektangulaj etikedoj"
+
+#: ../templates/online-templates.xml.h:79
+#, fuzzy
+#| msgid "CD/DVD labels"
+msgid "CD/DVD center hub labels"
+msgstr "Etikedoj por KD/DVD"
+
+#: ../templates/online-templates.xml.h:80
+#, fuzzy
+#| msgid "Business Card CD"
+msgid "Business card CD labels"
+msgstr "Vizitkarto KD"
+
+#: ../templates/online-templates.xml.h:81
+#, fuzzy
+#| msgid "Mini Disc labels"
+msgid "Mini CD labels"
+msgstr "Etikedoj por Mini-KD"
+
+#: ../templates/online-templates.xml.h:84
+#, fuzzy
+#| msgid "CD/DVD labels"
+msgid "Full face CD/DVD labels"
+msgstr "Etikedoj por KD/DVD"
+
+#: ../templates/online-templates.xml.h:85
+#| msgid "Shipping labels"
+msgid "eBay® shipping labels"
+msgstr "Etikedo por ekspedo"
+
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:44
-msgid "Membership cards, both sides printable"
+#: ../templates/pearl-iso-templates.xml.h:8
+msgid "Self-adhesive film weatherproof"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:46
-msgid "Name plates"
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Self-adhesive film transparent"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:48
-msgid "Passport photo labels glossy"
+#: ../templates/pearl-iso-templates.xml.h:14
+msgid "Self-adhesive window film"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:52
+#: ../templates/pearl-iso-templates.xml.h:24
 msgid "Photo labels semiglossy"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:56
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Address Labels (STAMPIT)"
+msgstr "Etikedoj por adreso (STAMPIT)"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
 msgid "SD card labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:58
-msgid "Self-adhesive film transparent"
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:60
-msgid "Self-adhesive film weatherproof"
-msgstr ""
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Vizitkartoj"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:64
-msgid "Self-adhesive window film"
+#: ../templates/pearl-iso-templates.xml.h:44
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:46
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+msgid "Name plates"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:14
-msgid "Correction and Cover-up Labels"
-msgstr "Etikedoj por korektado kaj kovrado"
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Business cards glossy, both sides printable"
+msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:52
 #, fuzzy
-msgid "File Back Labels"
-msgstr "Arkaj etikedoj por dosieroj"
+msgid "Business cards punched glossy"
+msgstr "Vizitkartoj"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:18
-msgid "Lever Arch File Labels"
-msgstr "Levilaj arkaj etikedoj por dosieroj"
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Foldable business cards glossy/dull"
+msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:22
-msgid "Multi-purpose Stick+Lift Labels"
+#: ../templates/pearl-iso-templates.xml.h:56
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:62
+msgid "Membership cards, both sides printable"
 msgstr ""
 
+#: ../templates/rayfilm-templates.xml.h:11
+#, fuzzy
+#| msgid "Business Card CD"
+msgid "Business card CD Labels"
+msgstr "Vizitkarto KD"
+
+#: ../templates/rayfilm-templates.xml.h:12
+#, fuzzy
+#| msgid "Mini-CD Labels"
+msgid "Mini CD Labels"
+msgstr "Etikedoj por Mini-KD"
+
+#: ../templates/rayfilm-templates.xml.h:13
+msgid "Triangular labels"
+msgstr "Rektangulaj etikedoj"
+
+#: ../templates/rayfilm-templates.xml.h:14
+#, fuzzy
+msgid "Trapezoid labels"
+msgstr "Plenrondaj etikedoj"
+
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:24
+#: ../templates/sheetlabels-us-templates.xml.h:22
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Oval bottle labels"
+msgstr "Etikedoj por boteloj"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:12
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr "QSL-Karten Etiketten 70mm x 50,8mm"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:26
-msgid "Rectangular Copier Labels"
-msgstr "Rektangulaj etikedoj por kopiado"
+#: ../templates/zweckform-iso-templates.xml.h:14
+msgid "Multi-purpose Stick+Lift Labels"
+msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:30
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Video Labels (back)"
 msgstr "Etikedo por Video (retro)"
 
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:20
+msgid "Rectangular Copier Labels"
+msgstr "Rektangulaj etikedoj por kopiado"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:22
+msgid "Correction and Cover-up Labels"
+msgstr "Etikedoj por korektado kaj kovrado"
+
+#, fuzzy
+#~ msgid "File Back Labels"
+#~ msgstr "Arkaj etikedoj por dosieroj"
+
 #, fuzzy
 #~ msgid "Couldn't open addressbook."
 #~ msgstr "Estas neeble malfermi dosieron \"%s\""
@@ -3758,9 +4442,6 @@ msgstr "Etikedo por Video (retro)"
 #~ msgid "%.5g x %.5g %s"
 #~ msgstr "%.5g x %.5g %s"
 
-#~ msgid "%.5g %s diameter"
-#~ msgstr "%.5g %s diametro"
-
 #~ msgid "Choose Custom Color"
 #~ msgstr "Elekti personigitan koloron"
 
diff --git a/po/fi.po b/po/fi.po
index c578cd0..fc3090f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,21 +1,22 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2016.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2016-01-21 19:21+0000\n"
-"PO-Revision-Date: 2016-01-21 22:55+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=glabels&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-01 09:23+0000\n"
+"PO-Revision-Date: 2017-09-01 21:40+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
-"Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
+"Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../src/bc-backends.c:81
 msgid "Built-in"
@@ -23,7 +24,7 @@ msgstr "Sisäänrakennettu"
 
 #: ../src/bc-backends.c:101
 msgid "POSTNET (any)"
-msgstr ""
+msgstr "POSTNET (mikä tahansa)"
 
 #: ../src/bc-backends.c:104
 msgid "POSTNET-5 (ZIP only)"
@@ -55,7 +56,7 @@ msgstr ""
 
 #: ../src/bc-backends.c:127
 msgid "EAN (any)"
-msgstr ""
+msgstr "EAN (mikä tahansa)"
 
 #: ../src/bc-backends.c:130
 msgid "EAN-8"
@@ -85,7 +86,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A tai UPC-E)"
 
-#: ../src/bc-backends.c:151 ../src/bc-backends.c:395
+#: ../src/bc-backends.c:151 ../src/bc-backends.c:398
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -97,7 +98,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc-backends.c:160 ../src/bc-backends.c:398
+#: ../src/bc-backends.c:160 ../src/bc-backends.c:401
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -109,7 +110,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc-backends.c:169 ../src/bc-backends.c:332
+#: ../src/bc-backends.c:169 ../src/bc-backends.c:335
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -129,7 +130,7 @@ msgstr "Code 128C"
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc-backends.c:187 ../src/bc-backends.c:329
+#: ../src/bc-backends.c:187 ../src/bc-backends.c:332
 msgid "Interleaved 2 of 5"
 msgstr ""
 
@@ -218,166 +219,170 @@ msgid "Data Matrix"
 msgstr ""
 
 #: ../src/bc-backends.c:272
+msgid "Data Matrix (GS1)"
+msgstr ""
+
+#: ../src/bc-backends.c:275
 msgid "Deutsche Post Leitcode"
 msgstr "Deutsche Post Leitcode"
 
-#: ../src/bc-backends.c:275
+#: ../src/bc-backends.c:278
 msgid "Deutsche Post Identcode"
 msgstr "Deutsche Post Identcode"
 
-#: ../src/bc-backends.c:278
+#: ../src/bc-backends.c:281
 msgid "Dutch Post KIX Code"
 msgstr ""
 
-#: ../src/bc-backends.c:281
+#: ../src/bc-backends.c:284
 msgid "EAN"
 msgstr "EAN"
 
-#: ../src/bc-backends.c:284
+#: ../src/bc-backends.c:287
 msgid "Grid Matrix"
 msgstr ""
 
-#: ../src/bc-backends.c:287
+#: ../src/bc-backends.c:290
 msgid "GS1-128"
 msgstr "GS1-128"
 
-#: ../src/bc-backends.c:290
+#: ../src/bc-backends.c:293
 msgid "GS1 DataBar-14"
 msgstr "GS1 DataBar-14"
 
-#: ../src/bc-backends.c:299
+#: ../src/bc-backends.c:302
 msgid "GS1 DataBar-14 Stacked"
 msgstr ""
 
-#: ../src/bc-backends.c:302
+#: ../src/bc-backends.c:305
 msgid "GS1 DataBar-14 Stacked Omni."
 msgstr ""
 
-#: ../src/bc-backends.c:305
+#: ../src/bc-backends.c:308
 msgid "GS1 DataBar Extended Stacked"
 msgstr ""
 
-#: ../src/bc-backends.c:308
+#: ../src/bc-backends.c:311
 msgid "HIBC Code 128"
 msgstr ""
 
-#: ../src/bc-backends.c:311
+#: ../src/bc-backends.c:314
 msgid "HIBC Code 39"
 msgstr ""
 
-#: ../src/bc-backends.c:314
+#: ../src/bc-backends.c:317
 msgid "HIBC Data Matrix"
 msgstr ""
 
-#: ../src/bc-backends.c:317
+#: ../src/bc-backends.c:320
 msgid "HIBC QR Code"
 msgstr ""
 
-#: ../src/bc-backends.c:320
+#: ../src/bc-backends.c:323
 msgid "HIBC PDF417"
 msgstr "HIBC PDF417"
 
-#: ../src/bc-backends.c:323
+#: ../src/bc-backends.c:326
 msgid "HIBC Micro PDF417"
-msgstr ""
+msgstr "HIBC Micro PDF417"
 
-#: ../src/bc-backends.c:326
+#: ../src/bc-backends.c:329
 msgid "HIBC Aztec Code"
 msgstr ""
 
-#: ../src/bc-backends.c:335
+#: ../src/bc-backends.c:338
 msgid "ITF-14"
 msgstr "ITF-14"
 
-#: ../src/bc-backends.c:338
+#: ../src/bc-backends.c:341
 msgid "Japanese Postal"
 msgstr ""
 
-#: ../src/bc-backends.c:341
+#: ../src/bc-backends.c:344
 msgid "Korean Postal"
 msgstr ""
 
-#: ../src/bc-backends.c:344
+#: ../src/bc-backends.c:347
 msgid "LOGMARS"
 msgstr "LOGMARS"
 
-#: ../src/bc-backends.c:347
+#: ../src/bc-backends.c:350
 msgid "Maxicode"
 msgstr "Maxicode"
 
-#: ../src/bc-backends.c:350
+#: ../src/bc-backends.c:353
 msgid "Micro PDF417"
 msgstr "Micro PDF417"
 
-#: ../src/bc-backends.c:353
+#: ../src/bc-backends.c:356
 msgid "Micro QR Code"
 msgstr ""
 
-#: ../src/bc-backends.c:356
+#: ../src/bc-backends.c:359
 msgid "MSI Plessey"
 msgstr ""
 
-#: ../src/bc-backends.c:359
+#: ../src/bc-backends.c:362
 msgid "NVE-18"
 msgstr "NVE-18"
 
-#: ../src/bc-backends.c:362
+#: ../src/bc-backends.c:365
 msgid "PDF417"
 msgstr "PDF417"
 
-#: ../src/bc-backends.c:365
+#: ../src/bc-backends.c:368
 msgid "PDF417 Truncated"
 msgstr ""
 
-#: ../src/bc-backends.c:368
+#: ../src/bc-backends.c:371
 msgid "PLANET"
 msgstr "PLANET"
 
-#: ../src/bc-backends.c:371
+#: ../src/bc-backends.c:374
 msgid "PostNet"
 msgstr "PostNet"
 
-#: ../src/bc-backends.c:374
+#: ../src/bc-backends.c:377
 msgid "Pharmacode"
 msgstr ""
 
-#: ../src/bc-backends.c:377
+#: ../src/bc-backends.c:380
 msgid "Pharmacode 2-track"
 msgstr ""
 
-#: ../src/bc-backends.c:380
+#: ../src/bc-backends.c:383
 msgid "Pharmazentral Nummer (PZN)"
 msgstr "Pharmazentral Nummer (PZN)"
 
-#: ../src/bc-backends.c:383
+#: ../src/bc-backends.c:386
 msgid "QR Code"
 msgstr "QR-koodi"
 
-#: ../src/bc-backends.c:386
+#: ../src/bc-backends.c:389
 msgid "Royal Mail 4-State"
 msgstr "Royal Mail 4-State"
 
-#: ../src/bc-backends.c:389
+#: ../src/bc-backends.c:392
 msgid "Telepen"
 msgstr "Telepen"
 
-#: ../src/bc-backends.c:392
+#: ../src/bc-backends.c:395
 msgid "Telepen Numeric"
 msgstr ""
 
-#: ../src/bc-backends.c:401
+#: ../src/bc-backends.c:404
 msgid "USPS One Code"
 msgstr ""
 
-#: ../src/bc-backends.c:404
+#: ../src/bc-backends.c:407
 msgid "UK Plessey"
 msgstr "UK Plessey"
 
-#: ../src/bc-backends.c:411
+#: ../src/bc-backends.c:414
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc-backends.c:418
+#: ../src/bc-backends.c:421
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -447,7 +452,7 @@ msgstr ""
 
 #: ../src/color-combo-menu.c:100
 msgid "Gold"
-msgstr ""
+msgstr "Kulta"
 
 #: ../src/color-combo-menu.c:101
 msgid "Yellow"
@@ -543,98 +548,104 @@ msgstr "Mukautettu väri #%u"
 msgid "gLabels Fatal Error!"
 msgstr "gLabelsin vakava virhe!"
 
-#: ../src/file.c:84
+#: ../src/file.c:85
 msgid "New Label or Card"
 msgstr "Uusi etiketti tai kortti"
 
-#: ../src/file.c:175 ../src/label.c:602 ../src/label.c:646
+#. Translators: dialog title
+#: ../src/file.c:174 ../src/label.c:602 ../src/label.c:646
 msgid "Label properties"
 msgstr "Etiketin ominaisuudet"
 
-#: ../src/file.c:267 ../src/file.c:557
+#. Translators: assistent dialog title
+#: ../src/file.c:203
+msgid "Choose label properties"
+msgstr "Valitse etiketin ominaisuudet"
+
+#: ../src/file.c:295 ../src/file.c:597
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/file.c:272 ../src/file.c:562
+#: ../src/file.c:300 ../src/file.c:602
 msgid "gLabels documents"
 msgstr "gLabels-tiedostot"
 
-#: ../src/file.c:319 ../src/file.c:620
+#: ../src/file.c:347 ../src/file.c:660
 msgid "Empty file name selection"
 msgstr ""
 
-#: ../src/file.c:322 ../src/file.c:338
+#: ../src/file.c:350 ../src/file.c:366
 msgid "Please select a file or supply a valid file name"
 msgstr "Valitse tiedosto tai anna kelvollinen tiedostonimi"
 
-#: ../src/file.c:335
+#: ../src/file.c:363
 msgid "File does not exist"
 msgstr "Tiedostoa ei ole olemassa"
 
-#: ../src/file.c:410
+#: ../src/file.c:438
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Tiedoston \"%s\" avaus epäonnistui"
 
-#: ../src/file.c:413
+#: ../src/file.c:441
 msgid "Not a supported file format"
 msgstr "Tiedostomuoto ei ole tuettu"
 
-#: ../src/file.c:491 ../src/file.c:670
+#: ../src/file.c:519 ../src/file.c:710
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "Tiedoston \"%s\" tallennus epäonnistui"
 
-#: ../src/file.c:495 ../src/file.c:674
+#: ../src/file.c:523 ../src/file.c:714
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "Tallennettaessa tapahtui virhe. Tiedostoa ei ole vielä tallennettu."
 
-#: ../src/file.c:535
+#: ../src/file.c:565
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Tallenna \"%s\" nimellä"
 
-#: ../src/file.c:623
+#: ../src/file.c:663
 msgid "Please supply a valid file name"
 msgstr "Anna kelvollinen tiedostonimi"
 
-#: ../src/file.c:644
+#: ../src/file.c:684
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Korvataanko tiedosto \"%s\"?"
 
-#: ../src/file.c:648
+#: ../src/file.c:688
 msgid "File already exists."
 msgstr "Tiedosto on jo olemassa."
 
-#: ../src/file.c:744
+#: ../src/file.c:784
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Tallennetaanko muutokset tiedostoon \"%s\" ennen sulkemista?"
 
-#: ../src/file.c:748
+#: ../src/file.c:788
 msgid "Your changes will be lost if you don't save them."
 msgstr "Muutokset katoavat, jos niitä ei tallenneta."
 
-#: ../src/file.c:751
+#: ../src/file.c:791
 msgid "Close without saving"
 msgstr "Sulje tallentamatta"
 
 #: ../src/font-combo-menu.c:137
 msgid "Recent fonts"
-msgstr "Viimeisimmät kirjasimet"
+msgstr "Viimeisimmät fontit"
 
 #: ../src/font-combo-menu.c:152
 msgid "Proportional fonts"
-msgstr "Tasasuhtaiset kirjasimet"
+msgstr "Tasasuhtaiset fontit"
 
 #: ../src/font-combo-menu.c:160
 msgid "Fixed-width fonts"
-msgstr "Tasalevyiset kirjasimet"
+msgstr "Tasalevyiset fontit"
 
 #: ../src/font-combo-menu.c:168
 msgid "All fonts"
-msgstr "Kaikki kirjasimet"
+msgstr "Kaikki fontit"
 
 #.
 #. * Allow text samples to be localized.
@@ -729,6 +740,9 @@ msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
+"%s\n"
+"Suorita '%s --help' nähdäksesi kaikki saatavilla olevat "
+"komentorivivalitsimet.\n"
 
 #: ../src/glabels-batch.c:151
 #, c-format
@@ -750,19 +764,19 @@ msgstr "Luo viivakoodiobjekti"
 
 #: ../src/label-barcode.c:259 ../src/label-barcode.c:461
 msgid "Barcode data"
-msgstr ""
+msgstr "Viivakoodin tiedot"
 
 #: ../src/label-barcode.c:290
 msgid "Barcode property"
-msgstr ""
+msgstr "Viivakoodin ominaisuus"
 
 #: ../src/label-barcode.c:684
 msgid "Barcode data empty"
-msgstr ""
+msgstr "Viivakoodin data on tyhjää"
 
 #: ../src/label-barcode.c:688
 msgid "Invalid barcode data"
-msgstr ""
+msgstr "Virheelliset viivakooditiedot"
 
 #: ../src/label-box.c:156
 msgid "Create box object"
@@ -787,75 +801,111 @@ msgstr "Viivan leveys"
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../src/label.c:720 ../src/ui.c:420
+#. Translators: A rectangular label dimensions. first param is numeric value
+#. of width, second is numeric value of height and third is unit. Example:
+#. "60 × 22.5 mm (width / height)"
+#. Translators: A elliptical label dimensions. first param is numeric value of
+#. width, second is numeric value of height and third is unit. Example:
+#. "60 × 22.5 mm (width / height)"
+#: ../src/label.c:751 ../src/label.c:776
+#, c-format
+msgid "%s × %s %s (width × height)"
+msgstr "%s × %s %s (leveys × korkeus)"
+
+#. Translators: A rounded rectangular label dimensions. first param is numeric
+#. value of width, second is numeric value of height, third is numeric value
+#. of round and fourth is unit. Example:
+#. "50 × 30 / 1.5 mm (width × height / round)"
+#: ../src/label.c:758
+#, c-format
+msgid "%s × %s / %s %s (width × height / round)"
+msgstr "%s × %s / %s %s (leveys × korkeus / pyöristys)"
+
+#. Translators: A round label dimensions. first param is numeric value of
+#. diameter and second is unit. Example:
+#. "120.5 mm (diameter)"
+#: ../src/label.c:788
+#, c-format
+msgid "%s %s (diameter)"
+msgstr "%s %s (halkaisija)"
+
+#. Translators: A CD/DVD label dimensions. first param is numeric value of
+#. diameter, second is numeric value of hole and third is unit. Example:
+#. "120.5 / 30 mm (diameter / hole)"
+#: ../src/label.c:806
+#, c-format
+msgid "%s / %s %s (diameter / hole)"
+msgstr "%s / %s %s (halkaisija / reikä)"
+
+#: ../src/label.c:835 ../src/ui.c:420
 msgid "Merge properties"
 msgstr "Yhdistä ominaisuudet"
 
-#: ../src/label.c:1216 ../src/ui.c:213
+#: ../src/label.c:1331 ../src/ui.c:213
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/label.c:1251 ../src/ui.c:322
+#: ../src/label.c:1366 ../src/ui.c:322
 msgid "Bring to front"
 msgstr "Tuo muiden eteen"
 
-#: ../src/label.c:1287 ../src/ui.c:329
+#: ../src/label.c:1402 ../src/ui.c:329
 msgid "Send to back"
 msgstr "Vie muiden taakse"
 
-#: ../src/label.c:1328
+#: ../src/label.c:1443
 msgid "Rotate"
 msgstr "Käännä"
 
-#: ../src/label.c:1363 ../src/ui.c:336
+#: ../src/label.c:1480 ../src/ui.c:336
 msgid "Rotate left"
 msgstr "Käännä vasemmalle"
 
-#: ../src/label.c:1396 ../src/ui.c:343
+#: ../src/label.c:1515 ../src/ui.c:343
 msgid "Rotate right"
 msgstr "Käännä oikealle"
 
-#: ../src/label.c:1431 ../src/ui.c:350
+#: ../src/label.c:1552 ../src/ui.c:350
 msgid "Flip horizontally"
 msgstr "Käännä vaakasuunnassa"
 
-#: ../src/label.c:1466 ../src/ui.c:357
+#: ../src/label.c:1589 ../src/ui.c:357
 msgid "Flip vertically"
 msgstr "Käännä pystysuunnassa"
 
-#: ../src/label.c:1506 ../src/ui.c:364
+#: ../src/label.c:1631 ../src/ui.c:364
 msgid "Align left"
 msgstr "Tasaa vasemmalle"
 
-#: ../src/label.c:1563 ../src/ui.c:378
+#: ../src/label.c:1688 ../src/ui.c:378
 msgid "Align right"
 msgstr "Tasaa oikealle"
 
-#: ../src/label.c:1624
+#: ../src/label.c:1749
 msgid "Align horizontal center"
 msgstr ""
 
-#: ../src/label.c:1700
+#: ../src/label.c:1825
 msgid "Align tops"
 msgstr ""
 
-#: ../src/label.c:1757
+#: ../src/label.c:1882
 msgid "Align bottoms"
 msgstr ""
 
-#: ../src/label.c:1818
+#: ../src/label.c:1943
 msgid "Align vertical center"
 msgstr ""
 
-#: ../src/label.c:1896 ../src/ui.c:406
+#: ../src/label.c:2021 ../src/ui.c:406
 msgid "Center horizontally"
 msgstr "Keskitä vaakasuunnassa"
 
-#: ../src/label.c:1943 ../src/ui.c:413
+#: ../src/label.c:2068 ../src/ui.c:413
 msgid "Center vertically"
 msgstr "Keskitä pystysuunnassa"
 
-#: ../src/label.c:2664 ../src/label.c:2706 ../src/label.c:2732 ../src/ui.c:206
+#: ../src/label.c:2789 ../src/label.c:2831 ../src/label.c:2857 ../src/ui.c:206
 msgid "Paste"
 msgstr "Liitä"
 
@@ -899,6 +949,23 @@ msgstr "Varjon väri"
 msgid "Shadow opacity"
 msgstr "Varjon läpinäkyvyys"
 
+#. Translators: Button label to choose different template
+#: ../src/label-properties-dialog.c:163
+msgid "Choose _other…"
+msgstr "Valitse _muu…"
+
+#: ../src/label-properties-dialog.c:164 ../src/ui.c:162
+msgid "_Close"
+msgstr "_Sulje"
+
+#. Translators: first param is numeric value of horizontal margine, second
+#. is numeric value of vertical margine and third is unit. Example:
+#. "10 / 12.5 mm (horizontal / vertical)"
+#: ../src/label-properties-dialog.c:282
+#, c-format
+msgid "%s / %s %s (horizontal / vertical)"
+msgstr ""
+
 #: ../src/label-text.c:293 ../src/ui.c:282
 msgid "Create text object"
 msgstr "Luo tekstiobjekti"
@@ -909,15 +976,15 @@ msgstr "Kirjoitus"
 
 #: ../src/label-text.c:601 ../data/ui/property-bar.ui.h:1
 msgid "Font family"
-msgstr "Kirjasinperhe"
+msgstr "Fonttiperhe"
 
 #: ../src/label-text.c:639 ../data/ui/property-bar.ui.h:2
 msgid "Font size"
-msgstr "Kirjasimen koko"
+msgstr "Fontin koko"
 
 #: ../src/label-text.c:672
 msgid "Font weight"
-msgstr "Kirjasimen painotus"
+msgstr "Fontin painotus"
 
 #: ../src/label-text.c:705 ../data/ui/property-bar.ui.h:4
 msgid "Italic"
@@ -941,7 +1008,7 @@ msgstr "Tekstin väri"
 
 #: ../src/label-text.c:997
 msgid "Auto shrink"
-msgstr ""
+msgstr "Automaattinen kutistus"
 
 #: ../src/media-select.c:358 ../src/media-select.c:361
 #: ../src/media-select.c:506 ../src/media-select.c:723
@@ -1080,15 +1147,16 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: ../src/new-label-dialog.c:212 ../data/ui/new-label-dialog.ui.h:1
+#: ../src/new-label-dialog.c:214
+msgctxt "Title of dialog page to select a stationary product"
 msgid "Select Product"
 msgstr "Valitse tuote"
 
-#: ../src/new-label-dialog.c:225 ../data/ui/new-label-dialog.ui.h:3
+#: ../src/new-label-dialog.c:227 ../data/ui/new-label-dialog.ui.h:3
 msgid "Choose Orientation"
 msgstr "Valitse suuntaus"
 
-#: ../src/new-label-dialog.c:240
+#: ../src/new-label-dialog.c:242
 msgid "Review"
 msgstr "Esikatsele"
 
@@ -1098,7 +1166,7 @@ msgstr "Esikatsele"
 msgid "Default"
 msgstr "Oletus"
 
-#: ../src/object-editor.c:161 ../src/object-editor.c:470
+#: ../src/object-editor.c:161 ../src/object-editor.c:472
 msgid "Object properties"
 msgstr "Objektin ominaisuudet"
 
@@ -1128,7 +1196,7 @@ msgstr "Viivakoodiobjektin ominaisuudet"
 
 #: ../src/object-editor-edit-page.c:76
 msgid "Insert merge field"
-msgstr ""
+msgstr "Syötä yhdistämiskenttä"
 
 #: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
 #: ../src/ui-property-bar.c:299
@@ -1164,7 +1232,7 @@ msgstr "gLabelsin asetukset"
 #. TODO: Is this the actual part #?
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:215
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-#: ../templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Labels"
 msgstr "Etiketit"
 
@@ -1338,10 +1406,6 @@ msgstr "_Mallisuunnittelija..."
 msgid "Create a custom template"
 msgstr "Luo omavalintainen malli"
 
-#: ../src/ui.c:162
-msgid "_Close"
-msgstr "_Sulje"
-
 #: ../src/ui.c:164
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
@@ -1659,7 +1723,7 @@ msgstr "gLabels-virhe!"
 msgid "(none) - gLabels"
 msgstr "(ei mitään) - gLabels"
 
-#: ../src/window.c:482
+#: ../src/window.c:484
 msgid "(modified)"
 msgstr "(muokattu)"
 
@@ -1758,29 +1822,65 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "Format:"
-msgstr "Muoto:"
+#: ../data/ui/label-properties-dialog.ui.h:1
+msgid "Label"
+msgstr "Etiketti"
 
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "Location:"
-msgstr "Sijainti:"
+#: ../data/ui/label-properties-dialog.ui.h:2
+#: ../data/ui/new-label-dialog.ui.h:15
+msgid "Vendor:"
+msgstr "Toimittaja:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:3
-msgid "Source"
-msgstr "Lähde"
+#: ../data/ui/label-properties-dialog.ui.h:3
+#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
+msgid "Part #:"
+msgstr "Osa #:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:4
-msgid "Select all"
-msgstr "Valitse kaikki"
+#: ../data/ui/label-properties-dialog.ui.h:4 ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/template-designer.ui.h:9
+msgid "Description:"
+msgstr "Kuvaus:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:5
-msgid "Unselect all"
-msgstr "Poista kaikki valinnat"
+#: ../data/ui/label-properties-dialog.ui.h:5
+msgid "Dimensions:"
+msgstr "Mitat:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:6
-msgid "Record selection/preview"
-msgstr ""
+#: ../data/ui/label-properties-dialog.ui.h:6
+#, fuzzy
+#| msgid "Page size:"
+msgid "Medium size:"
+msgstr "Sivun koko:"
+
+#: ../data/ui/label-properties-dialog.ui.h:7
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Layout:"
+msgstr "Asettelu:"
+
+#: ../data/ui/label-properties-dialog.ui.h:8
+msgid "Margins:"
+msgstr "Marginaalit:"
+
+#: ../data/ui/label-properties-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:13
+msgid "Similar products:"
+msgstr "Vastaavanlaisia tuotteita:"
+
+#: ../data/ui/label-properties-dialog.ui.h:10
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "Options"
+msgstr "Valinnat"
+
+#: ../data/ui/label-properties-dialog.ui.h:11
+msgid "Orientation:"
+msgstr "Suuntaus:"
+
+#: ../data/ui/label-properties-dialog.ui.h:12
+msgid "_Normal"
+msgstr "_Tavallinen"
+
+#: ../data/ui/label-properties-dialog.ui.h:13
+msgid "_Rotated"
+msgstr "_Käännetty"
 
 #: ../data/ui/media-select.ui.h:1
 msgid "Recent"
@@ -1807,6 +1907,34 @@ msgstr "Etsi kaikista"
 msgid "Custom"
 msgstr "Mukautettu"
 
+#: ../data/ui/merge-properties-dialog.ui.h:1
+msgid "Format:"
+msgstr "Muoto:"
+
+#: ../data/ui/merge-properties-dialog.ui.h:2
+msgid "Location:"
+msgstr "Sijainti:"
+
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Source"
+msgstr "Lähde"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
+msgid "Select all"
+msgstr "Valitse kaikki"
+
+#: ../data/ui/merge-properties-dialog.ui.h:5
+msgid "Unselect all"
+msgstr "Poista kaikki valinnat"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
+msgid "Record selection/preview"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid "Select Product"
+msgstr "Valitse tuote"
+
 #: ../data/ui/new-label-dialog.ui.h:2
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
@@ -1837,30 +1965,10 @@ msgstr "Poista kaikki valinnat"
 msgid "Please review and confirm your selection."
 msgstr "Esikatsele ja vahvista valintasi."
 
-#: ../data/ui/new-label-dialog.ui.h:9 ../data/ui/template-designer.ui.h:9
-msgid "Description:"
-msgstr "Kuvaus:"
-
 #: ../data/ui/new-label-dialog.ui.h:11
 msgid "Label size:"
 msgstr "Etiketin koko:"
 
-#: ../data/ui/new-label-dialog.ui.h:12
-msgid "Layout:"
-msgstr "Asettelu:"
-
-#: ../data/ui/new-label-dialog.ui.h:13
-msgid "Similar products:"
-msgstr "Vastaavanlaisia tuotteita:"
-
-#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
-msgid "Part #:"
-msgstr "Osa #:"
-
-#: ../data/ui/new-label-dialog.ui.h:15
-msgid "Vendor:"
-msgstr "Toimittaja:"
-
 #: ../data/ui/object-editor.ui.h:1
 msgid "dialog1"
 msgstr ""
@@ -2055,12 +2163,48 @@ msgstr "Valitse uusien objektien oletusominaisuudet."
 
 #: ../data/ui/prefs-dialog.ui.h:13
 msgid "Font:"
-msgstr "Kirjasin:"
+msgstr "Fontti:"
 
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "Object defaults"
 msgstr "Objektien oletukset"
 
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Sheets:"
+msgstr "Arkkeja:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "from:"
+msgstr "alkaen:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "to:"
+msgstr "päättyen:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies"
+msgstr "Kopiot"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+msgid "Start on label"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "on 1st sheet"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Copies:"
+msgstr "Kopioita:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "Collate"
+msgstr "Kokoa"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "Merge Control"
+msgstr "Yhdistämisen hallinta"
+
 #: ../data/ui/property-bar.ui.h:3
 msgid "Bold"
 msgstr "Lihavoitu"
@@ -2327,54 +2471,26 @@ msgstr ""
 "Muussa tapauksessa voit napsauttaa \"Peru\" hylätäksesi\n"
 "suunnitelman tai \"Takaisin\" muokataksesi suunnitelmaa."
 
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "Sheets:"
-msgstr "Arkkeja:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "from:"
-msgstr "alkaen:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-msgid "to:"
-msgstr "päättyen:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
-msgid "Copies"
-msgstr "Kopiot"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
-msgid "Start on label"
-msgstr ""
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
-msgid "on 1st sheet"
-msgstr ""
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
-msgid "Copies:"
-msgstr "Kopioita:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
-msgid "Collate"
-msgstr "Kokoa"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
-msgid "Merge Control"
-msgstr "Yhdistämisen hallinta"
+#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+msgid "gLabels"
+msgstr "gLabels"
 
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
-msgid "Options"
-msgstr "Valinnat"
+#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+msgid "Create labels, business cards and media covers"
+msgstr "Luo etikettejä, käyntikortteja ja kansia eri medioille"
 
-#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+#: ../data/appdata/glabels-3.appdata.xml.in.h:3
 msgid ""
 "gLabels is a program for creating labels and business cards. It is designed "
 "to work with various laser/ink-jet peel-off label and business card sheets "
 "that you'll find at most office supply stores."
 msgstr ""
+"gLabels on ohjelma käyntikorttien ja erilaisten tulostettavien etikettien "
+"luomista varten. Se on suunniteltu toimimaan useimpien yleisesti kaupoissa "
+"myytävien tulostuspaperien ja -tarvikkeiden kanssa."
 
-#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+#: ../data/appdata/glabels-3.appdata.xml.in.h:4
 msgid ""
 "gLabels can be used to design address labels, name tags, price tags, cd/dvd "
 "labels, or just about anything else that is organized in a regular pattern "
@@ -2383,6 +2499,12 @@ msgid ""
 "lets you print a unique label for each record from an external data source, "
 "such as a CSV file or an Evolution address book."
 msgstr ""
+"Suunnittele esimerkiksi osoite-, nimi- ja hintalappuja, CD-/DVD-kansia sekä "
+"melkein mitä tahansa tulostettavia lipukkeita. Etiketit (tai kortit) voivat "
+"sisältää tekstiä, kuvia, viivoja, muotoja ja viivakoodeja. gLabels sisältää "
+"myös yhdistämisominaisuuden, jonka avulla voi yksittäiselle tulosteelle "
+"asettaa yksilöllistä tietoa ulkoisista tietolähteistä, kuten CSV-tiedostosta "
+"tai Evolutionin osoitekirjasta."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
 msgid "Show/hide main toolbar."
@@ -2450,7 +2572,7 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:17
 msgid "Default font family."
-msgstr "Kirjasimen oletusperhe."
+msgstr "Fontin oletusperhe."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:18
 msgid "The default font family for new text objects."
@@ -2458,11 +2580,11 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:19
 msgid "Default font size."
-msgstr "Kirjasimen oletuskoko."
+msgstr "Fontin oletuskoko."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:20
 msgid "The default font size for new text objects."
-msgstr "Uusien tekstiobjektien kirjasimen oletuskoko."
+msgstr "Uusien tekstiobjektien fontin oletuskoko."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:21
 msgid "Default font weight."
@@ -2538,11 +2660,11 @@ msgstr "Viimeksi käytetyt mallit."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:39
 msgid "Recent fonts."
-msgstr "Viimeisimmät kirjasimet."
+msgstr "Viimeisimmät fontit."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:40
 msgid "Recently used font families."
-msgstr "Viimeksi käytetyt kirjasinperheet."
+msgstr "Viimeksi käytetyt fonttiperheet."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:41
 msgid "Recent colors."
@@ -2554,11 +2676,12 @@ msgstr "Viimeisimmät omavalintaiset värit."
 
 #: ../data/desktop/glabels-3.0.desktop.in.h:1
 msgid "gLabels Label Designer 3"
-msgstr ""
+msgstr "gLabels-etikettisuunnittelu 3"
 
-#: ../data/desktop/glabels-3.0.desktop.in.h:2
-msgid "Create labels, business cards and media covers"
-msgstr "Luo etikettejä, käyntikortteja ja kansia eri medioille"
+#: ../data/desktop/glabels-3.0.desktop.in.h:3
+msgid "label;card;print;office;barcode;"
+msgstr ""
+"label;card;print;office;barcode;viivakoodi;toimisto;tulostus;etiketti;tarra;"
 
 #: ../data/mime/glabels-3.0.xml.in.h:1
 msgid "gLabels Project File"
@@ -2728,46 +2851,54 @@ msgstr "SRA4"
 
 #: ../templates/categories.xml.h:1
 msgid "Any label"
-msgstr ""
+msgstr "Mikä tahansa etiketti"
 
 #. ====================================================================
 #. ===================================================================
-#: ../templates/categories.xml.h:2 ../templates/endisch-templates.xml.h:1
+#: ../templates/categories.xml.h:2 ../templates/begalabel-templates.xml.h:3
+#: ../templates/endisch-templates.xml.h:1
 #: ../templates/hama-iso-templates.xml.h:4
+#: ../templates/hisago-templates.xml.h:7 ../templates/online-templates.xml.h:66
 #: ../templates/pearl-iso-templates.xml.h:4
 #: ../templates/rayfilm-templates.xml.h:8
 #: ../templates/sheetlabels-us-templates.xml.h:16
 msgid "Round labels"
-msgstr ""
+msgstr "Pyöreät etiketit"
 
 #. ===================================================================
-#: ../templates/categories.xml.h:3 ../templates/endisch-templates.xml.h:2
+#: ../templates/categories.xml.h:3 ../templates/begalabel-templates.xml.h:4
+#: ../templates/endisch-templates.xml.h:2 ../templates/hisago-templates.xml.h:9
+#: ../templates/online-templates.xml.h:67
 #: ../templates/pearl-iso-templates.xml.h:58
 #: ../templates/rayfilm-templates.xml.h:9
 msgid "Elliptical labels"
-msgstr ""
+msgstr "Soikeat etiketit"
 
 #. ====================================================================
 #: ../templates/categories.xml.h:4 ../templates/endisch-templates.xml.h:4
 #: ../templates/hama-iso-templates.xml.h:41
+#: ../templates/hisago-templates.xml.h:8 ../templates/online-templates.xml.h:17
 #: ../templates/rayfilm-templates.xml.h:2
 msgid "Square labels"
-msgstr ""
+msgstr "Neliömäiset etiketi"
 
 #. ===================================================================
 #. ====================================================================
 #. ===================================================================
+#. OP920-R
 #. ********************************************************************
 #. ===================================================================
 #: ../templates/categories.xml.h:5 ../templates/ascom-iso-templates.xml.h:4
+#: ../templates/begalabel-templates.xml.h:2
 #: ../templates/endisch-templates.xml.h:3
 #: ../templates/hama-iso-templates.xml.h:27
 #: ../templates/herma-iso-templates.xml.h:20
-#: ../templates/igepa-templates.xml.h:1 ../templates/jac-iso-templates.xml.h:4
+#: ../templates/hisago-templates.xml.h:5 ../templates/igepa-templates.xml.h:1
+#: ../templates/jac-iso-templates.xml.h:4 ../templates/online-templates.xml.h:7
 #: ../templates/rayfilm-templates.xml.h:1
 #: ../templates/sheetlabels-us-templates.xml.h:2
 msgid "Rectangular labels"
-msgstr ""
+msgstr "Suorakulmiomaiset etiketit"
 
 #: ../templates/categories.xml.h:6
 msgid "Any card"
@@ -2784,20 +2915,30 @@ msgid "Business cards"
 msgstr "Käyntikortit"
 
 #: ../templates/categories.xml.h:8
+msgid "Name Badge"
+msgstr "Nimikyltti"
+
+#: ../templates/categories.xml.h:9
 msgid "CD/DVD or other media"
 msgstr "CD/DVD tai muu media"
 
-#: ../templates/categories.xml.h:9
+#: ../templates/categories.xml.h:10
 msgid "Mailing/shipping products"
 msgstr ""
 
-#: ../templates/categories.xml.h:10
+#: ../templates/categories.xml.h:11
 msgid "Foldable cards"
 msgstr ""
 
-#: ../templates/categories.xml.h:11
+#: ../templates/categories.xml.h:12
 msgid "Photo products"
-msgstr ""
+msgstr "Valokuvatuotteet"
+
+#: ../templates/categories.xml.h:13
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Filing labels"
+msgstr "Pullojen etiketit"
 
 #. TODO: Is this the real part #?
 #. ============================================================
@@ -2807,7 +2948,7 @@ msgstr ""
 #. TODO: What is the actual part #?
 #. ===================================================================
 #: ../templates/ascom-iso-templates.xml.h:2
-#: ../templates/avery-iso-templates.xml.h:34
+#: ../templates/avery-iso-templates.xml.h:36
 #: ../templates/databecker-iso-templates.xml.h:10
 #: ../templates/hama-iso-templates.xml.h:29
 #: ../templates/herma-iso-templates.xml.h:18
@@ -2828,8 +2969,8 @@ msgstr ""
 #. ===================================================================
 #. ===============================================================
 #: ../templates/ascom-iso-templates.xml.h:8
-#: ../templates/avery-iso-templates.xml.h:26
-#: ../templates/zweckform-iso-templates.xml.h:28
+#: ../templates/avery-iso-templates.xml.h:28
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "CD Inlet"
 msgstr ""
 
@@ -2870,9 +3011,9 @@ msgstr ""
 #. ********************************************************************
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:12
-#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/avery-iso-templates.xml.h:16
 #: ../templates/databecker-iso-templates.xml.h:6
-#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/dymo-other-templates.xml.h:14
 #: ../templates/geha-iso-templates.xml.h:25
 #: ../templates/maco-us-templates.xml.h:2
 #: ../templates/meritline-us-templates.xml.h:4
@@ -2881,12 +3022,12 @@ msgstr ""
 #: ../templates/worldlabel-us-templates.xml.h:3
 #: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Address Labels"
-msgstr ""
+msgstr "Osoite-etiketit"
 
 #. ===================================================================
 #. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:14
-#: ../templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:2
 #: ../templates/meritline-us-templates.xml.h:8
 #: ../templates/sheetlabels-us-templates.xml.h:8
 #: ../templates/worldlabel-us-templates.xml.h:2
@@ -2897,7 +3038,6 @@ msgstr ""
 #: ../templates/avery-us-templates.xml.h:16
 #: ../templates/maco-us-templates.xml.h:3
 #: ../templates/meritline-us-templates.xml.h:12
-#: ../templates/misc-us-templates.xml.h:23
 #: ../templates/sheetlabels-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
@@ -2905,7 +3045,7 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:18
-#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/avery-iso-templates.xml.h:22
 #: ../templates/meritline-us-templates.xml.h:14
 #: ../templates/sheetlabels-us-templates.xml.h:18
 #: ../templates/worldlabel-us-templates.xml.h:8
@@ -2930,14 +3070,14 @@ msgstr ""
 #. TODO: Is this the actual part #?
 #. ============================================================
 #: ../templates/avery-us-templates.xml.h:24
-#: ../templates/avery-iso-templates.xml.h:18
+#: ../templates/avery-iso-templates.xml.h:20
 #: ../templates/databecker-iso-templates.xml.h:2
 #: ../templates/dataline-iso-templates.xml.h:4
 #: ../templates/decadry-iso-templates.xml.h:6
-#: ../templates/misc-us-templates.xml.h:25
+#: ../templates/misc-us-templates.xml.h:23
 #: ../templates/misc-iso-templates.xml.h:4
 #: ../templates/rayfilm-templates.xml.h:15
-#: ../templates/zweckform-iso-templates.xml.h:30
+#: ../templates/zweckform-iso-templates.xml.h:28
 msgid "Business Cards"
 msgstr "Käyntikortit"
 
@@ -2963,12 +3103,13 @@ msgstr ""
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:32
 #: ../templates/avery-iso-templates.xml.h:6
+#: ../templates/begalabel-templates.xml.h:5
 #: ../templates/geha-iso-templates.xml.h:10
 #: ../templates/herma-iso-templates.xml.h:14
 #: ../templates/igepa-templates.xml.h:5 ../templates/jac-iso-templates.xml.h:2
 #: ../templates/mayspies-templates.xml.h:1
 #: ../templates/misc-us-templates.xml.h:8
-#: ../templates/misc-iso-templates.xml.h:22
+#: ../templates/misc-iso-templates.xml.h:24
 #: ../templates/misc-other-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:64
 #: ../templates/rayfilm-templates.xml.h:10
@@ -2976,7 +3117,7 @@ msgstr ""
 #: ../templates/worldlabel-us-templates.xml.h:12
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
-msgstr ""
+msgstr "CD/DVD-etiketit"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
@@ -2993,7 +3134,7 @@ msgstr ""
 #: ../templates/avery-us-templates.xml.h:38
 #: ../templates/geha-iso-templates.xml.h:17
 #: ../templates/meritline-us-templates.xml.h:16
-#: ../templates/sheetlabels-us-templates.xml.h:22
+#: ../templates/sheetlabels-us-templates.xml.h:24
 #: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Video Tape Face Labels"
 msgstr ""
@@ -3028,62 +3169,87 @@ msgid "Self-Adhesive Name Badges (Acetate Silk)"
 msgstr ""
 
 #. ===================================================================
+#. ====================================================================
+#. ===================================================================
+#. OL6075
 #: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/dataline-iso-templates.xml.h:2
+#: ../templates/hama-iso-templates.xml.h:35
+#: ../templates/misc-iso-templates.xml.h:34
+#: ../templates/online-templates.xml.h:83
+msgid "CD/DVD labels"
+msgstr "CD/DVD-etiketit"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "Allround labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:10
+#: ../templates/avery-iso-templates.xml.h:12
 #: ../templates/decadry-iso-templates.xml.h:2
+#: ../templates/misc-iso-templates.xml.h:14
+#: ../templates/online-templates.xml.h:21
 msgid "Mailing labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:6
 #: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/online-templates.xml.h:53
 msgid "Address labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-iso-templates.xml.h:18
+#: ../templates/hisago-templates.xml.h:6 ../templates/online-templates.xml.h:26
 msgid "Shipping labels"
 msgstr ""
 
 #. ===============================================================
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:22
+#: ../templates/avery-iso-templates.xml.h:24
 #: ../templates/decadry-iso-templates.xml.h:4
 #: ../templates/herma-iso-templates.xml.h:8
 #: ../templates/misc-us-templates.xml.h:21
 #: ../templates/misc-iso-templates.xml.h:6
-#: ../templates/sheetlabels-us-templates.xml.h:24
+#: ../templates/sheetlabels-us-templates.xml.h:28
 #: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Mailing Labels"
 msgstr ""
 
 #. ===============================================================
-#: ../templates/avery-iso-templates.xml.h:24
-#: ../templates/zweckform-iso-templates.xml.h:26
+#: ../templates/avery-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "CD Booklet"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:28
+#: ../templates/avery-iso-templates.xml.h:30
 msgid "Mini Address Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:30
+#: ../templates/avery-iso-templates.xml.h:32
 msgid "Identification Labels"
 msgstr ""
 
 #. ===================================================================
 #. ====================================================================
-#: ../templates/avery-iso-templates.xml.h:32
+#: ../templates/avery-iso-templates.xml.h:34
 #: ../templates/hama-iso-templates.xml.h:31
 msgid "Diskette labels"
 msgstr ""
 
+#: ../templates/begalabel-templates.xml.h:1
+msgid "Rounded rectangular labels"
+msgstr ""
+
+#: ../templates/begalabel-templates.xml.h:6
+msgid "Cassette Tape Face"
+msgstr ""
+
 #.
 #. *********************************************************************
 #. *********************************************************************
@@ -3163,40 +3329,30 @@ msgstr ""
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:8
 #: ../templates/desmat-templates.xml.h:2
-#: ../templates/misc-iso-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "CD Labels"
-msgstr ""
-
-#. ===================================================================
-#. ====================================================================
-#. ===================================================================
-#: ../templates/dataline-iso-templates.xml.h:2
-#: ../templates/hama-iso-templates.xml.h:35
-#: ../templates/misc-iso-templates.xml.h:32
-msgid "CD/DVD labels"
-msgstr ""
+msgstr "CD-etiketit"
 
 #. ===================================================================
 #: ../templates/dataline-iso-templates.xml.h:8
 #: ../templates/pearl-iso-templates.xml.h:60
 msgid "Membership cards"
-msgstr ""
+msgstr "Jäsenkortit"
 
 #. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:2
-#: ../templates/geha-iso-templates.xml.h:23
-msgid "Large Address Labels"
+#: ../templates/dymo-other-templates.xml.h:4
+msgid "Multipurpose Labels"
 msgstr ""
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:8
-msgid "Shipping Address Labels"
+msgid "File Folder"
 msgstr ""
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:10
-msgid "File Folder"
-msgstr ""
+msgid "Name Badges"
+msgstr "Nimilaput"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:12
@@ -3204,19 +3360,25 @@ msgid "Hanging Folder"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:14
-msgid "3.5in Diskette"
+#: ../templates/dymo-other-templates.xml.h:16
+#: ../templates/geha-iso-templates.xml.h:23
+msgid "Large Address Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:18
+msgid "Shipping Address Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/endisch-templates.xml.h:5
+#: ../templates/endisch-templates.xml.h:5 ../templates/hisago-templates.xml.h:3
 #: ../templates/pearl-iso-templates.xml.h:20
 #: ../templates/rayfilm-templates.xml.h:3
 msgid "Labels A6"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/endisch-templates.xml.h:6
+#: ../templates/endisch-templates.xml.h:6 ../templates/hisago-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:22
 #: ../templates/rayfilm-templates.xml.h:4
 msgid "Labels A5"
@@ -3224,8 +3386,8 @@ msgstr ""
 
 #. *******************************************************************
 #. ===================================================================
-#: ../templates/endisch-templates.xml.h:7 ../templates/igepa-templates.xml.h:3
-#: ../templates/jac-iso-templates.xml.h:6
+#: ../templates/endisch-templates.xml.h:7 ../templates/hisago-templates.xml.h:1
+#: ../templates/igepa-templates.xml.h:3 ../templates/jac-iso-templates.xml.h:6
 #: ../templates/pearl-iso-templates.xml.h:6
 #: ../templates/rayfilm-templates.xml.h:5
 msgid "Labels A4"
@@ -3296,7 +3458,7 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:29
-#: ../templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:30
 #: ../templates/misc-other-templates.xml.h:4
 msgid "Multi-Purpose Labels"
 msgstr ""
@@ -3357,7 +3519,7 @@ msgstr ""
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:43
 msgid "Mini Disc labels"
-msgstr ""
+msgstr "Mini Disc -etiketit"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:2
@@ -3371,7 +3533,7 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:10
-#: ../templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Allround Labels"
 msgstr ""
 
@@ -3386,10 +3548,10 @@ msgid "Diskette Labels (face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/igepa-templates.xml.h:2
+#: ../templates/igepa-templates.xml.h:2 ../templates/online-templates.xml.h:28
 #: ../templates/pearl-iso-templates.xml.h:18
 msgid "Floppy disk labels"
-msgstr ""
+msgstr "Diskettien etiketit"
 
 #. ===================================================================
 #: ../templates/igepa-templates.xml.h:4
@@ -3415,7 +3577,7 @@ msgstr ""
 #. ===================================================================
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:2
-#: ../templates/misc-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "CD/DVD Labels (face only)"
 msgstr ""
 
@@ -3460,23 +3622,23 @@ msgstr ""
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
-#: ../templates/misc-us-templates.xml.h:27
-#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/misc-us-templates.xml.h:25
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "PRO CD Labels 2-up (face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:29
+#: ../templates/misc-us-templates.xml.h:27
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:31
+#: ../templates/misc-us-templates.xml.h:29
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:33
+#: ../templates/misc-us-templates.xml.h:31
 msgid "Microtube labels"
 msgstr ""
 
@@ -3492,36 +3654,353 @@ msgid "Self-adhesive labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:14
+#: ../templates/misc-iso-templates.xml.h:16
 msgid "Fridge Magnet Stickers"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:18
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "EPSON Photo Stickers 16"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Universal Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:34
+#: ../templates/misc-iso-templates.xml.h:36
 #: ../templates/pearl-iso-templates.xml.h:16
+#: ../templates/sheetlabels-us-templates.xml.h:26
 msgid "Bottle labels"
 msgstr "Pullojen etiketit"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:38
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Etiketten"
 msgstr ""
 
+#: ../templates/online-templates.xml.h:1
+msgid "SD Card labels, library book labels, classification labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:2
+msgid "Jar labels, candle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:3
+msgid "Barcode labels"
+msgstr "Viivakoodietiketit"
+
+#: ../templates/online-templates.xml.h:4
+msgid "Classification labels, library book labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:5
+msgid "Water bottle labels"
+msgstr "Vesipullojen etiketit"
+
+#: ../templates/online-templates.xml.h:6
+msgid "Jar labels, pot labels, candle labels"
+msgstr ""
+
+#. OL120
+#: ../templates/online-templates.xml.h:9
+#, fuzzy
+#| msgid "SD card labels"
+msgid "Medical chart labels"
+msgstr "SD-korttien etiketit"
+
+#. OL8325
+#: ../templates/online-templates.xml.h:11
+msgid "Lip balm tube labels"
+msgstr ""
+
+#. OL2162
+#: ../templates/online-templates.xml.h:13
+msgid "Return address labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:14
+msgid "File labels, return address labels, medical chart labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:15
+msgid "Jar labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:16
+#, fuzzy
+#| msgid "SD card labels"
+msgid "Jar labels"
+msgstr "SD-korttien etiketit"
+
+#: ../templates/online-templates.xml.h:18
+msgid "Wine bottle labels, nutritional labels"
+msgstr ""
+
+#. OL1102
+#: ../templates/online-templates.xml.h:20
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Digital video labels"
+msgstr "Pullojen etiketit"
+
+#: ../templates/online-templates.xml.h:22
+msgid "Pot labels, coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:23
+msgid "Candy labels"
+msgstr "Makeisten etiketit"
+
+#: ../templates/online-templates.xml.h:24
+msgid "Reverse automobile window stickers"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:25
+msgid "Jar labels, candy labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:27
+msgid "Address labels, barcode labels, candy labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:29
+msgid "VHS face labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:30
+msgid "Jar labels, pot labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:31
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "File folder labels"
+msgstr "Pullojen etiketit"
+
+#: ../templates/online-templates.xml.h:32
+msgid "Metal tin container labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:33
+msgid "Bookplate labels, coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:34
+msgid "Amazon FBA shipping labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:35
+msgid "Jar labels, coffee and tea labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:36
+msgid "Jar labels, pot labels, coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:37
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Digital media labels"
+msgstr "Pullojen etiketit"
+
+#: ../templates/online-templates.xml.h:38
+msgid "Jar labels, Coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:39
+msgid "Wine bottle labels"
+msgstr "Viinipullojen etiketit"
+
+#: ../templates/online-templates.xml.h:40
+msgid "Mail Order Manager labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:41
+msgid "Liquor bottle labels"
+msgstr "Likööripullojen etiketit"
+
+#: ../templates/online-templates.xml.h:42
+msgid "Metal tin container labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:43
+msgid "Hershey's® chocolate labels"
+msgstr "Hershey's®-suklaaetiketit"
+
+#: ../templates/online-templates.xml.h:44
+msgid "VHS labels, jar labels, book labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:45
+msgid "USPS® shipping labels"
+msgstr "USPS®-lähetysetiketit"
+
+#: ../templates/online-templates.xml.h:46
+msgid "Jar labels, candle labels, metal tin container labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:47
+msgid "Jar labels, water bottle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:48
+msgid "Jar labels, water bottle labels, wine bottle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:49
+msgid "PayPal® label"
+msgstr "PayPal®-etiketti"
+
+#: ../templates/online-templates.xml.h:50
+msgid "Water bottle labels, jar labels, candle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:51
+msgid "Medical chart labels, barcode labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:52
+msgid "Pot labels, barcode labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:54
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Nutritional labels"
+msgstr "Pullojen etiketit"
+
+#: ../templates/online-templates.xml.h:55
+#, fuzzy
+#| msgid "SD card labels"
+msgid "CD case labels"
+msgstr "SD-korttien etiketit"
+
+#: ../templates/online-templates.xml.h:56
+#, fuzzy
+#| msgid "Business cards"
+msgid "Business card size labels"
+msgstr "Käyntikortit"
+
+#: ../templates/online-templates.xml.h:57
+msgid "Reverse addendum stickers"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:58
+msgid "Wine bottle labels, shipping labels, UPS® WorldShip® labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:59
+msgid "Coffee and tea labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:60
+msgid "Water bottle labels, shipping labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:61
+#, fuzzy
+#| msgid "SD card labels"
+msgid "VICS labels"
+msgstr "SD-korttien etiketit"
+
+#: ../templates/online-templates.xml.h:62
+msgid "Full sheet labels with back slit"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:63
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Full sheet labels"
+msgstr "Pullojen etiketit"
+
+#: ../templates/online-templates.xml.h:64
+#, fuzzy
+#| msgid "SD card labels"
+msgid "Lip balm labels"
+msgstr "SD-korttien etiketit"
+
+#: ../templates/online-templates.xml.h:65
+msgid "Paper hole reinforcement labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:68
+msgid "Candle labels, lip balm labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:69
+#, fuzzy
+#| msgid "SD card labels"
+msgid "Seal labels"
+msgstr "SD-korttien etiketit"
+
+#: ../templates/online-templates.xml.h:70
+msgid "Jar labels, candle labels, lip balm labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:71
+msgid "Jar labels, nutritional labels, pot labels, soap labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:72
+msgid ""
+"Jar labels, nutritional labels, soap labels, candle labels, coffee and tea "
+"labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:73
+msgid "Jar labels, candle labels, nutritional labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:74
+msgid "Nutritional labels, soap labels, coffee and tea labels, candle labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:75
+msgid "Beer bottle labels, jar labels, nutritional labels, soap labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:76
+msgid "Beer bottle label, jar label"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:77
+msgid "Target stickers"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:78
+msgid "Round and rectangular labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:79
+msgid "CD/DVD center hub labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:80
+#, fuzzy
+#| msgid "Business cards"
+msgid "Business card CD labels"
+msgstr "Käyntikortit"
+
+#: ../templates/online-templates.xml.h:81
+msgid "Mini CD labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:84
+msgid "Full face CD/DVD labels"
+msgstr ""
+
+#: ../templates/online-templates.xml.h:85
+msgid "eBay® shipping labels"
+msgstr "eBay®-lähetysetiketit"
+
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:8
 msgid "Self-adhesive film weatherproof"
@@ -3600,7 +4079,7 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:62
 msgid "Membership cards, both sides printable"
-msgstr ""
+msgstr "Jäsenkortit, molemmat puolet tulostettavissa"
 
 #: ../templates/rayfilm-templates.xml.h:11
 msgid "Business card CD Labels"
@@ -3619,31 +4098,33 @@ msgid "Trapezoid labels"
 msgstr ""
 
 #. ===================================================================
+#: ../templates/sheetlabels-us-templates.xml.h:22
+#, fuzzy
+#| msgid "Bottle labels"
+msgid "Oval bottle labels"
+msgstr "Pullojen etiketit"
+
+#. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:12
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr ""
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:14
-msgid "File Back Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Video Labels (back)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:22
+#: ../templates/zweckform-iso-templates.xml.h:20
 msgid "Rectangular Copier Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:24
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Correction and Cover-up Labels"
 msgstr ""



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]