[glabels/zint: 15/15] Update po files to allow me to push this branch.

From: Jim Evins <jimevins src gnome org>
To: commits-list gnome org
Cc:
Subject: [glabels/zint: 15/15] Update po files to allow me to push this branch.
Date: Sat, 10 Jul 2010 04:41:41 +0000 (UTC)
commit 61aa9b8dce8e6143eba39b368897a5f1a39a8e29
Author: Jim Evins <evins snaught com>
Date:   Sat Jul 10 00:39:15 2010 -0400

    Update po files to allow me to push this branch.

 po/ca.po        | 3447 +++++++++++++++++-----------
 po/cs.po        | 3721 +++++++++++++++++++------------
 po/da.po        |  617 ++++--
 po/de.po        |  322 +++-
 po/eo.po        | 4189 ++++++++++++++++++++++------------
 po/es.po        |  602 ++++--
 po/fr.po        |  617 ++++--
 po/it.po        | 4039 +++++++++++++++++++++------------
 po/ja.po        | 3723 +++++++++++++++++++------------
 po/ko.po        | 4469 +++++++++++++++++++++++--------------
 po/nb.po        | 1312 +++++++----
 po/pl.po        | 2268 ++++++++++++-------
 po/pt.po        | 1278 +++++++----
 po/pt_BR.po     |  614 ++++--
 po/ru.po        | 3366 +++++++++++++++++-----------
 po/sl.po        | 6704 +++++++++++++++++++++++++++++--------------------------
 po/sv.po        | 2284 ++++++++++++-------
 po/zh_CN.po     | 3462 +++++++++++++++++-----------
 po/zh_TW.po     | 3771 +++++++++++++++++++------------
 src/Makefile.am |   10 -
 20 files changed, 31354 insertions(+), 19461 deletions(-)
---
diff --git a/po/ca.po b/po/ca.po
index 5812736..1fbf4be 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-08 11:57+0100\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2009-02-08 22:00+0100\n"
 "Last-Translator: David Planella <david planella gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -16,189 +16,1341 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/glabels.c:75 ../src/glabels-batch.c:70
-msgid "[FILE...]"
-msgstr "[FITXER...]"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (qualsevol)"
+
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (nomÃ©s codi postal ZIP)"
+
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (codi postal ZIP+4)"
+
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
+
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (qualsevol)"
+
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
+
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
+
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
 
-#: ../src/glabels.c:91
-msgid "- gLabels label designer"
-msgstr "- dissenyador d'etiquetes gLabels"
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
+
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
+
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
+
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A o UPC-E)"
+
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
+
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
+
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
+
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
+
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
+
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
+
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
+
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
+
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Codi 39"
+
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Codi 128"
+
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Codi 128C"
+
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Codi 128B"
+
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "Interfoliat 2 de 5"
+
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
+
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
+
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Codi 39"
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Codi 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Codi 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Codi 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
 
-#: ../src/glabels-batch.c:54
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Codi 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Codi 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Codi 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Codi 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Enganxa"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Codi de barres"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Suprimeix"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+msgid "Default Color"
+msgstr "Color predeterminat"
+
+#: ../src/color-combo-menu.c:83
+msgid "Dark Red"
+msgstr "Vermell fosc"
+
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr "MarrÃ³"
+
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr "Vara d'or (goldenrod) fosc"
+
+#: ../src/color-combo-menu.c:86
+msgid "Dark Green"
+msgstr "Verd fosc"
+
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr "Cyan fosc"
+
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr "Blau ultramarÃ"
+
+#: ../src/color-combo-menu.c:89
+msgid "Dark Violet"
+msgstr "Violeta fosc"
+
+#: ../src/color-combo-menu.c:91
+msgid "Red"
+msgstr "Vermell"
+
+#: ../src/color-combo-menu.c:92
+msgid "Orange"
+msgstr "Taronja"
+
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr "Groc fosc"
+
+#: ../src/color-combo-menu.c:94
+msgid "Medium green"
+msgstr "Verd mitjÃ "
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr "Turquesa"
+
+#: ../src/color-combo-menu.c:96
+msgid "Blue"
+msgstr "Blau"
+
+#: ../src/color-combo-menu.c:97
+msgid "Purple"
+msgstr "Porpra"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr "SalmÃ³"
+
+#: ../src/color-combo-menu.c:100
+msgid "Gold"
+msgstr "Daurat"
+
+#: ../src/color-combo-menu.c:101
+msgid "Yellow"
+msgstr "Groc"
+
+#: ../src/color-combo-menu.c:102
+msgid "Green"
+msgstr "Verd"
+
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr "Cyan"
+
+#: ../src/color-combo-menu.c:104
+msgid "SkyBlue"
+msgstr "Blau cel"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr "Violeta"
+
+#: ../src/color-combo-menu.c:107
+msgid "Pink"
+msgstr "Rosa"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr "Caqui"
+
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
+msgstr "Groc clar"
+
+#: ../src/color-combo-menu.c:110
+msgid "Light Green"
+msgstr "Verd clar"
+
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
+msgstr "Cyan clar"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr "Gris de pissarra"
+
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
+msgstr "Calcida"
+
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr "Blanc"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr "10% Gris"
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr "25% Gris"
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr "40% Gris"
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr "50% Gris"
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr "60% Gris"
+
+#: ../src/color-combo-menu.c:126
+msgid "Black"
+msgstr "Negre"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+msgid "Custom Color"
+msgstr "Color personalitzat"
+
+#: ../src/color-combo-menu.c:319
+#, c-format
+msgid "Custom Color #%u"
+msgstr "Color personalitzat nÃºm. %u"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr "S'ha produÃ¯t un error fatal del gLabels"
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "Etiqueta o targeta nova"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+msgid "Label properties"
+msgstr "Propietats de l'etiqueta"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
+msgstr "Tots els fitxers"
+
+#: ../src/file.c:272 ../src/file.c:562
+msgid "gLabels documents"
+msgstr "Documents del gLabel"
+
+#: ../src/file.c:319 ../src/file.c:620
+msgid "Empty file name selection"
+msgstr "SelecciÃ³ d'un nom de fitxer buit"
+
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
+msgstr "Seleccioneu un fitxer o introduÃ¯u un nom de fitxer vÃ lid"
+
+#: ../src/file.c:335
+msgid "File does not exist"
+msgstr "El fitxer no existeix"
+
+#: ../src/file.c:410
+#, c-format
+msgid "Could not open file \"%s\""
+msgstr "No s'ha pogut obrir el fitxer Â«%sÂ»"
+
+#: ../src/file.c:413
+msgid "Not a supported file format"
+msgstr "No Ã©s un format de fitxer admÃ¨s"
+
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
+msgid "Could not save file \"%s\""
+msgstr "No s'ha pogut desar el fitxer Â«%sÂ»"
+
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
+msgstr "S'ha produÃ¯t un error en desar. El fitxer no s'ha desat encara."
+
+#: ../src/file.c:535
+#, c-format
+msgid "Save \"%s\" as"
+msgstr "Desa Â«%sÂ» com a"
+
+#: ../src/file.c:623
+msgid "Please supply a valid file name"
+msgstr "IntroduÃ¯u un nom de fitxer vÃ lid"
+
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
+msgstr "Voleu sobreescriure el fitxer Â«%sÂ»?"
+
+#: ../src/file.c:648
+msgid "File already exists."
+msgstr "El fitxer ja existeix."
+
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
+msgstr "Voleu desar els canvis al document Â«%sÂ» abans de tancar-lo?"
+
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
+msgstr "Es perdran els vostres canvis si no els deseu."
+
+#: ../src/file.c:751
+msgid "Close without saving"
+msgstr "Tanca sense desar"
+
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "Plantilles recents"
+
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "Tots els fitxers"
+
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
+
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr ""
 "estableix el nom del fitxer de sortida (valor predeterminat = Â«output.pdfÂ»)"
 
-#: ../src/glabels-batch.c:54 ../src/glabels-batch.c:68
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "nom de fitxer"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "nombre de fulls (valor predeterminat = 1"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "fulls"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "nombre de cÃ²pies (valor predeterminat = 1"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "cÃ²pies"
 
-#: ../src/glabels-batch.c:60
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "la primera etiqueta al primer full"
 
-#: ../src/glabels-batch.c:60
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "primer"
 
-#: ../src/glabels-batch.c:62 ../data/builder/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "imprimeix els contorns (per a comprovar l'alineaciÃ³ de la impressora)"
 
-#: ../src/glabels-batch.c:64 ../data/builder/print-custom-widget.glade.h:5
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "imprimeix invertit (Ã©s a dir, com una imatge reflectida en un mirall)"
 
-#: ../src/glabels-batch.c:66 ../data/builder/print-custom-widget.glade.h:4
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "imprimeix les marques de tall"
 
-#: ../src/glabels-batch.c:68
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "fitxer d'entrada per a fusionar"
 
-#: ../src/glabels-batch.c:96
-msgid "- batch process gLabels label files"
-msgstr "- processa en lot fitxers d'etiqueta del gLabels"
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[FITXER...]"
+
+#: ../src/glabels-batch.c:99
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: ../src/glabels-batch.c:142
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "no es realitzar la fusiÃ³ del document amb el fitxer %s del gLabels\n"
 
-#: ../src/glabels-batch.c:164
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "no es pot obrir el fitxer del gLabels %s\n"
 
-#: ../src/window.c:259
-msgid "(none) - gLabels"
-msgstr "(cap) - gLabels"
+#: ../src/glabels.c:81
+#, fuzzy
+msgid "Launch gLabels label and business card designer."
+msgstr "Un programa de creaciÃ³ d'etiquetes i de targetes de visita.\n"
 
-#: ../src/window.c:432
-msgid "(modified)"
-msgstr "(modificat)"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Crea un objecte de codi de barres"
 
-#: ../src/stock.c:72
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "Les dades del codi de barres estan buides"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "Propietats de l'objecte codi de barres"
+
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr "Les dades del codi de barres estan buides"
+
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "Les dades del codi de barres no sÃ³n vÃ lides"
+
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "Crea un objecte de text"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "Color de l'emplenat"
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "Color de la lÃnia"
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "Amplada de la lÃnia"
+
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "Sense tÃtol"
+
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Propietats de fusiÃ³"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "Porta al primer pla"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr "Porta al fons"
+
+#: ../src/label.c:1307
+#, fuzzy
+msgid "Rotate"
+msgstr "Girat"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Gira a l'esquerra"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Gira a la dreta"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "Capgira horitzontalment"
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "Capgira verticalment"
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "Alinea a l'esquerra"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "Alinea a la dreta"
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Alinea als centre horitzontals"
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Alinea a les vores superiors"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Alinea a les vores inferiors"
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Alinea als centre verticals"
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "Centra horitzontalment"
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "Centra verticalment"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "Enganxa"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Crea un objecte lÃnia"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Crea un objecte d'imatge"
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "Reinicialitza la mida de la imatge"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Crea un objecte lÃnia"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Mida de la pÃ gina:"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "Ombra"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "Ombra"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "Ombra"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "Ombra"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Crea un objecte de text"
+
+#: ../src/label-text.c:451
+msgid "Typing"
+msgstr ""
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "FamÃlia del tipus de lletra"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Mida del tipus de lletra"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Gira a la dreta"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Alinea a l'esquerra"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "Espaiat de lÃnia:"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+#, fuzzy
+msgid "Text color"
+msgstr "Color del text"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "Qualsevol"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "Qualsevol"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "Qualsevol"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "No s'ha trobat cap plantilla recent."
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
+"Proveu de seleccionar una plantilla de la pÃ gina Â«Cerca totes les plantillesÂ»"
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr "No hi ha cap coincidÃ¨ncia."
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr "Proveu de seleccionar una marca, mida de pÃ gina o categoria diferents."
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "No s'ha trobat cap plantilla recent."
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "Cap"
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr "No s'ha pogut crear la solÂ·licitud"
+
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+msgid "Couldn't open addressbook."
+msgstr "No s'ha pogut obrir la llibreta d'adreces"
+
+#: ../src/merge-evolution.c:348
+msgid "Couldn't list available fields."
+msgstr "No s'ha pogut mostrar la llista dels camps disponibles."
+
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr "No s'han pogut obtenir els contactes."
+
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
+
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Dades de la llibreta d'adreces predeterminada de l'Evolution"
+
+#: ../src/merge-init.c:125
+#, fuzzy
+msgid "VCards"
+msgstr "Targetes doblegades"
+
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Propietats de la fusiÃ³"
+
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Seleccioneu la font de la base de dades de la fusiÃ³"
+
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "No disponible"
+
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Seleccionat"
+
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Registre/camp"
+
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "Dades"
+
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+msgid "Fixed"
+msgstr "Fixe"
+
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Mode de selecciÃ³"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
+
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "Predeterminat"
+
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "Propietats de l'objecte"
+
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "Propietats de l'objecte quadre"
+
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "Propietats de l'objecte elÂ·lipse"
+
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "Propietats de l'objecte lÃnia"
+
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "Propietats de l'objecte imatge"
+
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "Propietats de l'objecte text"
+
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "Propietats de l'objecte codi de barres"
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Inseriu el camp de fusiÃ³"
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+msgid "No Fill"
+msgstr "Sense emplenament"
+
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
+msgstr "Tots els fitxers"
+
+#: ../src/object-editor-image-page.c:283
+msgid "All Images"
+msgstr "Totes les imatges"
+
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr "%s (*.%s)"
+
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+msgid "No Line"
+msgstr "Sense lÃnia"
+
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "PreferÃ¨ncies del gLabels"
+
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "Etiquetes"
+
+#: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr "Mode de _selecciÃ³"
 
-#: ../src/stock.c:73
+#: ../src/stock.c:71
 msgid "_Text"
 msgstr "_Text"
 
-#: ../src/stock.c:74
+#: ../src/stock.c:72
 msgid "_Line"
 msgstr "_LÃnia"
 
-#: ../src/stock.c:75
+#: ../src/stock.c:73
 msgid "_Box"
 msgstr "_Quadre"
 
-#: ../src/stock.c:76
+#: ../src/stock.c:74
 msgid "_Ellipse"
 msgstr "_ElÂ·lipse"
 
-#: ../src/stock.c:77
+#: ../src/stock.c:75
 msgid "_Image"
 msgstr "_Imatge"
 
-#: ../src/stock.c:78
+#: ../src/stock.c:76
 msgid "Bar_code"
 msgstr "_Codi de barres"
 
-#: ../src/stock.c:79
+#: ../src/stock.c:77
 msgid "_Merge Properties"
 msgstr "Propietats de la _fusiÃ³"
 
-#: ../src/stock.c:80
+#: ../src/stock.c:78
 msgid "Object _Properties"
 msgstr "_Propietats de l'objecte"
 
-#: ../src/stock.c:81
+#: ../src/stock.c:79
 msgid "Bring to _Front"
 msgstr "Porta al p_rimer pla"
 
-#: ../src/stock.c:82
+#: ../src/stock.c:80
 msgid "Send to _Back"
 msgstr "Envia al _fons"
 
-#: ../src/stock.c:83
+#: ../src/stock.c:81
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
-#: ../src/stock.c:84
+#: ../src/stock.c:82
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
-#: ../src/stock.c:85
+#: ../src/stock.c:83
 msgid "Flip _Horizontally"
 msgstr "Capgira _horitzontalment"
 
-#: ../src/stock.c:86
+#: ../src/stock.c:84
 msgid "Flip _Vertically"
 msgstr "Capgira _verticalment"
 
-#: ../src/stock.c:87
+#: ../src/stock.c:85
 msgid "_Lefts"
 msgstr "_Esquerres"
 
-#: ../src/stock.c:88
+#: ../src/stock.c:86
 msgid "_Rights"
 msgstr "_Dretes"
 
-#: ../src/stock.c:89
+#: ../src/stock.c:87
 msgid "_Centers"
 msgstr "_Centres"
 
-#: ../src/stock.c:90
+#: ../src/stock.c:88
 msgid "_Tops"
 msgstr "Parts _superiors"
 
-#: ../src/stock.c:91
+#: ../src/stock.c:89
 msgid "Bottoms"
 msgstr "Parts inferiors"
 
-#: ../src/stock.c:92
+#: ../src/stock.c:90
 msgid "Centers"
 msgstr "Centres"
 
-#: ../src/stock.c:93 ../src/stock.c:94
+#: ../src/stock.c:91 ../src/stock.c:92
 msgid "Label Ce_nter"
 msgstr "Ce_ntre de l'etiqueta"
 
-#: ../src/stock.c:95 ../data/builder/property-bar.glade.h:3
-msgid "Fill color"
-msgstr "Color de l'emplenat"
-
-#: ../src/stock.c:96 ../data/builder/property-bar.glade.h:8
-msgid "Line color"
-msgstr "Color de la lÃnia"
-
-#: ../src/stock.c:97 ../src/stock.c:99
+#: ../src/stock.c:95 ../src/stock.c:97
 msgid "Linked"
 msgstr "EnllaÃ§at"
 
-#: ../src/stock.c:98 ../src/stock.c:100
+#: ../src/stock.c:96 ../src/stock.c:98
 msgid "Not Linked"
 msgstr "Sense enllaÃ§ar"
 
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "Dissenyador de plantilles del gLabels"
+
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr "Us donem la benvinguda"
+
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "Nom i descripciÃ³"
+
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Mida de la pÃ gina"
+
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Forma de l'etiqueta o targeta"
+
+#: ../src/template-designer.c:661
+msgid "Label or Card Size"
+msgstr "Mida de l'etiqueta o targeta"
+
+#: ../src/template-designer.c:760
+msgid "Label Size (round)"
+msgstr "Mida de 'etiqueta (circular)"
+
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Mida de 'etiqueta (CD/DVD)"
+
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "Nombre de disposicions"
+
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "Disposicions"
+
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "S'ha completat el disseny"
+
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Dissenyador de plantilles del gLabels"
+
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
+msgstr ""
+"<span foreground='red' weight='bold'>La marca i el nÃºmero de model "
+"coincideixen amb un a plantilla existent</span>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -333,399 +1485,291 @@ msgstr "_Surt"
 msgid "Quit the program"
 msgstr "Surt del programa"
 
-#: ../src/ui.c:180
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr ""
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+#, fuzzy
+msgid "Redo"
+msgstr "Vermell"
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Retalla"
 
-#: ../src/ui.c:182
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Retalla la selecciÃ³"
 
-#: ../src/ui.c:187
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/ui.c:189
+#: ../src/ui.c:203
 msgid "Copy the selection"
 msgstr "Copia la selecciÃ³"
 
-#: ../src/ui.c:194
-msgid "Paste"
-msgstr "Enganxa"
-
-#: ../src/ui.c:196
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr "Enganxa el contingut del porta-retalls"
 
-#: ../src/ui.c:201
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: ../src/ui.c:203
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Suprimeix els objectes seleccionats"
 
-#: ../src/ui.c:208
+#: ../src/ui.c:222
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:224
 msgid "Select all objects"
 msgstr "Selecciona tots els objectes"
 
-#: ../src/ui.c:215
+#: ../src/ui.c:229
 msgid "Un-select All"
 msgstr "No seleccionis res"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "DesfÃ©s totes les seleccions"
 
-#: ../src/ui.c:222
+#: ../src/ui.c:236
 msgid "Preferences"
 msgstr "PreferÃ¨ncies"
 
-#: ../src/ui.c:224
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr "Configura l'aplicaciÃ³"
 
-#: ../src/ui.c:231
+#: ../src/ui.c:245
 msgid "Zoom in"
 msgstr "Amplia"
 
-#: ../src/ui.c:233
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "Incrementa l'ampliaciÃ³"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:252
 msgid "Zoom out"
 msgstr "Redueix"
 
-#: ../src/ui.c:240
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr "Redueix l'ampliaciÃ³"
 
-#: ../src/ui.c:245
+#: ../src/ui.c:259
 msgid "Zoom 1 to 1"
 msgstr "Amplia a 1:1"
 
-#: ../src/ui.c:247
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr "RefÃ©s l'escala a 100 %"
 
-#: ../src/ui.c:252
+#: ../src/ui.c:266
 msgid "Zoom to fit"
 msgstr "Millor ajust"
 
-#: ../src/ui.c:254
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr "Estableix l'escala per a encabir-ho a la finestra"
 
-#: ../src/ui.c:261
+#: ../src/ui.c:275
 msgid "Select Mode"
 msgstr "Mode de selecciÃ³"
 
-#: ../src/ui.c:263
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "Seleccioneu, moveu i modifiqueu objectes"
 
-#: ../src/ui.c:268 ../src/view-text.c:494
-#: ../data/builder/object-editor.glade.h:32
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Text"
 
-#: ../src/ui.c:270
-msgid "Create text object"
-msgstr "Crea un objecte de text"
-
-#: ../src/ui.c:275
+#: ../src/ui.c:289
 msgid "Box"
 msgstr "Quadre"
 
-#: ../src/ui.c:277
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr "Crea un objecte quadre/rectangle"
 
-#: ../src/ui.c:282 ../data/builder/object-editor.glade.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "LÃnia"
 
-#: ../src/ui.c:284
-msgid "Create line object"
-msgstr "Crea un objecte lÃnia"
-
-#: ../src/ui.c:289
+#: ../src/ui.c:303
 msgid "Ellipse"
 msgstr "ElÂ·lipse"
 
-#: ../src/ui.c:291
+#: ../src/ui.c:305
 msgid "Create ellipse/circle object"
 msgstr "Crea un objecte elÂ·lipse/cercle"
 
-#: ../src/ui.c:296 ../data/builder/object-editor.glade.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Imatge"
 
-#: ../src/ui.c:298
-msgid "Create image object"
-msgstr "Crea un objecte d'imatge"
-
-#: ../src/ui.c:303
+#: ../src/ui.c:317
 msgid "Barcode"
 msgstr "Codi de barres"
 
-#: ../src/ui.c:305
-msgid "Create barcode object"
-msgstr "Crea un objecte de codi de barres"
-
-#: ../src/ui.c:310
-msgid "Bring to front"
-msgstr "Porta al primer pla"
-
-#: ../src/ui.c:312
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr "AlÃ§a l'objecte fins al primer pla"
 
-#: ../src/ui.c:317
-msgid "Send to back"
-msgstr "Porta al fons"
-
-#: ../src/ui.c:319
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr "Baixa l'objecte fins al fons"
 
-#: ../src/ui.c:324
-msgid "Rotate left"
-msgstr "Gira a l'esquerra"
-
-#: ../src/ui.c:326
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr ""
 "Gira l'objecte 90 graus en el sentit contrari a les agulles del rellotge"
 
-#: ../src/ui.c:331
-msgid "Rotate right"
-msgstr "Gira a la dreta"
-
-#: ../src/ui.c:333
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr "Gira l'objecte 90 graus en el sentit de les agulles del rellotge"
 
-#: ../src/ui.c:338
-msgid "Flip horizontally"
-msgstr "Capgira horitzontalment"
-
-#: ../src/ui.c:340
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr "Capgira l'objecte horitzontalment"
 
-#: ../src/ui.c:345
-msgid "Flip vertically"
-msgstr "Capgira verticalment"
-
-#: ../src/ui.c:347
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr "Capgira l'objecte verticalment"
 
-#: ../src/ui.c:352
-msgid "Align left"
-msgstr "Alinea a l'esquerra"
-
-#: ../src/ui.c:354
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr "Alinea els objectes a les vores esquerres"
 
-#: ../src/ui.c:359
-msgid "Align right"
-msgstr "Alinea a la dreta"
-
-#: ../src/ui.c:361
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr "Alinea els objectes a les vores dretes"
 
-#: ../src/ui.c:366
-msgid "Align horizontal center"
-msgstr "Alinea als centre horitzontals"
-
-#: ../src/ui.c:368
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr "Alinea els objectes als centres horitzontals"
 
-#: ../src/ui.c:373
-msgid "Align tops"
-msgstr "Alinea a les vores superiors"
-
-#: ../src/ui.c:375
+#: ../src/ui.c:389
 msgid "Align objects to top edges"
 msgstr "Alinea els objectes a les vores superiors"
 
-#: ../src/ui.c:380
-msgid "Align bottoms"
-msgstr "Alinea a les vores inferiors"
-
-#: ../src/ui.c:382
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr "Alinea els objectes a les vores inferiors"
 
-#: ../src/ui.c:387
-msgid "Align vertical center"
-msgstr "Alinea als centre verticals"
-
-#: ../src/ui.c:389
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr "Alinea els objectes als centres verticals"
 
-#: ../src/ui.c:394
-msgid "Center horizontally"
-msgstr "Centra horitzontalment"
-
-#: ../src/ui.c:396
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr "Centra els objectes al centre horitzontal de l'etiqueta"
 
-#: ../src/ui.c:401
-msgid "Center vertically"
-msgstr "Centra verticalment"
-
-#: ../src/ui.c:403
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr "Centra els objectes al centre vertical de l'etiqueta"
 
-#: ../src/ui.c:408
-msgid "Merge properties"
-msgstr "Propietats de fusiÃ³"
-
-#: ../src/ui.c:410
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr "Edita les propietats de fusiÃ³"
 
-#: ../src/ui.c:417
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr "Contingut"
 
-#: ../src/ui.c:419
+#: ../src/ui.c:433
 msgid "Open glabels manual"
 msgstr "Obre el manual del gLabels"
 
-#: ../src/ui.c:424
+#: ../src/ui.c:438
 msgid "About..."
 msgstr "Quant a..."
 
-#: ../src/ui.c:426
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr "Quant al gLabels"
 
-#: ../src/ui.c:436
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr "Barra d'eines de les propietats"
 
-#: ../src/ui.c:438
+#: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr ""
 "Canvia la visibilitat de la barra d'eines de les propietats a la finestra "
 "actual"
 
-#: ../src/ui.c:444 ../src/ui.c:489 ../src/ui.c:497
-msgid "Show tooltips"
-msgstr "Mostra els indicadors de funciÃ³"
-
-#: ../src/ui.c:446
-msgid "Show tooltips for property toolbar"
-msgstr "Mostra els indicadors de funciÃ³ a la barra de les propietats"
-
-#: ../src/ui.c:452
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr "Graella"
 
-#: ../src/ui.c:454
+#: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
 msgstr "Canvia la visibilitat de la graella a la finestra actual"
 
-#: ../src/ui.c:460
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr "Marques"
 
-#: ../src/ui.c:462
+#: ../src/ui.c:468
 msgid "Change the visibility of markup lines in the current window"
 msgstr "Canvia la visibilitat de les lÃnies de marca a la finestra actual"
 
-#: ../src/ui.c:473
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr "Barra d'eines principal"
 
-#: ../src/ui.c:475
+#: ../src/ui.c:481
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 "Canvia la visibilitat de la barra d'eines principal a la finestra actual"
 
-#: ../src/ui.c:481
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr "Barra d'eines de dibuix"
 
-#: ../src/ui.c:483
+#: ../src/ui.c:489
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 "Canvia la visibilitat de la barra d'eines de dibuix a la finestra actual"
 
-#: ../src/ui.c:491
-msgid "Show tooltips for main toolbar"
-msgstr "Mostra els indicadors de funciÃ³ a la barra principal"
-
-#: ../src/ui.c:499
-msgid "Show tooltips for drawing toolbar"
-msgstr "Mostra els indicadors de funciÃ³ a la barra de dibuix"
-
-#: ../src/ui-property-bar.c:280 ../src/prefs-dialog.c:328
-#: ../src/object-editor-bc-page.c:93 ../src/object-editor-text-page.c:93
-#: ../src/object-editor-shadow-page.c:93
-msgid "Default"
-msgstr "Predeterminat"
-
-#: ../src/ui-property-bar.c:292 ../src/prefs-dialog.c:334
-#: ../src/object-editor-fill-page.c:79
-msgid "No Fill"
-msgstr "Sense emplenament"
-
-#: ../src/ui-property-bar.c:304 ../src/prefs-dialog.c:331
-#: ../src/object-editor-line-page.c:81
-msgid "No Line"
-msgstr "Sense lÃnia"
-
-#: ../src/ui-sidebar.c:152
-msgid "Object properties"
-msgstr "Propietats de l'objecte"
-
-#: ../src/ui-commands.c:1084
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "El gLabels inclou colÂ·laboracions de:"
 
-#: ../src/ui-commands.c:1090
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr "Consulteu el fitxer AUTHORS per a veure els crÃ¨dits addicionals"
 
-#: ../src/ui-commands.c:1091
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
 msgstr "o aneu a http://glabels.sourceforge.net/";
 
-#: ../src/ui-commands.c:1103
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr "Un programa de creaciÃ³ d'etiquetes i de targetes de visita.\n"
 
-#: ../src/ui-commands.c:1107
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr "David Planella <david planella gmail com>"
 
-#: ../src/ui-commands.c:1110
+#: ../src/ui-commands.c:1161
+#, fuzzy
 msgid ""
-"Glabels is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
-"the GNU General Public License for more details.\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 msgstr ""
 "El gLabels Ã©s programari lliure; podeu redistribuir-lo i/o modificar-lo \n"
 "sota els termes de la LlicÃ¨ncia PÃºblica General GNU tal i com ha estat \n"
@@ -738,720 +1782,90 @@ msgstr ""
 "General \n"
 "GNU per a obtenir-ne mÃ©s detalls.\n"
 
-#: ../src/ui-commands.c:1136
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "gLabels"
 
-#: ../src/file.c:91
-msgid "New Label or Card"
-msgstr "Etiqueta o targeta nova"
-
-#: ../src/file.c:191
-msgid "Label properties"
-msgstr "Propietats de l'etiqueta"
-
-#: ../src/file.c:292 ../src/file.c:578
-msgid "All files"
-msgstr "Tots els fitxers"
-
-#: ../src/file.c:297 ../src/file.c:583
-msgid "gLabels documents"
-msgstr "Documents del gLabel"
-
-#: ../src/file.c:343 ../src/file.c:640
-msgid "Empty file name selection"
-msgstr "SelecciÃ³ d'un nom de fitxer buit"
-
-#: ../src/file.c:346 ../src/file.c:362
-msgid "Please select a file or supply a valid file name"
-msgstr "Seleccioneu un fitxer o introduÃ¯u un nom de fitxer vÃ lid"
-
-#: ../src/file.c:359
-msgid "File does not exist"
-msgstr "El fitxer no existeix"
-
-#: ../src/file.c:433
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "No s'ha pogut obrir el fitxer Â«%sÂ»"
-
-#: ../src/file.c:436
-msgid "Not a supported file format"
-msgstr "No Ã©s un format de fitxer admÃ¨s"
-
-#: ../src/file.c:513 ../src/file.c:690
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "No s'ha pogut desar el fitxer Â«%sÂ»"
-
-#: ../src/file.c:517 ../src/file.c:694
-msgid "Error encountered during save.  The file is still not saved."
-msgstr "S'ha produÃ¯t un error en desar. El fitxer no s'ha desat encara."
-
-#: ../src/file.c:556
-#, c-format
-msgid "Save \"%s\" as"
-msgstr "Desa Â«%sÂ» com a"
-
-#: ../src/file.c:643
-msgid "Please supply a valid file name"
-msgstr "IntroduÃ¯u un nom de fitxer vÃ lid"
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "S'ha produÃ¯t un error del gLabels"
 
-#: ../src/file.c:664
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "Voleu sobreescriure el fitxer Â«%sÂ»?"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(cap) - gLabels"
 
-#: ../src/file.c:668
-msgid "File already exists."
-msgstr "El fitxer ja existeix."
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(modificat)"
 
-#: ../src/file.c:764
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "Voleu desar els canvis al document Â«%sÂ» abans de tancar-lo?"
-
-#: ../src/file.c:768
-msgid "Your changes will be lost if you don't save them."
-msgstr "Es perdran els vostres canvis si no els deseu."
-
-#: ../src/file.c:771
-msgid "Close without saving"
-msgstr "Tanca sense desar"
-
-#. Should not happen
-#: ../src/prefs.c:159 ../src/prefs.c:166
-#: ../data/builder/object-editor.glade.h:43
-#: ../data/builder/prefs-dialog.glade.h:22
-msgid "points"
-msgstr "punts"
-
-#: ../src/prefs.c:161 ../data/builder/object-editor.glade.h:42
-#: ../data/builder/template-designer.glade.h:64
-msgid "inches"
-msgstr "polzades"
-
-#: ../src/prefs.c:163
-msgid "mm"
-msgstr "mm"
-
-#: ../src/prefs-dialog.c:167 ../data/builder/prefs-dialog.glade.h:21
-msgid "gLabels Preferences"
-msgstr "PreferÃ¨ncies del gLabels"
-
-#. Build editor.
-#: ../src/view-box.c:175
-msgid "Box object properties"
-msgstr "Propietats de l'objecte quadre"
-
-#. Build editor.
-#: ../src/view-ellipse.c:175
-msgid "Ellipse object properties"
-msgstr "Propietats de l'objecte elÂ·lipse"
-
-#. Build editor.
-#: ../src/view-line.c:174
-msgid "Line object properties"
-msgstr "Propietats de l'objecte lÃnia"
-
-#. Build editor.
-#: ../src/view-image.c:174
-msgid "Image object properties"
-msgstr "Propietats de l'objecte imatge"
-
-#. Build editor.
-#: ../src/view-text.c:178
-msgid "Text object properties"
-msgstr "Propietats de l'objecte text"
-
-#. Build editor.
-#: ../src/view-barcode.c:174
-msgid "Barcode object properties"
-msgstr "Propietats de l'objecte codi de barres"
-
-#: ../src/object-editor-image-page.c:267
-msgid "All Files"
-msgstr "Tots els fitxers"
-
-#: ../src/object-editor-image-page.c:272
-msgid "All Images"
-msgstr "Totes les imatges"
+msgid "Bad root node = \"%s\""
+msgstr "Node arrel incorrecte = Â«%sÂ»"
 
-#: ../src/object-editor-image-page.c:287
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/merge-properties-dialog.c:271
-msgid "Merge Properties"
-msgstr "Propietats de la fusiÃ³"
-
-#: ../src/merge-properties-dialog.c:297 ../src/merge-properties-dialog.c:405
-msgid "Select merge-database source"
-msgstr "Seleccioneu la font de la base de dades de la fusiÃ³"
-
-#: ../src/merge-properties-dialog.c:306 ../src/merge-properties-dialog.c:425
-msgid "N/A"
-msgstr "No disponible"
-
-#: ../src/merge-properties-dialog.c:332
-msgid "Select"
-msgstr "Seleccionat"
-
-#: ../src/merge-properties-dialog.c:340
-msgid "Record/Field"
-msgstr "Registre/camp"
-
-#: ../src/merge-properties-dialog.c:348
-#: ../data/builder/object-editor.glade.h:10
-msgid "Data"
-msgstr "Dades"
-
-#: ../src/merge-properties-dialog.c:418
-msgid "Fixed"
-msgstr "Fixe"
-
-#. ===================================================================
-#: ../src/print-op.c:242 ../src/wdgt-print-copies.c:171
-#: ../data/templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "Etiquetes"
-
-#: ../src/template-designer.c:411
-msgid "gLabels Template Designer"
-msgstr "Dissenyador de plantilles del gLabels"
-
-#: ../src/template-designer.c:481
-msgid "Welcome"
-msgstr "Us donem la benvinguda"
-
-#: ../src/template-designer.c:534
-msgid "Name and Description"
-msgstr "Nom i descripciÃ³"
-
-#: ../src/template-designer.c:595
-msgid "Page Size"
-msgstr "Mida de la pÃ gina"
-
-#: ../src/template-designer.c:675
-msgid "Label or Card Shape"
-msgstr "Forma de l'etiqueta o targeta"
-
-#: ../src/template-designer.c:735
-msgid "Label or Card Size"
-msgstr "Mida de l'etiqueta o targeta"
-
-#: ../src/template-designer.c:844
-msgid "Label Size (round)"
-msgstr "Mida de 'etiqueta (circular)"
-
-#: ../src/template-designer.c:935
-msgid "Label Size (CD/DVD)"
-msgstr "Mida de 'etiqueta (CD/DVD)"
-
-#: ../src/template-designer.c:1036
-msgid "Number of Layouts"
-msgstr "Nombre de disposicions"
-
-#: ../src/template-designer.c:1110
-msgid "Layout(s)"
-msgstr "Disposicions"
-
-#: ../src/template-designer.c:1229
-msgid "Design Completed"
-msgstr "S'ha completat el disseny"
-
-#: ../src/template-designer.c:1396
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
-msgstr ""
-"<span foreground='red' weight='bold'>La marca i el nÃºmero de model "
-"coincideixen amb un a plantilla existent</span>"
-
-#: ../src/bc.c:67
-msgid "POSTNET (any)"
-msgstr "POSTNET (qualsevol)"
-
-#: ../src/bc.c:70
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (nomÃ©s codi postal ZIP)"
-
-#: ../src/bc.c:73
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (codi postal ZIP+4)"
-
-#: ../src/bc.c:76
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
-
-#: ../src/bc.c:79
-msgid "CEPNET"
-msgstr "CEPNET"
-
-#: ../src/bc.c:82
-msgid "EAN (any)"
-msgstr "EAN (qualsevol)"
-
-#: ../src/bc.c:85
-msgid "EAN-8"
-msgstr "EAN-8"
-
-#: ../src/bc.c:88
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
-
-#: ../src/bc.c:91
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
-
-#: ../src/bc.c:94
-msgid "EAN-13"
-msgstr "EAN-13"
-
-#: ../src/bc.c:97
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
-
-#: ../src/bc.c:100
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
-
-#: ../src/bc.c:103
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A o UPC-E)"
-
-#: ../src/bc.c:106
-msgid "UPC-A"
-msgstr "UPC-A"
-
-#: ../src/bc.c:109
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
-
-#: ../src/bc.c:112
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
-
-#: ../src/bc.c:115
-msgid "UPC-E"
-msgstr "UPC-E"
-
-#: ../src/bc.c:118
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
-
-#: ../src/bc.c:121
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
-
-#: ../src/bc.c:124
-msgid "ISBN"
-msgstr "ISBN"
-
-#: ../src/bc.c:127
-msgid "ISBN +5"
-msgstr "ISBN +5"
-
-#: ../src/bc.c:130
-msgid "Code 39"
-msgstr "Codi 39"
-
-#: ../src/bc.c:133
-msgid "Code 128"
-msgstr "Codi 128"
-
-#: ../src/bc.c:136
-msgid "Code 128C"
-msgstr "Codi 128C"
-
-#: ../src/bc.c:139
-msgid "Code 128B"
-msgstr "Codi 128B"
-
-#: ../src/bc.c:142
-msgid "Interleaved 2 of 5"
-msgstr "Interfoliat 2 de 5"
-
-#: ../src/bc.c:145
-msgid "Codabar"
-msgstr "Codabar"
-
-#: ../src/bc.c:148
-msgid "MSI"
-msgstr "MSI"
-
-#: ../src/bc.c:151
-msgid "Plessey"
-msgstr "Plessey"
-
-#: ../src/bc.c:154
-msgid "IEC16022 (DataMatrix)"
-msgstr "IEC16022 (DataMatrix)"
-
-#: ../src/label.c:531
-msgid "Untitled"
-msgstr "Sense tÃtol"
-
-#: ../src/label-barcode.c:426
-msgid "Barcode data empty"
-msgstr "Les dades del codi de barres estan buides"
-
-#: ../src/label-barcode.c:430
-msgid "Invalid barcode data"
-msgstr "Les dades del codi de barres no sÃ³n vÃ lides"
+msgid "bad node =  \"%s\""
+msgstr "node incorrecte = Â«%sÂ»"
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:226
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "Error de la funciÃ³ xmlParseFile"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "No hi ha cap arrel del document"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "S'estÃ  important del format del gLabels 0.1"
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "S'estÃ  important del format del gLabels 0.4"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "Espai de noms del gLabels desconegut -- s'utilitzarÃ  el %s"
 
-#: ../src/xml-label.c:319 ../src/xml-label-04.c:79
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Node arrel incorrecte = Â«%sÂ»"
-
-#: ../src/xml-label.c:356
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "node incorrecte en el node Document = Â«%sÂ»"
 
-#: ../src/xml-label.c:401 ../src/xml-label-04.c:127
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "node incorrecte = Â«%sÂ»"
-
-#: ../src/xml-label.c:840
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "node incorrecte en el node Data (dades) = Â«%sÂ»"
 
-#: ../src/xml-label.c:1077 ../libglabels/xml-template.c:670
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Es desconeix l'identificador de mida de pÃ gina o nom Â«%sÂ»"
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Error de conversiÃ³ a l'UTF-8"
 
-#: ../src/xml-label.c:1084
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "S'ha produÃ¯t un problema en desar el fitxer"
 
-#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378
-msgid "None"
-msgstr "Cap"
-
-#: ../src/merge-init.c:59
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Fitxer de text amb comes delimitadores (CSV)"
-
-#: ../src/merge-init.c:66
-msgid "Text file with colon delimeters"
-msgstr "Fitxer de text amb dos punts delimitadors"
-
-#: ../src/merge-init.c:73
-msgid "Text file with tab delimeters"
-msgstr "Fitxer de text amb tabulacions delimitadores"
-
-#: ../src/merge-init.c:82
-msgid "Data from default Evolution Addressbook"
-msgstr "Dades de la llibreta d'adreces predeterminada de l'Evolution"
-
-#: ../src/merge-init.c:88
-msgid "Data from a file containing VCards"
-msgstr "Dades d'un fitxer que contÃ© VCards"
-
-#: ../src/merge-evolution.c:309
-msgid "Couldn't construct query"
-msgstr "No s'ha pogut crear la solÂ·licitud"
-
-#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326
-msgid "Couldn't open addressbook."
-msgstr "No s'ha pogut obrir la llibreta d'adreces"
-
-#: ../src/merge-evolution.c:341
-msgid "Couldn't list available fields."
-msgstr "No s'ha pogut mostrar la llista dels camps disponibles."
-
-#: ../src/merge-evolution.c:377
-msgid "Couldn't get contacts."
-msgstr "No s'han pogut obtenir els contactes."
-
-#: ../src/color-combo.c:210
-msgid "Default Color"
-msgstr "Color predeterminat"
-
-#: ../src/color-combo-menu.c:86
-msgid "Dark Red"
-msgstr "Vermell fosc"
-
-#: ../src/color-combo-menu.c:87
-msgid "Brown"
-msgstr "MarrÃ³"
-
-#: ../src/color-combo-menu.c:88
-msgid "Dark Goldenrod"
-msgstr "Vara d'or (goldenrod) fosc"
-
-#: ../src/color-combo-menu.c:89
-msgid "Dark Green"
-msgstr "Verd fosc"
-
-#: ../src/color-combo-menu.c:90
-msgid "Dark Cyan"
-msgstr "Cyan fosc"
-
-#: ../src/color-combo-menu.c:91
-msgid "Navy Blue"
-msgstr "Blau ultramarÃ"
-
-#: ../src/color-combo-menu.c:92
-msgid "Dark Violet"
-msgstr "Violeta fosc"
-
-#: ../src/color-combo-menu.c:94
-msgid "Red"
-msgstr "Vermell"
-
-#: ../src/color-combo-menu.c:95
-msgid "Orange"
-msgstr "Taronja"
-
-#: ../src/color-combo-menu.c:96
-msgid "Dark Yellow"
-msgstr "Groc fosc"
-
-#: ../src/color-combo-menu.c:97
-msgid "Medium green"
-msgstr "Verd mitjÃ "
-
-#: ../src/color-combo-menu.c:98
-msgid "Turquoise"
-msgstr "Turquesa"
-
-#: ../src/color-combo-menu.c:99
-msgid "Blue"
-msgstr "Blau"
-
-#: ../src/color-combo-menu.c:100
-msgid "Purple"
-msgstr "Porpra"
-
-#: ../src/color-combo-menu.c:102
-msgid "Salmon"
-msgstr "SalmÃ³"
-
-#: ../src/color-combo-menu.c:103
-msgid "Gold"
-msgstr "Daurat"
-
-#: ../src/color-combo-menu.c:104
-msgid "Yellow"
-msgstr "Groc"
-
-#: ../src/color-combo-menu.c:105
-msgid "Green"
-msgstr "Verd"
-
-#: ../src/color-combo-menu.c:106
-msgid "Cyan"
-msgstr "Cyan"
-
-#: ../src/color-combo-menu.c:107
-msgid "SkyBlue"
-msgstr "Blau cel"
-
-#: ../src/color-combo-menu.c:108
-msgid "Violet"
-msgstr "Violeta"
-
-#: ../src/color-combo-menu.c:110
-msgid "Pink"
-msgstr "Rosa"
-
-#: ../src/color-combo-menu.c:111
-msgid "Khaki"
-msgstr "Caqui"
-
-#: ../src/color-combo-menu.c:112
-msgid "Light Yellow"
-msgstr "Groc clar"
-
-#: ../src/color-combo-menu.c:113
-msgid "Light Green"
-msgstr "Verd clar"
-
-#: ../src/color-combo-menu.c:114
-msgid "Light Cyan"
-msgstr "Cyan clar"
-
-#: ../src/color-combo-menu.c:115
-msgid "Slate Gray"
-msgstr "Gris de pissarra"
-
-#: ../src/color-combo-menu.c:116
-msgid "Thistle"
-msgstr "Calcida"
-
-#: ../src/color-combo-menu.c:118
-msgid "White"
-msgstr "Blanc"
-
-#: ../src/color-combo-menu.c:119
-#, c-format
-msgid "10% Gray"
-msgstr "10% Gris"
-
-#: ../src/color-combo-menu.c:120
-#, c-format
-msgid "25% Gray"
-msgstr "25% Gris"
-
-#: ../src/color-combo-menu.c:121
-#, c-format
-msgid "40% Gray"
-msgstr "40% Gris"
-
-#: ../src/color-combo-menu.c:122
-#, c-format
-msgid "50% Gray"
-msgstr "50% Gris"
-
-#: ../src/color-combo-menu.c:123
-#, c-format
-msgid "60% Gray"
-msgstr "60% Gris"
-
-#: ../src/color-combo-menu.c:124
-msgid "Black"
-msgstr "Negre"
-
-#: ../src/color-combo-menu.c:252 ../src/color-combo-menu.c:369
-msgid "Custom Color"
-msgstr "Color personalitzat"
-
-#: ../src/color-combo-menu.c:317
-#, c-format
-msgid "Custom Color #%u"
-msgstr "Color personalitzat nÃºm. %u"
-
-#: ../src/wdgt-print-copies.c:153
-msgid "Sheets:"
-msgstr "Fulls:"
-
-#: ../src/wdgt-print-copies.c:173
-msgid "from:"
-msgstr "de:"
-
-#: ../src/wdgt-print-copies.c:179
-msgid "to:"
-msgstr "a:"
-
-#: ../src/wdgt-print-merge.c:154
-msgid "Start on label"
-msgstr "ComenÃ§a a l'etiqueta"
-
-#: ../src/wdgt-print-merge.c:162
-msgid "on 1st sheet"
-msgstr "al primer full"
-
-#: ../src/wdgt-print-merge.c:171
-msgid "Copies:"
-msgstr "CÃ²pies"
-
-#: ../src/wdgt-print-merge.c:177
-msgid "Collate"
-msgstr "Compagina"
-
-#: ../src/wdgt-media-select.c:290 ../src/wdgt-media-select.c:294
-#: ../src/wdgt-media-select.c:299 ../src/wdgt-media-select.c:308
-#: ../src/wdgt-media-select.c:311 ../src/wdgt-media-select.c:404
-#: ../src/wdgt-media-select.c:611 ../src/wdgt-media-select.c:620
-msgid "Any"
-msgstr "Qualsevol"
-
-#: ../src/wdgt-media-select.c:645
-#, c-format
-msgid "%d per sheet"
-msgstr "%d per full"
-
-#: ../src/wdgt-media-select.c:675
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-#: ../src/wdgt-media-select.c:680
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-#: ../src/wdgt-media-select.c:691 ../src/wdgt-media-select.c:705
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s de diÃ metre"
-
-#: ../src/wdgt-media-select.c:695 ../src/wdgt-media-select.c:709
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s de diÃ metre"
-
-#: ../src/wdgt-media-select.c:783
-msgid "No recent templates found."
-msgstr "No s'ha trobat cap plantilla recent."
-
-#: ../src/wdgt-media-select.c:784
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr ""
-"Proveu de seleccionar una plantilla de la pÃ gina Â«Cerca totes les plantillesÂ»"
-
-#: ../src/wdgt-media-select.c:863
-msgid "No match."
-msgstr "No hi ha cap coincidÃ¨ncia."
-
-#: ../src/wdgt-media-select.c:864
-msgid "Try selecting a different brand, page size or category."
-msgstr "Proveu de seleccionar una marca, mida de pÃ gina o categoria diferents."
-
-#: ../src/wdgt-rotate-label.c:129
-msgid "Normal"
-msgstr "Normal"
-
-#: ../src/wdgt-rotate-label.c:130
-msgid "Rotated"
-msgstr "Girat"
-
-#: ../src/critical-error-handler.c:73
-msgid "gLabels Fatal Error!"
-msgstr "S'ha produÃ¯t un error fatal del gLabels"
-
-#: ../src/warning-handler.c:73
-msgid "gLabels Error!"
-msgstr "S'ha produÃ¯t un error del gLabels"
-
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:118
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "Una altra"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:131
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "Definit per l'usuari"
 
-#: ../libglabels/db.c:482
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1459,7 +1873,7 @@ msgstr ""
 "No s'han trobat les definicions de les mides de paper. Pot ser que la "
 "libglables no s'hagi instalÂ·lat correctametn"
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1467,7 +1881,7 @@ msgstr ""
 "No s'han trobat les definicions de les categories. Pot ser que la libglables "
 "no s'hagi instalÂ·lat correctametn"
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1475,12 +1889,69 @@ msgstr ""
 "No s'ha trobat cap plantilla. Pot ser que la libglables no s'hagi instalÂ·lat "
 "correctametn"
 
-#: ../libglabels/db.c:1538
-#, c-format
-msgid "Generic %s full page template"
+#: ../libglabels/db.c:2164
+#, fuzzy, c-format
+msgid "%s full page label"
 msgstr "Plantilla de pÃ gina completa %s genÃ¨rica"
 
-#: ../libglabels/xml-template.c:227
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d per full"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr "%d per full"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s de diÃ metre"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "punts"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "polzades"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
+
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr "Manca el nom o bÃ© els atributs de marca/model"
 
@@ -1497,393 +1968,407 @@ msgstr ""
 msgid "Unknown page size id or name \"%s\""
 msgstr "Es desconeix l'identificador de mida de pÃ gina o nom Â«%sÂ»"
 
-#: ../libglabels/xml-template.c:615
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
+
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 "Manca l'atribut requerit Â«brandÂ» (marca) o Â«partÂ» (model), s'intentarÃ  amb el "
 "nom desaconsellat."
 
-#: ../libglabels/xml-template.c:625
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr "TambÃ© manca l'atribut del nom."
 
-#: ../data/builder/merge-properties-dialog.glade.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>SelecciÃ³ de registres/previsualitzaciÃ³</b>"
-
-#: ../data/builder/merge-properties-dialog.glade.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Font</b>"
-
-#: ../data/builder/merge-properties-dialog.glade.h:3
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "UbicaciÃ³:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>SelecciÃ³ de registres/previsualitzaciÃ³</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../data/builder/merge-properties-dialog.glade.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Font</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "No seleccionis res"
 
-#: ../data/builder/merge-properties-dialog.glade.h:7
-#: ../data/builder/object-editor.glade.h:39
-msgid "dialog1"
-msgstr "dialog1"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr "Marca:"
 
-#: ../data/builder/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>OrientaciÃ³ de l'etiqueta</b>"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Categoria:"
 
-#: ../data/builder/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>Tipus de suport</b>"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "Retalla"
 
-#: ../data/builder/object-editor.glade.h:2
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "Mida de la pÃ gina:"
 
-#: ../data/builder/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Selecciona-ho tot"
 
-#: ../data/builder/object-editor.glade.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Propietats de l'objecte Xxx</span>"
 
-#: ../data/builder/object-editor.glade.h:5
-#: ../data/builder/prefs-dialog.glade.h:7
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "DescripciÃ³:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+#, fuzzy
+msgid "Label size:"
+msgstr "Mida de la pÃ gina:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+#, fuzzy
+msgid "Layout:"
+msgstr "Disposicions"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+msgid "Normal"
+msgstr "Normal"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "NÃºm. de model:"
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+msgid "Rotated"
+msgstr "Girat"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "AlineaciÃ³:"
 
-#: ../data/builder/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "Permet que la fusiÃ³ encongeixi el text automÃ ticament"
 
-#: ../data/builder/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Angle:"
 
-#: ../data/builder/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Suma de verificaciÃ³"
 
-#: ../data/builder/object-editor.glade.h:9
-#: ../data/builder/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Color:"
 
-#: ../data/builder/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Habilita l'ombra"
 
-#: ../data/builder/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "FamÃlia:"
 
-#: ../data/builder/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Fitxer:"
 
-#: ../data/builder/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Emplenat"
 
-#: ../data/builder/object-editor.glade.h:15
-#: ../data/builder/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "AlÃ§ada:"
 
-#: ../data/builder/object-editor.glade.h:17
-msgid "Insert merge field"
-msgstr "Inseriu el camp de fusiÃ³"
-
-#: ../data/builder/object-editor.glade.h:18
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "Clau:"
 
-#: ../data/builder/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Llargada:"
 
-#: ../data/builder/object-editor.glade.h:21
-#: ../data/builder/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "Espaiat de lÃnia:"
 
-#: ../data/builder/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Literal:"
 
-#: ../data/builder/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "Opacitat:"
 
-#: ../data/builder/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "PosiciÃ³"
 
-#: ../data/builder/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Reinicialitza la mida de la imatge"
 
-#: ../data/builder/object-editor.glade.h:26
-msgid "Select A File"
-msgstr "Seleccioneu un fitxer"
-
-#: ../data/builder/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Ombra"
 
-#: ../data/builder/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Mida"
 
-#: ../data/builder/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Mida:"
 
-#: ../data/builder/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Estil"
 
-#: ../data/builder/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Estil:"
 
-#: ../data/builder/object-editor.glade.h:33
-#: ../data/builder/prefs-dialog.glade.h:20
-#: ../data/builder/template-designer.glade.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Amplada:"
 
-#: ../data/builder/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "DesplaÃ§ament X:"
 
-#: ../data/builder/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "DesplaÃ§ament Y:"
 
-#: ../data/builder/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "graus"
 
-#: ../data/builder/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:35
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "dÃgits:"
 
-#: ../data/builder/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "format:"
 
-#: ../data/builder/prefs-dialog.glade.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/builder/prefs-dialog.glade.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Mida de pÃ gina predeterminada</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Emplenat</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">LÃnia</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Text</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Unitats</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "Reinicialitza la mida de la imatge"
 
-#: ../data/builder/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "Tipus de lletra"
 
-#: ../data/builder/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "A4 de l'ISO"
 
-#: ../data/builder/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Polzades"
 
-#: ../data/builder/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "LocalitzaciÃ³"
 
-#: ../data/builder/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "MilÂ·lÃmetres"
 
-#: ../data/builder/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "Valors predeterminats dels objectes"
 
-#: ../data/builder/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Punts"
 
-#: ../data/builder/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "Seleccioneu els valors predeterminats dels objectes nous"
 
-#: ../data/builder/prefs-dialog.glade.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "Seleccioneu el comportament especÃfic de la localitzaciÃ³"
 
-#. Most popular (at top of list)
-#: ../data/builder/prefs-dialog.glade.h:19
-#: ../data/templates/paper-sizes.xml.h:29
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "Carta EUA"
 
-#: ../data/builder/print-custom-widget.glade.h:1
-msgid "<b>Options</b>"
-msgstr "<b>Opcions</b>"
-
-#: ../data/builder/print-custom-widget.glade.h:2
-msgid "<b>Print control (Merge)</b>"
-msgstr "<b>Control d'impressiÃ³ (fusiÃ³)</b>"
-
-#: ../data/builder/print-custom-widget.glade.h:3
-msgid "<b>Print control (Simple)</b>"
-msgstr "<b>Control d'impressiÃ³ (simple)</b>"
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Sense tÃtol"
 
-#: ../data/builder/property-bar.glade.h:1
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Negreta"
 
-#: ../data/builder/property-bar.glade.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "AlineaciÃ³ al centre"
 
-#: ../data/builder/property-bar.glade.h:4
-msgid "Font family"
-msgstr "FamÃlia del tipus de lletra"
-
-#: ../data/builder/property-bar.glade.h:5
-msgid "Font size"
-msgstr "Mida del tipus de lletra"
-
-#: ../data/builder/property-bar.glade.h:6
-msgid "Italic"
-msgstr "Cursiva"
-
-#: ../data/builder/property-bar.glade.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "AlineaciÃ³ a l'esquerra"
 
-#: ../data/builder/property-bar.glade.h:9
-msgid "Line width"
-msgstr "Amplada de la lÃnia"
-
-#: ../data/builder/property-bar.glade.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "AlineaciÃ³ a la dreta"
 
-#: ../data/builder/property-bar.glade.h:11
-msgid "Text Color"
-msgstr "Color del text"
-
-#: ../data/builder/template-designer.glade.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(p.ex. Â«Etiquetes de correuÂ», Â«Targetes de visitaÂ», etc.)"
 
-#: ../data/builder/template-designer.glade.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(p.ex. 8163A)"
 
-#: ../data/builder/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(p.ex. Avery, Acme, ...)"
 
-#: ../data/builder/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. Radi exterior:"
 
-#: ../data/builder/template-designer.glade.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. Radi:"
 
-#: ../data/builder/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Amplada:"
 
-#: ../data/builder/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. AlÃ§ada:"
 
-#: ../data/builder/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. Radi interior:"
 
-#: ../data/builder/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. Residu (es pot imprimir fora dels lÃmits):"
 
-#: ../data/builder/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. Amplada de retallada:"
 
-#: ../data/builder/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Marge"
 
-#: ../data/builder/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. Corba (radi de la cantonada):"
 
-#: ../data/builder/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. AlÃ§ada de retallada"
 
-#: ../data/builder/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "2. Residu horitz. (es pot imprimir fora dels lÃmits):"
 
-#: ../data/builder/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. Residu vert. (es pot imprimir fora dels lÃmits):"
 
-#: ../data/builder/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "2. Residu (es pot imprimir fora dels lÃmits):"
 
-#: ../data/builder/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Marge"
 
-#: ../data/builder/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "Marca/fabricant:"
 
-#: ../data/builder/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD (tambÃ© s'hi inclouen els CD de mida de targeta de crÃ¨dit)"
 
-#: ../data/builder/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1901,23 +2386,19 @@ msgstr ""
 "En cas contrari, podeu fer clic a Â«CancelÂ·laÂ» per a abandonar-lo \n"
 "o a Â«EnrereÂ» per a continuar-lo editant."
 
-#: ../data/builder/template-designer.glade.h:27
-msgid "Description:"
-msgstr "DescripciÃ³:"
-
-#: ../data/builder/template-designer.glade.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "DistÃ ncia des de la vora esquerra (x0):"
 
-#: ../data/builder/template-designer.glade.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "DistÃ ncia des de la vora superior (y0):"
 
-#: ../data/builder/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "SeparaciÃ³ horitzontal (dx):"
 
-#: ../data/builder/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1932,36 +2413,27 @@ msgstr ""
 "disposiciÃ³, com podeu veure en el primer exemple.\n"
 "El segon exemple mostra en quins casos en calen dues."
 
-#: ../data/builder/template-designer.glade.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "DisposiciÃ³ n. 1"
 
-#: ../data/builder/template-designer.glade.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "DisposiciÃ³ n. 2"
 
-#: ../data/builder/template-designer.glade.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "Nombre per amplada (nx):"
 
-#: ../data/builder/template-designer.glade.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "Nombre per alÃ§ada (ny):"
 
-#: ../data/builder/template-designer.glade.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "Nombre de disposicions:"
 
-#: ../data/builder/template-designer.glade.h:42
-#: ../data/builder/wdgt-media-select.glade.h:3
-msgid "Page size:"
-msgstr "Mida de la pÃ gina:"
-
-#: ../data/builder/template-designer.glade.h:43
-msgid "Part #:"
-msgstr "NÃºm. de model:"
-
-#: ../data/builder/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
@@ -1969,11 +2441,11 @@ msgstr ""
 "IntroduÃ¯u la informaciÃ³ d'identificaciÃ³ segÃ¼ent sobre la papereria de la "
 "plantilla."
 
-#: ../data/builder/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "IntroduÃ¯u la informaciÃ³ de disposiciÃ³ segÃ¼ent."
 
-#: ../data/builder/template-designer.glade.h:46
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
@@ -1981,7 +2453,7 @@ msgstr ""
 "IntroduÃ¯u els parÃ metres de mida segÃ¼ents d'una etiqueta Ãºnica a la vostra "
 "plantilla."
 
-#: ../data/builder/template-designer.glade.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
@@ -1989,27 +2461,27 @@ msgstr ""
 "IntroduÃ¯u els parÃ metres de mida segÃ¼ents d'una etiqueta Ãºnica o targeta a "
 "la vostra plantilla"
 
-#: ../data/builder/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr "Seleccioneu la forma bÃ sica de les etiquetes o targetes."
 
-#: ../data/builder/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "Seleccioneu la mida de la pÃ gina de la papereria de la plantilla."
 
-#: ../data/builder/template-designer.glade.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Imprimeix un full de mostra"
 
-#: ../data/builder/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "Rectangular o quadrada (pot tenir cantonades arrodonides)"
 
-#: ../data/builder/template-designer.glade.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "Circular"
 
-#: ../data/builder/template-designer.glade.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -2017,7 +2489,7 @@ msgstr ""
 "Plantilles que requereixen\n"
 "dues disposicions."
 
-#: ../data/builder/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2025,11 +2497,11 @@ msgstr ""
 "Plantilles que requereixen\n"
 "una disposiciÃ³."
 
-#: ../data/builder/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "SeparaciÃ³ vertical (dy):"
 
-#: ../data/builder/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2040,199 +2512,227 @@ msgstr ""
 "Aquest diÃ leg us ajudarÃ  a crear una plantilla personalitzada del \n"
 "gLabels."
 
-#: ../data/builder/template-designer.glade.h:62
-msgid "cd_size_page"
-msgstr "cd_size_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "Compagina"
 
-#: ../data/builder/template-designer.glade.h:63
-msgid "finish_page"
-msgstr "finish_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "Copies"
+msgstr "CÃ²pies"
 
-#: ../data/builder/template-designer.glade.h:65
-msgid "layout_page"
-msgstr "layout_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "CÃ²pies"
 
-#: ../data/builder/template-designer.glade.h:66
-msgid "name_page"
-msgstr "name_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Merge Control"
+msgstr ""
 
-#: ../data/builder/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "nlayouts_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>Opcions</b>"
 
-#: ../data/builder/template-designer.glade.h:68
-msgid "pg_size_page"
-msgstr "pg_size_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "Fulls:"
 
-#: ../data/builder/template-designer.glade.h:69
-msgid "rect_size_page"
-msgstr "rect_size_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "ComenÃ§a a l'etiqueta"
 
-#: ../data/builder/template-designer.glade.h:70
-msgid "round_size_page"
-msgstr "round_size_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "de:"
 
-#: ../data/builder/template-designer.glade.h:71
-msgid "shape_page"
-msgstr "shape_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "al primer full"
 
-#: ../data/builder/template-designer.glade.h:72
-msgid "start_page"
-msgstr "start_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "a:"
 
-#: ../data/builder/wdgt-media-select.glade.h:1
-msgid "Brand:"
-msgstr "Marca:"
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "Crea etiquetes, targetes de visita i carÃ tules de suports multimÃ¨dia"
 
-#: ../data/builder/wdgt-media-select.glade.h:2
-msgid "Category:"
-msgstr "Categoria:"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "Dissenyador d'etiquetes gLabels"
 
-#: ../data/builder/wdgt-media-select.glade.h:4
-msgid "Recent templates"
-msgstr "Plantilles recents"
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "Fitxer de projecte del gLabels"
 
-#: ../data/builder/wdgt-media-select.glade.h:5
-msgid "Search all templates"
-msgstr "Cerca totes les plantilles"
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
 
 #. Other ISO A series sizes
-#: ../data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0"
 
-#: ../data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1"
 
-#: ../data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10"
 
-#: ../data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2"
 
-#: ../data/templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3"
 
-#: ../data/templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4"
 
-#: ../data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5"
 
-#: ../data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6"
 
-#: ../data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7"
 
-#: ../data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8"
 
-#: ../data/templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9"
 
 #. ISO B series sizes
-#: ../data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0"
 
-#: ../data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1"
 
-#: ../data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10 "
 
-#: ../data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2"
 
-#: ../data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3"
 
-#: ../data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4"
 
-#: ../data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "   "
 
-#: ../data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6 "
 
-#: ../data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7"
 
-#: ../data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8"
 
-#: ../data/templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9"
 
-#: ../data/templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "Executiu EUA"
 
 #. Other US paper sizes
-#: ../data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "Legal EUA"
 
-#: ../data/templates/categories.xml.h:1
+#: ../templates/categories.xml.h:1
 msgid "Any card"
 msgstr "Qualsevol targeta"
 
-#: ../data/templates/categories.xml.h:2
+#: ../templates/categories.xml.h:2
 msgid "Any label"
 msgstr "Qualsevol etiqueta"
 
-#: ../data/templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "Targetes de visita"
 
-#: ../data/templates/categories.xml.h:4
+#: ../templates/categories.xml.h:4
 msgid "CD/DVD or other media"
 msgstr "CD/DVD o un altre suport"
 
-#: ../data/templates/categories.xml.h:5
+#: ../templates/categories.xml.h:5
 msgid "Mailing/shipping products"
 msgstr "Productes de correu/facturaciÃ³"
 
-#: ../data/templates/categories.xml.h:6
+#: ../templates/categories.xml.h:6
 msgid "Rectangular labels"
 msgstr "Etiquetes rectangulars"
 
-#: ../data/templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "Etiquetes arrodonides"
 
-#: ../data/templates/categories.xml.h:8
+#: ../templates/categories.xml.h:8
 msgid "Square labels"
 msgstr "Etiquetes quadrades"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:2
-#: ../data/templates/avery-iso-templates.xml.h:2
-#: ../data/templates/dymo-other-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:2
-#: ../data/templates/zweckform-iso-templates.xml.h:2
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "Etiquetes d'adreÃ§a"
 
@@ -2241,181 +2741,204 @@ msgstr "Etiquetes d'adreÃ§a"
 #. ===================================================================
 #. ********************************************************************
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:4
-#: ../data/templates/avery-iso-templates.xml.h:8
-#: ../data/templates/misc-us-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:12
-#: ../data/templates/zweckform-iso-templates.xml.h:6
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "Targetes de visita"
 
 #. ===================================================================
 #. ===============================================================
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:6
-#: ../data/templates/avery-iso-templates.xml.h:14
-#: ../data/templates/misc-us-templates.xml.h:8
-#: ../data/templates/misc-iso-templates.xml.h:16
-#: ../data/templates/zweckform-iso-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
 msgstr "Etiquetes de CD/DVD"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "Etiquetes de CD/DVD (etiquetes del disc)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:10
+#: ../templates/avery-us-templates.xml.h:10
 msgid "CD/DVD Labels (Spine Labels)"
 msgstr "Etiquetes de CD/DVD (etiquetes del llom)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:12
-#: ../data/templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr "Etiquetes de disquet"
 
 #. the LSK labels can be torn in half down the center
-#: ../data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:14
 msgid "Divider Labels"
 msgstr "Etiquetes divisÃ²ries"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+msgid "File Folder Labels"
+msgstr "Etiquetes d'arxivador"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr "Etiquetes d'arxivador"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:18
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "Etiquetes de full complet"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 msgid "ID Labels"
 msgstr "Etiquetes d'identificaciÃ³"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 msgid "Index Cards"
 msgstr "Targetes d'Ãndex"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "Etiquetes rodones grans"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:26
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "Etiquetes d'acreditaciÃ³"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr "Postals"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:30
-#: ../data/templates/dymo-other-templates.xml.h:12
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "Etiquetes d'adreÃ§a de retorn"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:32
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "Etiquetes arroronides"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:34
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "Etiquetes de facturaciÃ³"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:36
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "Etiquetes rodones petites"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:38
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "Etiquetes quadrades"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr "Targetes doblegades"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:42
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "Etiquetes de carÃ tula de cinta de vÃdeo"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:44
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr "Etiquetes de llom de cinta de vÃdeo"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:4
 msgid "Address labels"
 msgstr "Etiquetes d'adreÃ§a"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:6
 msgid "Allround labels"
 msgstr "Etiquetes d'Ãºs general"
 
 #. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:10
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "CD Booklet"
 msgstr "Llibret de CD"
 
 #. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:12
 msgid "CD Inlet"
 msgstr "Coberta interior de CD"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:18
+#: ../templates/avery-iso-templates.xml.h:18
 msgid "Diskette labels"
 msgstr "Etiquetes de disquet"
 
 #. ===============================================================
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:20
-#: ../data/templates/misc-us-templates.xml.h:18
-#: ../data/templates/misc-iso-templates.xml.h:36
-#: ../data/templates/zweckform-iso-templates.xml.h:16
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
 msgstr "Etiquetes de correu"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:22
+#: ../templates/avery-iso-templates.xml.h:22
 msgid "Mailing labels"
 msgstr "Etiquetes de correu"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:24
+#: ../templates/avery-iso-templates.xml.h:24
 msgid "Mini Address Labels"
 msgstr "Etiquetes d'adreÃ§a miniatura"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:26
-msgid "Shipping labels"
-msgstr "Etiquetes de facturaciÃ³"
+#: ../templates/avery-iso-templates.xml.h:26
+#, fuzzy
+msgid "Mini Labels"
+msgstr "Etiquetes de CD miniatura"
 
 #. ===================================================================
-#: ../data/templates/avery-other-templates.xml.h:2
-msgid "File Folder Labels"
-msgstr "Etiquetes d'arxivador"
+#: ../templates/avery-iso-templates.xml.h:28
+msgid "Shipping labels"
+msgstr "Etiquetes de facturaciÃ³"
 
-#: ../data/templates/brother-other-templates.xml.h:1
+#: ../templates/brother-other-templates.xml.h:1
 msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr "Etiquetes d'Ãºs general 17 mm x 54 mm"
 
-#: ../data/templates/brother-other-templates.xml.h:2
+#: ../templates/brother-other-templates.xml.h:2
 msgid "Shipping Labels 62mm x 100mm"
 msgstr "Etiquetes de facturaciÃ³ 62 mm x 100 mm"
 
@@ -2436,279 +2959,497 @@ msgstr "Etiquetes de facturaciÃ³ 62 mm x 100 mm"
 #. *********************************************************************
 #. *********************************************************************
 #.
-#: ../data/templates/brother-other-templates.xml.h:20
+#: ../templates/brother-other-templates.xml.h:20
 msgid "Standard Address Labels 29mm x 90mm"
 msgstr "Etiquetes d'adreÃ§a estÃ ndard 29 mm x 90 mm"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:2
 msgid "3.5in Diskette"
 msgstr "Disquet de 3.5\\\""
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:6
 msgid "File Folder"
 msgstr "Arxivador"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:8
+#: ../templates/dymo-other-templates.xml.h:8
 msgid "Hanging Folder"
 msgstr "Carpeta penjant d'arxiu"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:10
+#: ../templates/dymo-other-templates.xml.h:10
 msgid "Large Address Labels"
 msgstr "Etiquetes d'adreÃ§a grans"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:14
 msgid "Shipping Address Labels"
 msgstr "Etiquetes d'adreÃ§a de facturaciÃ³"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:2
+#: ../templates/misc-us-templates.xml.h:2
 msgid "Business Card CD"
 msgstr "CD de targeta de visita"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:6
+#: ../templates/misc-us-templates.xml.h:6
 msgid "CD Template Rectangles"
 msgstr "Rectangles de plantilla de CD"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:10
+#: ../templates/misc-us-templates.xml.h:10
 msgid "CD/DVD Labels (Face Only)"
 msgstr "Etiquetes de CD/DVD (nomÃ©s la carÃ tula)"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:12
-#: ../data/templates/misc-iso-templates.xml.h:18
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "CD/DVD Labels (face only)"
 msgstr "Etiquetes de CD/DVD (nomÃ©s la carÃ tula)"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:14
 msgid "Cassette Labels"
 msgstr "Etiquetes de casset"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:16
+#: ../templates/misc-us-templates.xml.h:16
 msgid "DLT Labels"
 msgstr "Etiquetes per a cintes DLT"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "Llibret de CD"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr "Etiquetes de microtubs"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:22
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr "Etiquetes de CD miniatura"
 
-#: ../data/templates/misc-us-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr "Etiquetes PRO CD (2, nomÃ©s el llom)"
 
-#: ../data/templates/misc-us-templates.xml.h:24
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "Etiquetes PRO CD (2, nomÃ©s la carÃ tula)"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:26
-#: ../data/templates/misc-iso-templates.xml.h:42
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr "Etiquetes PRO CD (2, nomÃ©s la carÃ tula)"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:28
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr "Capsa de CD prima (cara amunt)"
 
-#: ../data/templates/misc-us-templates.xml.h:29
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr "Capsa de CD prima (cara avall)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:4
-#: ../data/templates/zweckform-iso-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Allround Labels"
 msgstr "Etiquetes d'Ãºs general"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:6
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr "Etiquetes d'arxivador"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr "Etiquetes d'arxivador (grans)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:10
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr "Etiquetes d'arxivador (petites)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:14
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "Etiquetes de CD"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "Etiquetes CD/DVD amb format estÃ ndard (nomÃ©s la carÃ tula)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:22
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "Etiquetes de disquet (nomÃ©s la carÃ tula)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "Fotografies adhesives d'EPSON (16)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "Etiquetes"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "Enganxines d'imant de frigorÃfic"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:30
 msgid "General Labels"
 msgstr "Etiquetes generals"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr "Etiquetes per a impressiÃ³ a raig de tinta/lÃ ser 70 x 37 mm"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:38
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr "Etiquetes de correu - 2 columnes"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:40
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr "Etiquetes de correu - 3 columnes"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:44
-#: ../data/templates/zweckform-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Rectangular Labels"
 msgstr "Etiquetes rectangulars"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "Etiquetes generals"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "Etiquetes de vÃdeo (nomÃ©s la carÃ tula)"
 
 #. ===================================================================
-#: ../data/templates/misc-other-templates.xml.h:2
+#: ../templates/misc-other-templates.xml.h:2
 msgid "Multi-Purpose Labels"
 msgstr "Etiquetes d'Ãºs general"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:10
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Etiquetes d'adreÃ§a"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Etiquetes de disquet"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Targetes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Targetes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Targetes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Targetes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Etiquetes d'Ãºs general"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Targetes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Etiquetes"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Etiquetes"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Etiquetes"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+#, fuzzy
+msgid "Name plates"
+msgstr "name_page"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Quant al gLabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "Etiquetes quadrades"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "Etiquetes quadrades"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr "Etiqueted de correcciÃ³ i cobertura"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:12
 msgid "File Back Labels"
 msgstr "Etiquetes de llom d'arxivador"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:14
+#: ../templates/zweckform-iso-templates.xml.h:14
 msgid "Lever Arch File Labels"
 msgstr "Etiquetes d'arxivador"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr "Etiquetes d'Ãºs general reenganxables Â«Stick+LiftÂ»"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:20
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr "Etiquetes de targeta QSL 70 mm x 50,8 mm"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:22
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
 msgstr "Etiquetes de copiadora rectangulars"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "Etiquetes de vÃdeo (part posterior)"
 
-#: ../data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "Crea etiquetes, targetes de visita i carÃ tules de suports multimÃ¨dia"
+#~ msgid "- gLabels label designer"
+#~ msgstr "- dissenyador d'etiquetes gLabels"
 
-#: ../data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "Dissenyador d'etiquetes gLabels"
+#~ msgid "- batch process gLabels label files"
+#~ msgstr "- processa en lot fitxers d'etiqueta del gLabels"
 
-#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "Fitxer de projecte del gLabels"
+#~ msgid "Show tooltips"
+#~ msgstr "Mostra els indicadors de funciÃ³"
 
-#: ../barcode-0.98/compat/getopt.c:583
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'opciÃ³ Â«%sÂ» Ã©s ambigua\n"
+#~ msgid "Show tooltips for property toolbar"
+#~ msgstr "Mostra els indicadors de funciÃ³ a la barra de les propietats"
 
-#: ../barcode-0.98/compat/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'opciÃ³ Â«--%sÂ» no admet cap argument\n"
+#~ msgid "Show tooltips for main toolbar"
+#~ msgstr "Mostra els indicadors de funciÃ³ a la barra principal"
 
-#: ../barcode-0.98/compat/getopt.c:612
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'opciÃ³ Â«%c%sÂ» no permet cap argument\n"
+#~ msgid "Show tooltips for drawing toolbar"
+#~ msgstr "Mostra els indicadors de funciÃ³ a la barra de dibuix"
 
-#: ../barcode-0.98/compat/getopt.c:629
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'opciÃ³ Â«%sÂ» requereix un argumetn\n"
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "Fitxer de text amb comes delimitadores (CSV)"
 
-#. --option
-#: ../barcode-0.98/compat/getopt.c:658
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: no es reconeix l'opciÃ³ Â«--%sÂ»\n"
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "Fitxer de text amb dos punts delimitadors"
 
-#. +option or -option
-#: ../barcode-0.98/compat/getopt.c:662
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: no es reconeix l'opciÃ³ Â«%c%sÂ»\n"
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "Fitxer de text amb tabulacions delimitadores"
 
-#. 1003.2 specifies the format of this message.
-#: ../barcode-0.98/compat/getopt.c:688
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: l'opciÃ³ --%c no Ã©s vÃ lida\n"
+#~ msgid "Data from a file containing VCards"
+#~ msgstr "Dades d'un fitxer que contÃ© VCards"
 
-#: ../barcode-0.98/compat/getopt.c:691
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: l'opciÃ³ --%c no Ã©s vÃ lida\n"
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
 
-#: ../barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'opciÃ³ --%c requereix un argument\n"
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s de diÃ metre"
+
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>OrientaciÃ³ de l'etiqueta</b>"
+
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>Tipus de suport</b>"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Propietats de l'objecte Xxx</span>"
+
+#~ msgid "Select A File"
+#~ msgstr "Seleccioneu un fitxer"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Mida de pÃ gina predeterminada</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Emplenat</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">LÃnia</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Text</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Unitats</span>"
+
+#~ msgid "<b>Print control (Merge)</b>"
+#~ msgstr "<b>Control d'impressiÃ³ (fusiÃ³)</b>"
+
+#~ msgid "<b>Print control (Simple)</b>"
+#~ msgstr "<b>Control d'impressiÃ³ (simple)</b>"
+
+#~ msgid "cd_size_page"
+#~ msgstr "cd_size_page"
+
+#~ msgid "finish_page"
+#~ msgstr "finish_page"
+
+#~ msgid "layout_page"
+#~ msgstr "layout_page"
+
+#~ msgid "nlayouts_page"
+#~ msgstr "nlayouts_page"
+
+#~ msgid "pg_size_page"
+#~ msgstr "pg_size_page"
+
+#~ msgid "rect_size_page"
+#~ msgstr "rect_size_page"
+
+#~ msgid "round_size_page"
+#~ msgstr "round_size_page"
+
+#~ msgid "shape_page"
+#~ msgstr "shape_page"
+
+#~ msgid "start_page"
+#~ msgstr "start_page"
+
+#~ msgid "Search all templates"
+#~ msgstr "Cerca totes les plantilles"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: l'opciÃ³ Â«%sÂ» Ã©s ambigua\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opciÃ³ Â«--%sÂ» no admet cap argument\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opciÃ³ Â«%c%sÂ» no permet cap argument\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: l'opciÃ³ Â«%sÂ» requereix un argumetn\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: no es reconeix l'opciÃ³ Â«--%sÂ»\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: no es reconeix l'opciÃ³ Â«%c%sÂ»\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: l'opciÃ³ --%c no Ã©s vÃ lida\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: l'opciÃ³ --%c no Ã©s vÃ lida\n"
 
- 	  	 
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: l'opciÃ³ --%c requereix un argument\n"
diff --git a/po/cs.po b/po/cs.po
index 49f6e0e..4f2f749 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Glabels 2.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 18:30+0100\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-02-16 13:51+0100\n"
 "Last-Translator: Marek Ä?ernockÃ½ <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
@@ -19,188 +19,1362 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/glabels.c:75 ../src/glabels-batch.c:70
-msgid "[FILE...]"
-msgstr "[SOUBORâ?¦]"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (jakÃ½koli)"
+
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (pouze PSÄ?)"
+
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (PSÄ?+4)"
+
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
+
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (jakÃ½koli)"
+
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
+
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
+
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
+
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
+
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
+
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
+
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A nebo UPC-E)"
+
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
+
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
+
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
+
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
+
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
+
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
+
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
+
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
+
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Code 128C"
+
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Code 128B"
+
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "ProklÃ¡danÃ½ 2 z 5"
+
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
+
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
+
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
 
-#: ../src/glabels.c:91
-msgid "- gLabels label designer"
-msgstr "- nÃ¡vrhÃ¡Å? etiket gLabels"
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "VloÅ¾it"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Ä?Ã¡rovÃ½ kÃ³d"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Smazat"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
+msgstr "VÃ½chozÃ"
+
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "tmavÄ? Ä?ervenÃ¡"
+
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
+
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
+
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "tmavÄ? zelenÃ¡"
+
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
+
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
+
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "tmavÄ? modrÃ¡"
+
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "Ä?ervenÃ¡"
 
-#: ../src/glabels-batch.c:54
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "oranÅ¾ovÃ¡"
+
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
+
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "matnÃ¡ zelenÃ¡"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
+
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "modrÃ¡"
+
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "purpurovÃ¡"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
+
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "zlatÃ¡"
+
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "Å¾ludÃ¡"
+
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "zelenÃ¡"
+
+#: ../src/color-combo-menu.c:103
+#, fuzzy
+msgid "Cyan"
+msgstr "azurovÃ¡"
+
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "nebeskÃ¡ modÅ?"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
+
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "rÅ¯Å¾ovÃ¡"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
+
+#: ../src/color-combo-menu.c:109
+#, fuzzy
+msgid "Light Yellow"
+msgstr "svÄ?tle Å¾lutÃ¡"
+
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "svÄ?tle zelenÃ¡"
+
+#: ../src/color-combo-menu.c:111
+#, fuzzy
+msgid "Light Cyan"
+msgstr "svÄ?tle azurovÃ¡"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:113
+#, fuzzy
+msgid "Thistle"
+msgstr "bÃlÃ¡"
+
+#: ../src/color-combo-menu.c:115
+#, fuzzy
+msgid "White"
+msgstr "bÃlÃ¡"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:126
+#, fuzzy
+msgid "Black"
+msgstr "Ä?ernÃ¡"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+#, fuzzy
+msgid "Custom Color"
+msgstr "VlastnÃ barva"
+
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "VlastnÃ barva"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr "KritickÃ¡ chyba aplikace gLabels!"
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "NovÃ¡ etiketa Ä?i vizitka"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+msgid "Label properties"
+msgstr "Vlastnosti etikety"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
+msgstr "VÅ¡echny soubory"
+
+#: ../src/file.c:272 ../src/file.c:562
+msgid "gLabels documents"
+msgstr "Dokumenty gLabels"
+
+#: ../src/file.c:319 ../src/file.c:620
+msgid "Empty file name selection"
+msgstr "PrÃ¡zdnÃ© pole s nÃ¡zvem souboru"
+
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
+msgstr "Vyberte, prosÃm, soubor, nebo zadejte platnÃ½ nÃ¡zev souboru"
+
+#: ../src/file.c:335
+msgid "File does not exist"
+msgstr "Soubor neexistuje"
+
+#: ../src/file.c:410
+#, c-format
+msgid "Could not open file \"%s\""
+msgstr "Nelze otevÅ?Ãt soubor â??%sâ??"
+
+#: ../src/file.c:413
+msgid "Not a supported file format"
+msgstr "FormÃ¡t tohoto souboru nenÃ podporovÃ¡n"
+
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
+msgid "Could not save file \"%s\""
+msgstr "Nelze uloÅ¾it soubor â??%sâ??"
+
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
+msgstr "PÅ?i uklÃ¡dÃ¡nÃ se vyskytla chyba. Soubor nebyl uloÅ¾en."
+
+#: ../src/file.c:535
+#, c-format
+msgid "Save \"%s\" as"
+msgstr "UloÅ¾it â??%sâ?? jako"
+
+#: ../src/file.c:623
+msgid "Please supply a valid file name"
+msgstr "Zadejte prosÃm platnÃ½ nÃ¡zev souboru"
+
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
+msgstr "PÅ?epsat soubor â??%sâ???"
+
+#: ../src/file.c:648
+msgid "File already exists."
+msgstr "Soubor jiÅ¾ existuje."
+
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
+msgstr "UloÅ¾it pÅ?ed zavÅ?enÃm zmÄ?ny v dokumentu â??%sâ???"
+
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
+msgstr "VaÅ¡e zmÄ?ny budou ztraceny, pokud je neuloÅ¾Ãte."
+
+#: ../src/file.c:751
+msgid "Close without saving"
+msgstr "ZavÅ?Ãt bez uloÅ¾enÃ"
+
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "NedÃ¡vno pouÅ¾itÃ© Å¡ablony"
+
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "VÅ¡echny soubory"
+
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
+
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "nastavit nÃ¡zev vÃ½stupnÃho souboru  (vÃ½chozÃ=â??output.psâ??)"
 
-#: ../src/glabels-batch.c:54 ../src/glabels-batch.c:68
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "nÃ¡zev souboru"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "poÄ?et stran (vÃ½chozÃ=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "stran"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "poÄ?et kopiÃ (vÃ½chozÃ = 1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "kopiÃ"
 
-#: ../src/glabels-batch.c:60
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "prvnÃ etiketa na prvnÃm listu (vÃ½chozÃ=1)"
 
-#: ../src/glabels-batch.c:60
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "prvnÃ"
 
-#: ../src/glabels-batch.c:62 ../data/glade/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "tisk obrysÅ¯ (test zarovnÃ¡vÃ¡nÃ tiskÃ¡rny)"
 
-#: ../src/glabels-batch.c:64 ../data/glade/print-custom-widget.glade.h:5
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "obrÃ¡cenÃ½ tisk (napÅ?. zrcadlenÃ½ obrÃ¡zek)"
 
-#: ../src/glabels-batch.c:66 ../data/glade/print-custom-widget.glade.h:4
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "tisknout znaÄ?ky pro oÅ?ez"
 
-#: ../src/glabels-batch.c:68
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "vstupnÃ soubor pro sluÄ?ovÃ¡nÃ"
 
-#: ../src/glabels-batch.c:96
-msgid "- batch process gLabels label files"
-msgstr "- dÃ¡vkovÃ© zpracovÃ¡nÃ souborÅ¯ s etiketami gLabels"
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[SOUBORâ?¦]"
+
+#: ../src/glabels-batch.c:99
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: ../src/glabels-batch.c:142
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "nelze provÃ©st sluÄ?ovÃ¡nÃ dokumentu se souborem aplikace gLabels %s\n"
 
-#: ../src/glabels-batch.c:164
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "nelze otevÅ?Ãt soubor aplikace gLabels %s\n"
 
-#: ../src/window.c:259
-msgid "(none) - gLabels"
-msgstr "(Å¾Ã¡dnÃ©) - gLabels"
+#: ../src/glabels.c:81
+#, fuzzy
+msgid "Launch gLabels label and business card designer."
+msgstr "Program na vytvÃ¡Å?enÃ etiket a vizitek.\n"
 
-#: ../src/window.c:432
-msgid "(modified)"
-msgstr "(zmÄ?nÄ?no)"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "VytvoÅ?it objekt s Ä?Ã¡rovÃ½m kÃ³dem"
 
-#: ../src/stock.c:72
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "Data pro Ä?Ã¡rovÃ½ kÃ³d jsou prÃ¡zdnÃ¡"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "Vlastnosti Ä?Ã¡rovÃ©ho kÃ³du"
+
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr "Data pro Ä?Ã¡rovÃ½ kÃ³d jsou prÃ¡zdnÃ¡"
+
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "Data pro Ä?Ã¡rovÃ½ kÃ³d jsou neplatnÃ¡"
+
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "VytvoÅ?it textovÃ½ objekt"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "Barva vÃ½plnÄ?"
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "Barva obrysu"
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "TlouÅ¡Å¥ka obrysu"
+
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "NepojmenovanÃ½"
+
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Vlastnosti sluÄ?ovÃ¡nÃ"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "Smazat"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "PÅ?enÃ©st dopÅ?edu"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr "PÅ?enÃ©st dozadu"
+
+#: ../src/label.c:1307
+msgid "Rotate"
+msgstr "OtoÄ?it"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "OtoÄ?it doleva"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "OtoÄ?it doprava"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "PÅ?eklopit vodorovnÄ?"
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "PÅ?eklopit svisle"
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "Zarovnat doleva"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "Zarovnat doprava"
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Zarovnat vodorovnÄ? na stÅ?ed"
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Zarovnat nahoru"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Zarovnat dolÅ¯"
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Zarovnat svisle na stÅ?ed"
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "VystÅ?edit vodorovnÄ?"
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "VystÅ?edit  svisle"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "VloÅ¾it"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "VytvoÅ?it Ä?Ã¡ru"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "VytvoÅ?it objekt s obrÃ¡zkem"
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "PÅ¯vodnÃ velikost obrÃ¡zku"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "VytvoÅ?it Ä?Ã¡ru"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Velikost strÃ¡nky:"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "StÃn"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "StÃn"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "StÃn"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "StÃn"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "VytvoÅ?it textovÃ½ objekt"
+
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "rÅ¯Å¾ovÃ¡"
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "Rodina pÃsma"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Velikost pÃsma"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "OtoÄ?it doprava"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "KurzÃva"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Zarovnat doleva"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "Å?Ã¡dkovÃ¡nÃ:"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "Barva textu"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "LibovolnÃ¡"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "LibovolnÃ¡"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "LibovolnÃ¡"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "Nenalezeny Å¾Ã¡dnÃ© nedÃ¡vno pouÅ¾itÃ© Å¡ablony."
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr "Zkuste vybrat Å¡ablonu na kartÄ? â??Vyhledat ve vÅ¡ech Å¡ablonÃ¡châ??."
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr "Å½Ã¡dnÃ¡ neodpovÃdÃ¡."
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr "Zkuste vybrat jinou znaÄ?ku, velikost strÃ¡nky nebo kategorii."
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Nenalezeny Å¾Ã¡dnÃ© nedÃ¡vno pouÅ¾itÃ© Å¡ablony."
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "Å½Ã¡dnÃ½"
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr "Nelze sestavit dotaz"
+
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+msgid "Couldn't open addressbook."
+msgstr "Nelze otevÅ?Ãt adresÃ¡Å?."
+
+#: ../src/merge-evolution.c:348
+msgid "Couldn't list available fields."
+msgstr "Nelze vytvoÅ?it seznam dostupnÃ½ch polÃ."
+
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr "Nelze zÃskat kontakt."
+
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
+
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Data z vÃ½chozÃho adresÃ¡Å?e Evolution"
+
+#: ../src/merge-init.c:125
+#, fuzzy
+msgid "VCards"
+msgstr "PÅ?Ã¡nÃÄ?ka"
+
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Vlastnosti sluÄ?ovÃ¡nÃ"
+
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "VÃ½bÄ?r databÃ¡zovÃ©ho zdroje pro sluÄ?ovÃ¡nÃ"
+
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "NeurÄ?eno"
+
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "VÃ½bÄ?r"
+
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "ZÃ¡znam/Pole"
+
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "Data"
+
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+msgid "Fixed"
+msgstr "Napevno"
+
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "ReÅ¾im vÃ½bÄ?ru"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
+
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "VÃ½chozÃ"
+
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "Vlastnosti objektu"
+
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "Vlastnosti obdÃ©lnÃku"
+
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "Vlastnosti elipsy"
+
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "Vlastnosti Ä?Ã¡ry"
+
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "Vlastnosti obrÃ¡zku"
+
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "Vlastnosti textu"
+
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "Vlastnosti Ä?Ã¡rovÃ©ho kÃ³du"
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "VloÅ¾it pole pro sluÄ?ovÃ¡nÃ"
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+#, fuzzy
+msgid "No Fill"
+msgstr "Bez vÃ½plnÄ?"
+
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
+msgstr "VÅ¡echny soubory"
+
+#: ../src/object-editor-image-page.c:283
+msgid "All Images"
+msgstr "VÅ¡echny obrÃ¡zky"
+
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr "%s (*.%s)"
+
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+#, fuzzy
+msgid "No Line"
+msgstr "Bez obrysu"
+
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "PÅ?edvolby gLabels"
+
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "Etikety"
+
+#: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr "ReÅ¾im _vÃ½bÄ?ru"
 
-#: ../src/stock.c:73
+#: ../src/stock.c:71
 msgid "_Text"
 msgstr "_Text"
 
-#: ../src/stock.c:74
+#: ../src/stock.c:72
 msgid "_Line"
 msgstr "Ä?Ã¡r_a"
 
-#: ../src/stock.c:75
+#: ../src/stock.c:73
 msgid "_Box"
 msgstr "O_bdÃ©lnÃk"
 
-#: ../src/stock.c:76
+#: ../src/stock.c:74
 msgid "_Ellipse"
 msgstr "_Elipsa"
 
-#: ../src/stock.c:77
+#: ../src/stock.c:75
 msgid "_Image"
 msgstr "ObrÃ¡_zek"
 
-#: ../src/stock.c:78
+#: ../src/stock.c:76
 msgid "Bar_code"
 msgstr "Ä?Ã¡rovÃ½ _kÃ³d"
 
-#: ../src/stock.c:79
+#: ../src/stock.c:77
 msgid "_Merge Properties"
 msgstr "Vlastnosti _sluÄ?ovÃ¡nÃ"
 
-#: ../src/stock.c:80
+#: ../src/stock.c:78
 msgid "Object _Properties"
 msgstr "Vlastnosti _objektu"
 
-#: ../src/stock.c:81
+#: ../src/stock.c:79
 msgid "Bring to _Front"
 msgstr "PÅ?enÃ©st do_pÅ?edu"
 
-#: ../src/stock.c:82
+#: ../src/stock.c:80
 msgid "Send to _Back"
 msgstr "PÅ?enÃ©st do_zadu"
 
-#: ../src/stock.c:83
+#: ../src/stock.c:81
 msgid "Rotate _Left"
 msgstr "OtoÄ?it do_leva"
 
-#: ../src/stock.c:84
+#: ../src/stock.c:82
 msgid "Rotate _Right"
 msgstr "OtoÄ?it do_prava"
 
-#: ../src/stock.c:85
+#: ../src/stock.c:83
 msgid "Flip _Horizontally"
 msgstr "PÅ?eklopit _vodorovnÄ?"
 
-#: ../src/stock.c:86
+#: ../src/stock.c:84
 msgid "Flip _Vertically"
 msgstr "PÅ?eklopit _svisle"
 
-#: ../src/stock.c:87
+#: ../src/stock.c:85
 msgid "_Lefts"
 msgstr "Do_leva"
 
-#: ../src/stock.c:88
+#: ../src/stock.c:86
 msgid "_Rights"
 msgstr "Dop_rava"
 
-#: ../src/stock.c:89
+#: ../src/stock.c:87
 msgid "_Centers"
 msgstr "Na_stÅ?ed"
 
-#: ../src/stock.c:90
+#: ../src/stock.c:88
 msgid "_Tops"
 msgstr "Na_horu"
 
-#: ../src/stock.c:91
+#: ../src/stock.c:89
 msgid "Bottoms"
 msgstr "_DolÅ¯"
 
-#: ../src/stock.c:92
+#: ../src/stock.c:90
 msgid "Centers"
 msgstr "NastÅ?ed"
 
-#: ../src/stock.c:93 ../src/stock.c:94
+#: ../src/stock.c:91 ../src/stock.c:92
 msgid "Label Ce_nter"
 msgstr "StÅ?e_d etikety"
 
-#: ../src/stock.c:95 ../data/glade/property-bar.glade.h:3
-msgid "Fill color"
-msgstr "Barva vÃ½plnÄ?"
-
-#: ../src/stock.c:96 ../data/glade/property-bar.glade.h:8
-msgid "Line color"
-msgstr "Barva obrysu"
-
-#: ../src/stock.c:97 ../src/stock.c:99
+#: ../src/stock.c:95 ../src/stock.c:97
 msgid "Linked"
 msgstr "SvÃ¡zÃ¡no"
 
-#: ../src/stock.c:98 ../src/stock.c:100
+#: ../src/stock.c:96 ../src/stock.c:98
 msgid "Not Linked"
 msgstr "NesvÃ¡zÃ¡no"
 
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "NÃ¡vrhÃ¡Å? Å¡ablon gLabels"
+
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr "VÃtejte"
+
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "NÃ¡zev a popis"
+
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Velikost strÃ¡nky"
+
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Tvar etikety Ä?i vizitky"
+
+#: ../src/template-designer.c:661
+msgid "Label or Card Size"
+msgstr "Velikost etikety Ä?i vizitky"
+
+#: ../src/template-designer.c:760
+msgid "Label Size (round)"
+msgstr "Velikost etikety (ovÃ¡lnÃ¡)"
+
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Velikost etikety (CD/DVD)"
+
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "PoÄ?et rozvrÅ¾enÃ"
+
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "RozvrÅ¾enÃ"
+
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "NÃ¡vrh byl dokonÄ?en"
+
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "NÃ¡vrhÃ¡Å? Å¡ablon gLabels"
+
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
+msgstr ""
+"<span foreground='red' weight='bold'>ZnaÄ?ka a produktovÃ© Ä?Ãslo odpovÃdajÃ "
+"jiÅ¾ existujÃcÃ Å¡ablonÄ?!</span>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -335,394 +1509,288 @@ msgstr "U_konÄ?it"
 msgid "Quit the program"
 msgstr "UkonÄ?it aplikaci"
 
-#: ../src/ui.c:180
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr ""
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr ""
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: ../src/ui.c:182
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Vyjmout vÃ½bÄ?r"
 
-#: ../src/ui.c:187
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr "KopÃrovat"
 
-#: ../src/ui.c:189
+#: ../src/ui.c:203
 msgid "Copy the selection"
 msgstr "KopÃrovat vÃ½bÄ?r"
 
-#: ../src/ui.c:194
-msgid "Paste"
-msgstr "VloÅ¾it"
-
-#: ../src/ui.c:196
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr "VloÅ¾it ze schrÃ¡nky"
 
-#: ../src/ui.c:201
-msgid "Delete"
-msgstr "Smazat"
-
-#: ../src/ui.c:203
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Smazat vybranÃ© objekty"
 
-#: ../src/ui.c:208
+#: ../src/ui.c:222
 msgid "Select All"
 msgstr "Vybrat vÅ¡e"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:224
 msgid "Select all objects"
 msgstr "Vybrat vÅ¡echny objekty"
 
-#: ../src/ui.c:215
+#: ../src/ui.c:229
 msgid "Un-select All"
 msgstr "ZruÅ¡it vÃ½bÄ?r"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "ZruÅ¡it vÃ½bÄ?r vÅ¡echo"
 
-#: ../src/ui.c:222
+#: ../src/ui.c:236
 msgid "Preferences"
 msgstr "PÅ?edvolby"
 
-#: ../src/ui.c:224
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr "Nastavit aplikaci"
 
-#: ../src/ui.c:231
+#: ../src/ui.c:245
 msgid "Zoom in"
 msgstr "PÅ?iblÃÅ¾it"
 
-#: ../src/ui.c:233
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "ZvÄ?tÅ¡it pÅ?iblÃÅ¾enÃ"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:252
 msgid "Zoom out"
 msgstr "OddÃ¡lit"
 
-#: ../src/ui.c:240
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr "ZmenÅ¡it pÅ?iblÃÅ¾enÃ"
 
-#: ../src/ui.c:245
+#: ../src/ui.c:259
 msgid "Zoom 1 to 1"
 msgstr "PÅ?iblÃÅ¾enÃ 1:1"
 
-#: ../src/ui.c:247
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr "Obnovit mÄ?Å?Ãtko na 100%"
 
-#: ../src/ui.c:252
+#: ../src/ui.c:266
 msgid "Zoom to fit"
 msgstr "PÅ?izpÅ¯sobit velikosti"
 
-#: ../src/ui.c:254
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr "PÅ?izpÅ¯sobit mÄ?Å?Ãtko velikosti okna"
 
-#: ../src/ui.c:261
+#: ../src/ui.c:275
 msgid "Select Mode"
 msgstr "ReÅ¾im vÃ½bÄ?ru"
 
-#: ../src/ui.c:263
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "VÃ½bÄ?r, pÅ?esun a Ãºpravy objektÅ¯"
 
-#: ../src/ui.c:268 ../src/view-text.c:494
-#: ../data/glade/object-editor.glade.h:32
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Text"
 
-#: ../src/ui.c:270
-msgid "Create text object"
-msgstr "VytvoÅ?it textovÃ½ objekt"
-
-#: ../src/ui.c:275
+#: ../src/ui.c:289
 msgid "Box"
 msgstr "ObdÃ©lnÃk"
 
-#: ../src/ui.c:277
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr "VytvoÅ?it Ä?tverec/obdÃ©lnÃk"
 
-#: ../src/ui.c:282 ../data/glade/object-editor.glade.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Ä?Ã¡ra"
 
-#: ../src/ui.c:284
-msgid "Create line object"
-msgstr "VytvoÅ?it Ä?Ã¡ru"
-
-#: ../src/ui.c:289
+#: ../src/ui.c:303
 msgid "Ellipse"
 msgstr "Elipsa"
 
-#: ../src/ui.c:291
+#: ../src/ui.c:305
 msgid "Create ellipse/circle object"
 msgstr "VytvoÅ?it elipsu/kruh"
 
-#: ../src/ui.c:296 ../data/glade/object-editor.glade.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "ObrÃ¡zek"
 
-#: ../src/ui.c:298
-msgid "Create image object"
-msgstr "VytvoÅ?it objekt s obrÃ¡zkem"
-
-#: ../src/ui.c:303
+#: ../src/ui.c:317
 msgid "Barcode"
 msgstr "Ä?Ã¡rovÃ½ kÃ³d"
 
-#: ../src/ui.c:305
-msgid "Create barcode object"
-msgstr "VytvoÅ?it objekt s Ä?Ã¡rovÃ½m kÃ³dem"
-
-#: ../src/ui.c:310
-msgid "Bring to front"
-msgstr "PÅ?enÃ©st dopÅ?edu"
-
-#: ../src/ui.c:312
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr "Vyzvednout objekt nahoru"
 
-#: ../src/ui.c:317
-msgid "Send to back"
-msgstr "PÅ?enÃ©st dozadu"
-
-#: ../src/ui.c:319
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr "Poslat objekt dozadu"
 
-#: ../src/ui.c:324
-msgid "Rotate left"
-msgstr "OtoÄ?it doleva"
-
-#: ../src/ui.c:326
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr "OtoÄ?it objekt o 90Â° proti smÄ?ru hodinovÃ½ch ruÄ?iÄ?ek"
 
-#: ../src/ui.c:331
-msgid "Rotate right"
-msgstr "OtoÄ?it doprava"
-
-#: ../src/ui.c:333
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr "OtoÄ?it objekt o 90Â° po smÄ?ru hodinovÃ½ch ruÄ?iÄ?ek"
 
-#: ../src/ui.c:338
-msgid "Flip horizontally"
-msgstr "PÅ?eklopit vodorovnÄ?"
-
-#: ../src/ui.c:340
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr "PÅ?eklopit objekt vodorovnÄ?"
 
-#: ../src/ui.c:345
-msgid "Flip vertically"
-msgstr "PÅ?eklopit svisle"
-
-#: ../src/ui.c:347
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr "PÅ?eklopit objekt svisle"
 
-#: ../src/ui.c:352
-msgid "Align left"
-msgstr "Zarovnat doleva"
-
-#: ../src/ui.c:354
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr "Zarovnat objekty levou hranou"
 
-#: ../src/ui.c:359
-msgid "Align right"
-msgstr "Zarovnat doprava"
-
-#: ../src/ui.c:361
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr "Zarovnat objekty pravou hranou"
 
-#: ../src/ui.c:366
-msgid "Align horizontal center"
-msgstr "Zarovnat vodorovnÄ? na stÅ?ed"
-
-#: ../src/ui.c:368
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr "Zarovnat objekty vodorovnÄ? na stÅ?ed"
 
-#: ../src/ui.c:373
-msgid "Align tops"
-msgstr "Zarovnat nahoru"
-
-#: ../src/ui.c:375
+#: ../src/ui.c:389
 msgid "Align objects to top edges"
 msgstr "Zarovnat objekty hornÃ hranou"
 
-#: ../src/ui.c:380
-msgid "Align bottoms"
-msgstr "Zarovnat dolÅ¯"
-
-#: ../src/ui.c:382
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr "Zarovnat objekty dolnÃ hranou"
 
-#: ../src/ui.c:387
-msgid "Align vertical center"
-msgstr "Zarovnat svisle na stÅ?ed"
-
-#: ../src/ui.c:389
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr "Zarovnat objekty svisle na stÅ?ed"
 
-#: ../src/ui.c:394
-msgid "Center horizontally"
-msgstr "VystÅ?edit vodorovnÄ?"
-
-#: ../src/ui.c:396
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr "VystÅ?edit objekty vodorovnÄ? na stÅ?ed etikety"
 
-#: ../src/ui.c:401
-msgid "Center vertically"
-msgstr "VystÅ?edit  svisle"
-
-#: ../src/ui.c:403
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr "VystÅ?edit  objekty svisle na stÅ?ed etikety"
 
-#: ../src/ui.c:408
-msgid "Merge properties"
-msgstr "Vlastnosti sluÄ?ovÃ¡nÃ"
-
-#: ../src/ui.c:410
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr "Upravit vlastnosti sluÄ?ovÃ¡nÃ"
 
-#: ../src/ui.c:417
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr "Obsah"
 
-#: ../src/ui.c:419
+#: ../src/ui.c:433
 msgid "Open glabels manual"
 msgstr "OtevÅ?Ãt pÅ?ÃruÄ?ku gLabels"
 
-#: ../src/ui.c:424
+#: ../src/ui.c:438
 msgid "About..."
 msgstr "O aplikaciâ?¦"
 
-#: ../src/ui.c:426
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr "O aplikaci gLabels"
 
-#: ../src/ui.c:436
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr "Panel vlastnostÃ"
 
-#: ../src/ui.c:438
+#: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr "ZmÄ?nit zobrazenÃ panelu vlastnostÃ v souÄ?asnÃ©m oknÄ?"
 
-#: ../src/ui.c:444 ../src/ui.c:489 ../src/ui.c:497
-msgid "Show tooltips"
-msgstr "Zobrazovat tipy"
-
-#: ../src/ui.c:446
-msgid "Show tooltips for property toolbar"
-msgstr "Zobrazovat tipy v panelu vlastnostÃ"
-
-#: ../src/ui.c:452
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr "MÅ?ÃÅ¾ka"
 
-#: ../src/ui.c:454
+#: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
 msgstr "ZmÄ?nit zobrazenÃ mÅ?ÃÅ¾ky v souÄ?asnÃ©m oknÄ?"
 
-#: ../src/ui.c:460
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr "OhraniÄ?enÃ"
 
-#: ../src/ui.c:462
+#: ../src/ui.c:468
 msgid "Change the visibility of markup lines in the current window"
 msgstr "ZmÄ?nit zobrazenÃ hraniÄ?nÃch Ä?ar v souÄ?asnÃ©m oknÄ?"
 
-#: ../src/ui.c:473
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr "HlavnÃ panel"
 
-#: ../src/ui.c:475
+#: ../src/ui.c:481
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "ZmÄ?nit zobrazenÃ hlavnÃho panelu nÃ¡strojÅ¯ v souÄ?asnÃ©m oknÄ?"
 
-#: ../src/ui.c:481
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr "Panel kreslenÃ"
 
-#: ../src/ui.c:483
+#: ../src/ui.c:489
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "ZmÄ?nit zobrazenÃ panelu kreslenÃ v souÄ?asnÃ©m oknÄ?"
 
-#: ../src/ui.c:491
-msgid "Show tooltips for main toolbar"
-msgstr "Zobrazovat tipy v hlavnÃm panelu"
-
-#: ../src/ui.c:499
-msgid "Show tooltips for drawing toolbar"
-msgstr "Zobrazovat tipy v panelu kreslenÃ"
-
-#: ../src/ui-property-bar.c:1232 ../src/object-editor.c:587
-#: ../src/object-editor.c:593
-msgid "Default"
-msgstr "VÃ½chozÃ"
-
-#: ../src/ui-property-bar.c:1239 ../src/object-editor.c:599
-msgid "No line"
-msgstr "Bez obrysu"
-
-#: ../src/ui-property-bar.c:1247 ../src/object-editor.c:606
-msgid "No fill"
-msgstr "Bez vÃ½plnÄ?"
-
-#: ../src/ui-sidebar.c:152
-msgid "Object properties"
-msgstr "Vlastnosti objektu"
-
-#: ../src/ui-commands.c:1084
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "Aplikace gLabels obsahuje pÅ?ÃspÄ?vky od:"
 
-#: ../src/ui-commands.c:1090
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr "DoplÅ?ujÃcÃ informace o zÃ¡sluhÃ¡ch najdete v souboru AUTHORS,"
 
-#: ../src/ui-commands.c:1091
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
 msgstr "nebo navÅ¡tivte http://glabels.sourceforge.net/";
 
-#: ../src/ui-commands.c:1103
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr "Program na vytvÃ¡Å?enÃ etiket a vizitek.\n"
 
-#: ../src/ui-commands.c:1107
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr ""
 "David MakovskÃ½ <yakeen sannyas-on net>\n"
 "ZbynÄ?k MrkviÄ?ka <zbynek oachot cz>\n"
 "Marek Ä?ernockÃ½ <marek manet cz>"
 
-#: ../src/ui-commands.c:1110
+#: ../src/ui-commands.c:1161
+#, fuzzy
 msgid ""
-"Glabels is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
-"the GNU General Public License for more details.\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 msgstr ""
 "Aplikace gLabels je svobodnÃ½ software: MÅ¯Å¾ete jej dÃ¡le Å¡ÃÅ?it a/nebo "
 "upravovat za podmÃnek licence GNU General Public License v podobÄ?, v jakÃ© ji "
@@ -733,742 +1801,90 @@ msgstr ""
 "a to i bez pÅ?edpoklÃ¡danÃ© zÃ¡ruky na PRODEJNOST nebo VHODNOST PRO KONKRÃ?TNÃ? "
 "Ã?Ä?EL. VÃce podrobnostÃ najdete pÅ?Ãmo v licenci GNU General Public License.\n"
 
-#: ../src/ui-commands.c:1136
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "glabels"
 
-#: ../src/file.c:91
-msgid "New Label or Card"
-msgstr "NovÃ¡ etiketa Ä?i vizitka"
-
-#: ../src/file.c:191
-msgid "Label properties"
-msgstr "Vlastnosti etikety"
-
-#: ../src/file.c:292 ../src/file.c:578
-msgid "All files"
-msgstr "VÅ¡echny soubory"
-
-#: ../src/file.c:297 ../src/file.c:583
-msgid "gLabels documents"
-msgstr "Dokumenty gLabels"
-
-#: ../src/file.c:343 ../src/file.c:640
-msgid "Empty file name selection"
-msgstr "PrÃ¡zdnÃ© pole s nÃ¡zvem souboru"
-
-#: ../src/file.c:346 ../src/file.c:362
-msgid "Please select a file or supply a valid file name"
-msgstr "Vyberte, prosÃm, soubor, nebo zadejte platnÃ½ nÃ¡zev souboru"
-
-#: ../src/file.c:359
-msgid "File does not exist"
-msgstr "Soubor neexistuje"
-
-#: ../src/file.c:433
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "Nelze otevÅ?Ãt soubor â??%sâ??"
-
-#: ../src/file.c:436
-msgid "Not a supported file format"
-msgstr "FormÃ¡t tohoto souboru nenÃ podporovÃ¡n"
-
-#: ../src/file.c:513 ../src/file.c:690
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "Nelze uloÅ¾it soubor â??%sâ??"
-
-#: ../src/file.c:517 ../src/file.c:694
-msgid "Error encountered during save.  The file is still not saved."
-msgstr "PÅ?i uklÃ¡dÃ¡nÃ se vyskytla chyba. Soubor nebyl uloÅ¾en."
-
-#: ../src/file.c:556
-#, c-format
-msgid "Save \"%s\" as"
-msgstr "UloÅ¾it â??%sâ?? jako"
-
-#: ../src/file.c:643
-msgid "Please supply a valid file name"
-msgstr "Zadejte prosÃm platnÃ½ nÃ¡zev souboru"
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "Chyba aplikace gLabels!"
 
-#: ../src/file.c:664
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "PÅ?epsat soubor â??%sâ???"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(Å¾Ã¡dnÃ©) - gLabels"
 
-#: ../src/file.c:668
-msgid "File already exists."
-msgstr "Soubor jiÅ¾ existuje."
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(zmÄ?nÄ?no)"
 
-#: ../src/file.c:764
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "UloÅ¾it pÅ?ed zavÅ?enÃm zmÄ?ny v dokumentu â??%sâ???"
-
-#: ../src/file.c:768
-msgid "Your changes will be lost if you don't save them."
-msgstr "VaÅ¡e zmÄ?ny budou ztraceny, pokud je neuloÅ¾Ãte."
-
-#: ../src/file.c:771
-msgid "Close without saving"
-msgstr "ZavÅ?Ãt bez uloÅ¾enÃ"
-
-#. Should not happen
-#: ../src/prefs.c:159 ../src/prefs.c:166
-#: ../data/glade/object-editor.glade.h:43
-#: ../data/glade/prefs-dialog.glade.h:22
-msgid "points"
-msgstr "body"
-
-#: ../src/prefs.c:161 ../data/glade/object-editor.glade.h:42
-#: ../data/glade/template-designer.glade.h:64
-msgid "inches"
-msgstr "palce"
-
-#: ../src/prefs.c:163
-msgid "mm"
-msgstr "mm"
-
-#: ../src/prefs-dialog.c:162 ../data/glade/prefs-dialog.glade.h:21
-msgid "gLabels Preferences"
-msgstr "PÅ?edvolby gLabels"
-
-#. Build editor.
-#: ../src/view-box.c:175
-msgid "Box object properties"
-msgstr "Vlastnosti obdÃ©lnÃku"
-
-#. Build editor.
-#: ../src/view-ellipse.c:175
-msgid "Ellipse object properties"
-msgstr "Vlastnosti elipsy"
-
-#. Build editor.
-#: ../src/view-line.c:174
-msgid "Line object properties"
-msgstr "Vlastnosti Ä?Ã¡ry"
-
-#. Build editor.
-#: ../src/view-image.c:174
-msgid "Image object properties"
-msgstr "Vlastnosti obrÃ¡zku"
-
-#. Build editor.
-#: ../src/view-text.c:178
-msgid "Text object properties"
-msgstr "Vlastnosti textu"
-
-#. Build editor.
-#: ../src/view-barcode.c:174
-msgid "Barcode object properties"
-msgstr "Vlastnosti Ä?Ã¡rovÃ©ho kÃ³du"
-
-#: ../src/object-editor-image-page.c:270
-msgid "All Files"
-msgstr "VÅ¡echny soubory"
-
-#: ../src/object-editor-image-page.c:275
-msgid "All Images"
-msgstr "VÅ¡echny obrÃ¡zky"
+msgid "Bad root node = \"%s\""
+msgstr "NeplatnÃ½ koÅ?enovÃ½ uzel = â??%sâ??"
 
-#: ../src/object-editor-image-page.c:290
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/merge-properties-dialog.c:263
-msgid "Merge Properties"
-msgstr "Vlastnosti sluÄ?ovÃ¡nÃ"
-
-#: ../src/merge-properties-dialog.c:289 ../src/merge-properties-dialog.c:397
-msgid "Select merge-database source"
-msgstr "VÃ½bÄ?r databÃ¡zovÃ©ho zdroje pro sluÄ?ovÃ¡nÃ"
-
-#: ../src/merge-properties-dialog.c:298 ../src/merge-properties-dialog.c:417
-msgid "N/A"
-msgstr "NeurÄ?eno"
-
-#: ../src/merge-properties-dialog.c:324
-msgid "Select"
-msgstr "VÃ½bÄ?r"
-
-#: ../src/merge-properties-dialog.c:332
-msgid "Record/Field"
-msgstr "ZÃ¡znam/Pole"
-
-#: ../src/merge-properties-dialog.c:340 ../data/glade/object-editor.glade.h:10
-msgid "Data"
-msgstr "Data"
-
-#: ../src/merge-properties-dialog.c:410
-msgid "Fixed"
-msgstr "Napevno"
-
-#. ===================================================================
-#: ../src/print-op.c:237 ../src/wdgt-print-copies.c:171
-#: ../data/templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "Etikety"
-
-#: ../src/template-designer.c:358
-msgid "gLabels Template Designer"
-msgstr "NÃ¡vrhÃ¡Å? Å¡ablon gLabels"
-
-#: ../src/template-designer.c:419
-msgid "Welcome"
-msgstr "VÃtejte"
-
-#: ../src/template-designer.c:463
-msgid "Name and Description"
-msgstr "NÃ¡zev a popis"
-
-#: ../src/template-designer.c:516
-msgid "Page Size"
-msgstr "Velikost strÃ¡nky"
-
-#: ../src/template-designer.c:587
-msgid "Label or Card Shape"
-msgstr "Tvar etikety Ä?i vizitky"
-
-#: ../src/template-designer.c:637
-msgid "Label or Card Size"
-msgstr "Velikost etikety Ä?i vizitky"
-
-#: ../src/template-designer.c:737
-msgid "Label Size (round)"
-msgstr "Velikost etikety (ovÃ¡lnÃ¡)"
-
-#: ../src/template-designer.c:820
-msgid "Label Size (CD/DVD)"
-msgstr "Velikost etikety (CD/DVD)"
-
-#: ../src/template-designer.c:913
-msgid "Number of Layouts"
-msgstr "PoÄ?et rozvrÅ¾enÃ"
-
-#: ../src/template-designer.c:976
-msgid "Layout(s)"
-msgstr "RozvrÅ¾enÃ"
-
-#: ../src/template-designer.c:1087
-msgid "Design Completed"
-msgstr "NÃ¡vrh byl dokonÄ?en"
-
-#: ../src/template-designer.c:1253
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
-msgstr ""
-"<span foreground='red' weight='bold'>ZnaÄ?ka a produktovÃ© Ä?Ãslo odpovÃdajÃ "
-"jiÅ¾ existujÃcÃ Å¡ablonÄ?!</span>"
-
-#: ../src/bc.c:67
-msgid "POSTNET (any)"
-msgstr "POSTNET (jakÃ½koli)"
-
-#: ../src/bc.c:70
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (pouze PSÄ?)"
-
-#: ../src/bc.c:73
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (PSÄ?+4)"
-
-#: ../src/bc.c:76
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
-
-#: ../src/bc.c:79
-msgid "CEPNET"
-msgstr "CEPNET"
-
-#: ../src/bc.c:82
-msgid "EAN (any)"
-msgstr "EAN (jakÃ½koli)"
-
-#: ../src/bc.c:85
-msgid "EAN-8"
-msgstr "EAN-8"
-
-#: ../src/bc.c:88
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
-
-#: ../src/bc.c:91
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
-
-#: ../src/bc.c:94
-msgid "EAN-13"
-msgstr "EAN-13"
-
-#: ../src/bc.c:97
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
-
-#: ../src/bc.c:100
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
-
-#: ../src/bc.c:103
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A nebo UPC-E)"
-
-#: ../src/bc.c:106
-msgid "UPC-A"
-msgstr "UPC-A"
-
-#: ../src/bc.c:109
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
-
-#: ../src/bc.c:112
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
-
-#: ../src/bc.c:115
-msgid "UPC-E"
-msgstr "UPC-E"
-
-#: ../src/bc.c:118
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
-
-#: ../src/bc.c:121
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
-
-#: ../src/bc.c:124
-msgid "ISBN"
-msgstr "ISBN"
-
-#: ../src/bc.c:127
-msgid "ISBN +5"
-msgstr "ISBN +5"
-
-#: ../src/bc.c:130
-msgid "Code 39"
-msgstr "Code 39"
-
-#: ../src/bc.c:133
-msgid "Code 128"
-msgstr "Code 128"
-
-#: ../src/bc.c:136
-msgid "Code 128C"
-msgstr "Code 128C"
-
-#: ../src/bc.c:139
-msgid "Code 128B"
-msgstr "Code 128B"
-
-#: ../src/bc.c:142
-msgid "Interleaved 2 of 5"
-msgstr "ProklÃ¡danÃ½ 2 z 5"
-
-#: ../src/bc.c:145
-msgid "Codabar"
-msgstr "Codabar"
-
-#: ../src/bc.c:148
-msgid "MSI"
-msgstr "MSI"
-
-#: ../src/bc.c:151
-msgid "Plessey"
-msgstr "Plessey"
-
-#: ../src/bc.c:154
-msgid "IEC16022 (DataMatrix)"
-msgstr "IEC16022 (DataMatrix)"
-
-#: ../src/label.c:531
-msgid "Untitled"
-msgstr "NepojmenovanÃ½"
-
-#: ../src/label-barcode.c:426
-msgid "Barcode data empty"
-msgstr "Data pro Ä?Ã¡rovÃ½ kÃ³d jsou prÃ¡zdnÃ¡"
-
-#: ../src/label-barcode.c:430
-msgid "Invalid barcode data"
-msgstr "Data pro Ä?Ã¡rovÃ½ kÃ³d jsou neplatnÃ¡"
+msgid "bad node =  \"%s\""
+msgstr "neplatnÃ½ uzel = â??%sâ??"
 
-#: ../src/xml-label.c:193
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "chyba xmlParseFile"
 
-#: ../src/xml-label.c:234
-msgid "xmlParseDoc error"
-msgstr "chyba xmlParseDoc"
-
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "SchÃ¡zÃ koÅ?en dokumentu"
 
-#: ../src/xml-label.c:278
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Importuje se z formÃ¡tu glabels verze 0.1"
 
-#: ../src/xml-label.c:287
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Importuje se z formÃ¡tu glabels verze 0.4"
 
-#: ../src/xml-label.c:296
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "NeznÃ¡mÃ½ jmennÃ½ prostor pro gLabels -- pouÅ¾ije se %s"
 
-#: ../src/xml-label.c:327 ../src/xml-label-04.c:79
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "NeplatnÃ½ koÅ?enovÃ½ uzel = â??%sâ??"
-
-#: ../src/xml-label.c:364
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "neplatnÃ½ uzel v uzlu Document = â??%sâ??"
 
-#: ../src/xml-label.c:409 ../src/xml-label-04.c:127
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "neplatnÃ½ uzel = â??%sâ??"
-
-#: ../src/xml-label.c:851
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "neplatnÃ½ uzel v uzlu Data = â??%sâ??"
 
-#: ../src/xml-label.c:1088 ../libglabels/xml-template.c:682
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "NeznÃ¡mÃ© ID nebo nÃ¡zev velikosti strÃ¡nky â??%sâ??"
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Chyba pÅ?i pÅ?evodu UTF-8"
 
-#: ../src/xml-label.c:1095
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "ProblÃ©m pÅ?i uklÃ¡dÃ¡nÃ do souboru xml."
 
-#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378
-msgid "None"
-msgstr "Å½Ã¡dnÃ½"
-
-#: ../src/merge-init.c:59
-msgid "Text file with comma delimeters (CSV)"
-msgstr "TextovÃ½ soubor se sloupci oddÄ?lenÃ½mi Ä?Ã¡rkami (CSV)"
-
-#: ../src/merge-init.c:66
-msgid "Text file with colon delimeters"
-msgstr "TextovÃ½ soubor se sloupci oddÄ?lenÃ½mi dvojteÄ?kami"
-
-#: ../src/merge-init.c:73
-msgid "Text file with tab delimeters"
-msgstr "TextovÃ½ soubor se sloupci oddÄ?lenÃ½mi tabulÃ¡tory"
-
-#: ../src/merge-init.c:82
-msgid "Data from default Evolution Addressbook"
-msgstr "Data z vÃ½chozÃho adresÃ¡Å?e Evolution"
-
-#: ../src/merge-init.c:88
-msgid "Data from a file containing VCards"
-msgstr "Data ze souboru obsahujÃcÃho kontakty ve formÃ¡tu VCards"
-
-#: ../src/merge-evolution.c:309
-msgid "Couldn't construct query"
-msgstr "Nelze sestavit dotaz"
-
-#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326
-msgid "Couldn't open addressbook."
-msgstr "Nelze otevÅ?Ãt adresÃ¡Å?."
-
-#: ../src/merge-evolution.c:341
-msgid "Couldn't list available fields."
-msgstr "Nelze vytvoÅ?it seznam dostupnÃ½ch polÃ."
-
-#: ../src/merge-evolution.c:377
-msgid "Couldn't get contacts."
-msgstr "Nelze zÃskat kontakt."
-
-#: ../src/wdgt-print-copies.c:153
-msgid "Sheets:"
-msgstr "StrÃ¡nky:"
-
-#: ../src/wdgt-print-copies.c:173
-msgid "from:"
-msgstr "od:"
-
-#: ../src/wdgt-print-copies.c:178
-msgid "to:"
-msgstr "do:"
-
-#: ../src/wdgt-print-merge.c:154
-msgid "Start on label"
-msgstr "ZaÄ?Ãt na etiketÄ?"
-
-#: ../src/wdgt-print-merge.c:159
-msgid "on 1st sheet"
-msgstr "na prvnÃ strÃ¡nce"
-
-#: ../src/wdgt-print-merge.c:168
-msgid "Copies:"
-msgstr "Kopie:"
-
-#: ../src/wdgt-print-merge.c:173
-msgid "Collate"
-msgstr "SeÅ?adit"
-
-#: ../src/wdgt-media-select.c:288 ../src/wdgt-media-select.c:292
-#: ../src/wdgt-media-select.c:297 ../src/wdgt-media-select.c:306
-#: ../src/wdgt-media-select.c:309 ../src/wdgt-media-select.c:402
-#: ../src/wdgt-media-select.c:609 ../src/wdgt-media-select.c:618
-msgid "Any"
-msgstr "LibovolnÃ¡"
-
-#: ../src/wdgt-media-select.c:643
-#, c-format
-msgid "%d per sheet"
-msgstr "%d na strÃ¡nku"
-
-#: ../src/wdgt-media-select.c:673
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s Ã? %s %s"
-
-#: ../src/wdgt-media-select.c:678
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g Ã? %.5g %s"
-
-#: ../src/wdgt-media-select.c:689 ../src/wdgt-media-select.c:703
-#, c-format
-msgid "%s %s diameter"
-msgstr "prÅ¯mÄ?r %s %s"
-
-#: ../src/wdgt-media-select.c:693 ../src/wdgt-media-select.c:707
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "prÅ¯mÄ?r %.5g %s"
-
-#: ../src/wdgt-media-select.c:781
-msgid "No recent templates found."
-msgstr "Nenalezeny Å¾Ã¡dnÃ© nedÃ¡vno pouÅ¾itÃ© Å¡ablony."
-
-#: ../src/wdgt-media-select.c:782
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr "Zkuste vybrat Å¡ablonu na kartÄ? â??Vyhledat ve vÅ¡ech Å¡ablonÃ¡châ??."
-
-#: ../src/wdgt-media-select.c:861
-msgid "No match."
-msgstr "Å½Ã¡dnÃ¡ neodpovÃdÃ¡."
-
-#: ../src/wdgt-media-select.c:862
-msgid "Try selecting a different brand, page size or category."
-msgstr "Zkuste vybrat jinou znaÄ?ku, velikost strÃ¡nky nebo kategorii."
-
-#. This is the default custom color
-#: ../src/mygal/color-palette.c:389
-msgid "custom"
-msgstr "vlastnÃ"
-
-#. "Custom" color - we'll pop up a GtkColorButton
-#: ../src/mygal/color-palette.c:431
-msgid "Custom Color:"
-msgstr "VlastnÃ barva"
-
-#: ../src/mygal/color-palette.c:439
-msgid "Choose Custom Color"
-msgstr "Vyberte vlastnÃ barvu"
-
-#: ../src/mygal/color-palette.c:572
-msgid "black"
-msgstr "Ä?ernÃ¡"
-
-#: ../src/mygal/color-palette.c:573
-msgid "light brown"
-msgstr "svÄ?tle hnÄ?dÃ¡"
-
-#: ../src/mygal/color-palette.c:574
-msgid "brown gold"
-msgstr "zlatohnÄ?dÃ¡"
-
-#: ../src/mygal/color-palette.c:575
-msgid "dark green #2"
-msgstr "tmavÄ? zelenÃ¡ Ä?. 2"
-
-#: ../src/mygal/color-palette.c:576
-msgid "navy"
-msgstr "nÃ¡moÅ?nickÃ¡ modÅ?"
-
-#: ../src/mygal/color-palette.c:577 ../src/mygal/color-palette.c:633
-msgid "dark blue"
-msgstr "tmavÄ? modrÃ¡"
-
-#: ../src/mygal/color-palette.c:578
-msgid "purple #2"
-msgstr "purpurovÃ¡ Ä?. 2"
-
-#: ../src/mygal/color-palette.c:579
-msgid "very dark gray"
-msgstr "velmi tmavÄ? Å¡edÃ¡"
-
-#: ../src/mygal/color-palette.c:582 ../src/mygal/color-palette.c:638
-msgid "dark red"
-msgstr "tmavÄ? Ä?ervenÃ¡"
-
-#: ../src/mygal/color-palette.c:583
-msgid "red-orange"
-msgstr "Ä?ervenooranÅ¾ovÃ¡"
-
-#: ../src/mygal/color-palette.c:584
-msgid "gold"
-msgstr "zlatÃ¡"
-
-#: ../src/mygal/color-palette.c:585
-msgid "dark green"
-msgstr "tmavÄ? zelenÃ¡"
-
-#: ../src/mygal/color-palette.c:586 ../src/mygal/color-palette.c:639
-msgid "dull blue"
-msgstr "matnÃ¡ modrÃ¡"
-
-#: ../src/mygal/color-palette.c:587 ../src/mygal/color-palette.c:640
-msgid "blue"
-msgstr "modrÃ¡"
-
-#: ../src/mygal/color-palette.c:588
-msgid "dull purple"
-msgstr "matnÃ¡ purpurovÃ¡"
-
-#: ../src/mygal/color-palette.c:589
-msgid "dark grey"
-msgstr "tmavÄ? Å¡edÃ¡"
-
-#: ../src/mygal/color-palette.c:592
-msgid "red"
-msgstr "Ä?ervenÃ¡"
-
-#: ../src/mygal/color-palette.c:593
-msgid "orange"
-msgstr "oranÅ¾ovÃ¡"
-
-#: ../src/mygal/color-palette.c:594
-msgid "lime"
-msgstr "citrÃ³novÃ¡"
-
-#: ../src/mygal/color-palette.c:595
-msgid "dull green"
-msgstr "matnÃ¡ zelenÃ¡"
-
-#: ../src/mygal/color-palette.c:596
-msgid "dull blue #2"
-msgstr "matnÃ¡ modrÃ¡ Ä?. 2"
-
-#: ../src/mygal/color-palette.c:597
-msgid "sky blue #2"
-msgstr "nebeskÃ¡ modÅ? Ä?. 2"
-
-#: ../src/mygal/color-palette.c:598 ../src/mygal/color-palette.c:637
-msgid "purple"
-msgstr "purpurovÃ¡"
-
-#: ../src/mygal/color-palette.c:599
-msgid "gray"
-msgstr "Å¡edÃ¡"
-
-#: ../src/mygal/color-palette.c:602 ../src/mygal/color-palette.c:634
-msgid "magenta"
-msgstr "fialovÃ¡"
-
-#: ../src/mygal/color-palette.c:603
-msgid "bright orange"
-msgstr "jasnÄ? oranÅ¾ovÃ¡"
-
-#: ../src/mygal/color-palette.c:604 ../src/mygal/color-palette.c:635
-msgid "yellow"
-msgstr "Å¾ludÃ¡"
-
-#: ../src/mygal/color-palette.c:605
-msgid "green"
-msgstr "zelenÃ¡"
-
-#: ../src/mygal/color-palette.c:606 ../src/mygal/color-palette.c:636
-msgid "cyan"
-msgstr "azurovÃ¡"
-
-#: ../src/mygal/color-palette.c:607
-msgid "bright blue"
-msgstr "jasnÄ? modrÃ¡"
-
-#: ../src/mygal/color-palette.c:608 ../src/mygal/color-palette.c:625
-msgid "red purple"
-msgstr "Ä?ervenofialovÃ¡"
-
-#: ../src/mygal/color-palette.c:609
-msgid "light grey"
-msgstr "svÄ?tle Å¡edÃ¡"
-
-#: ../src/mygal/color-palette.c:612 ../src/mygal/color-palette.c:629
-msgid "pink"
-msgstr "rÅ¯Å¾ovÃ¡"
-
-#: ../src/mygal/color-palette.c:613
-msgid "light orange"
-msgstr "svÄ?tle oranÅ¾ovÃ¡"
-
-#: ../src/mygal/color-palette.c:614 ../src/mygal/color-palette.c:626
-msgid "light yellow"
-msgstr "svÄ?tle Å¾lutÃ¡"
-
-#: ../src/mygal/color-palette.c:615
-msgid "light green"
-msgstr "svÄ?tle zelenÃ¡"
-
-#: ../src/mygal/color-palette.c:616
-msgid "light cyan"
-msgstr "svÄ?tle azurovÃ¡"
-
-#: ../src/mygal/color-palette.c:617 ../src/mygal/color-palette.c:627
-msgid "light blue"
-msgstr "svÄ?tle modrÃ¡"
-
-#: ../src/mygal/color-palette.c:618 ../src/mygal/color-palette.c:631
-msgid "light purple"
-msgstr "svÄ?tle purpurovÃ¡"
-
-#: ../src/mygal/color-palette.c:619
-msgid "white"
-msgstr "bÃlÃ¡"
-
-#: ../src/mygal/color-palette.c:624
-msgid "purplish blue"
-msgstr "fialovomodrÃ¡"
-
-#: ../src/mygal/color-palette.c:628
-msgid "dark purple"
-msgstr "tmavÄ? purpurovÃ¡"
-
-#: ../src/mygal/color-palette.c:630
-msgid "sky blue"
-msgstr "nebeskÃ¡ modÅ?"
-
-#: ../src/critical-error-handler.c:73
-msgid "gLabels Fatal Error!"
-msgstr "KritickÃ¡ chyba aplikace gLabels!"
-
-#: ../src/warning-handler.c:73
-msgid "gLabels Error!"
-msgstr "Chyba aplikace gLabels!"
-
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:118
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "JinÃ©"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:131
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "DefinovanÃ© uÅ¾ivatelem"
 
-#: ../libglabels/db.c:482
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1476,7 +1892,7 @@ msgstr ""
 "Nelze najÃt definice velikostÃ papÃru. MoÅ¾nÃ¡ nenÃ sprÃ¡vnÄ? nainstalovanÃ¡ "
 "knihovna libglabels!"
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1484,7 +1900,7 @@ msgstr ""
 "Nelze najÃt definice kategoriÃ. MoÅ¾nÃ¡ nenÃ sprÃ¡vnÄ? nainstalovanÃ¡ knihovna "
 "libglabels!"
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1492,12 +1908,69 @@ msgstr ""
 "Nelze najÃt Å¾Ã¡dnÃ½ soubor s Å¡ablonou. MoÅ¾nÃ¡ nenÃ sprÃ¡vnÄ? nainstalovanÃ¡ "
 "knihovna libglabels!"
 
-#: ../libglabels/db.c:1538
-#, c-format
-msgid "Generic %s full page template"
+#: ../libglabels/db.c:2164
+#, fuzzy, c-format
+msgid "%s full page label"
 msgstr "ObecnÃ¡ Å¡ablona na celou stranu %s"
 
-#: ../libglabels/xml-template.c:227
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d na strÃ¡nku"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr "%d na strÃ¡nku"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "prÅ¯mÄ?r %s %s"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "body"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "palce"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
+
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr "SchÃ¡zÃ atributy nÃ¡zev nebo znaÄ?ka/produkt."
 
@@ -1513,394 +1986,409 @@ msgstr "NeznÃ¡mÃ© ID velikosti papÃru â??%sâ??, zkusÃ se pouÅ¾Ãt jako nÃ¡zev"
 msgid "Unknown page size id or name \"%s\""
 msgstr "NeznÃ¡mÃ© ID nebo nÃ¡zev velikosti strÃ¡nky â??%sâ??"
 
-#: ../libglabels/xml-template.c:627
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
+
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 "SchÃ¡zÃ vyÅ¾adovanÃ© atributy â??znaÄ?kaâ?? nebo â??produktâ??, zkouÅ¡Ã se pouÅ¾Ãt "
 "nepÅ?ÃpustnÃ½ nÃ¡zev."
 
-#: ../libglabels/xml-template.c:637
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr "SchÃ¡zÃ takÃ© nÃ¡zev atributu."
 
-#: ../data/glade/merge-properties-dialog.glade.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>VÃ½bÄ?r/nÃ¡hled zÃ¡znamu</b>"
-
-#: ../data/glade/merge-properties-dialog.glade.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Zdroj</b>"
-
-#: ../data/glade/merge-properties-dialog.glade.h:3
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "FormÃ¡t:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "UmÃstÄ?nÃ:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>VÃ½bÄ?r/nÃ¡hled zÃ¡znamu</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Vybrat vÅ¡e"
 
-#: ../data/glade/merge-properties-dialog.glade.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Zdroj</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "ZruÅ¡it vÃ½bÄ?r"
 
-#: ../data/glade/merge-properties-dialog.glade.h:7
-#: ../data/glade/object-editor.glade.h:39
-msgid "dialog1"
-msgstr "dialog1"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr "ZnaÄ?ka:"
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Kategorie:"
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "vlastnÃ"
+
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "Velikost strÃ¡nky:"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Vybrat vÅ¡e"
+
+#: ../data/ui/new-label-dialog.ui.h:1
+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:27
+msgid "Description:"
+msgstr "Popis:"
 
-#: ../data/glade/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>Orientace etikety</b>"
+#: ../data/ui/new-label-dialog.ui.h:3
+#, fuzzy
+msgid "Label size:"
+msgstr "Velikost strÃ¡nky:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+#, fuzzy
+msgid "Layout:"
+msgstr "RozvrÅ¾enÃ"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "FormÃ¡t:"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "ProduktovÃ© Ä?Ãslo:"
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "OtoÄ?it"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
 
-#: ../data/glade/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>Typ mÃ©dia</b>"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
 
-#: ../data/glade/object-editor.glade.h:2
+#: ../data/ui/object-editor.ui.h:2
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/glade/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/glade/object-editor.glade.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Vlastnosti objektu xxx</span>"
-
-#: ../data/glade/object-editor.glade.h:5 ../data/glade/prefs-dialog.glade.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "ZarovnÃ¡nÃ:"
 
-#: ../data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "PÅ?i sluÄ?ovÃ¡nÃ povolit automatickÃ© zÃºÅ¾enÃ textu"
 
-#: ../data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Ã?hel:"
 
-#: ../data/glade/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "KontrolnÃ souÄ?et"
 
-#: ../data/glade/object-editor.glade.h:9 ../data/glade/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Barva:"
 
-#: ../data/glade/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Zapnout stÃn"
 
-#: ../data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Rodina:"
 
-#: ../data/glade/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Soubor:"
 
-#: ../data/glade/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "VÃ½plÅ?"
 
-#: ../data/glade/object-editor.glade.h:15
-#: ../data/glade/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "VÃ½Å¡ka:"
 
-#: ../data/glade/object-editor.glade.h:17
-msgid "Insert merge field"
-msgstr "VloÅ¾it pole pro sluÄ?ovÃ¡nÃ"
-
-#: ../data/glade/object-editor.glade.h:18
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "KlÃÄ?:"
 
-#: ../data/glade/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "DÃ©lka:"
 
-#: ../data/glade/object-editor.glade.h:21
-#: ../data/glade/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "Å?Ã¡dkovÃ¡nÃ:"
 
-#: ../data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Znaky:"
 
-#: ../data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "KrytÃ:"
 
-#: ../data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Pozice"
 
-#: ../data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "PÅ¯vodnÃ velikost obrÃ¡zku"
 
-#: ../data/glade/object-editor.glade.h:26
-msgid "Select A File"
-msgstr "VÃ½bÄ?r souboru"
-
-#: ../data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "StÃn"
 
-#: ../data/glade/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Velikost"
 
-#: ../data/glade/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Velikost:"
 
-#: ../data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Styl:"
 
-#: ../data/glade/object-editor.glade.h:33
-#: ../data/glade/prefs-dialog.glade.h:20
-#: ../data/glade/template-designer.glade.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Å ÃÅ?ka:"
 
-#: ../data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "Posun X:"
 
-#: ../data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/glade/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "Posun Y:"
 
-#: ../data/glade/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/glade/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "stupnÄ?"
 
-#: ../data/glade/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:35
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "Ä?Ãslic:"
 
-#: ../data/glade/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "formÃ¡t:"
 
-#: ../data/glade/prefs-dialog.glade.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/glade/prefs-dialog.glade.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">VÃ½chozÃ velikost strÃ¡nky</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">VÃ½plÅ?</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Obrys</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Text</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Jednotky</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "PÅ¯vodnÃ velikost obrÃ¡zku"
 
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "PÃsmo:"
 
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Palce"
 
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "NÃ¡rodnÃ prostÅ?edÃ"
 
-#: ../data/glade/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "Milimetry"
 
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "VÃ½chozÃ hodnoty objektu"
 
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Body"
 
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "Vyberte vÃ½chozÃ vlastnosti pro novÃ© objekty."
 
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "Vyberte specifickÃ© chovÃ¡nÃ pro nÃ¡rodnÃ prostÅ?edÃ."
 
-#. Most popular (at top of list)
-#: ../data/glade/prefs-dialog.glade.h:19
-#: ../data/templates/paper-sizes.xml.h:29
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
-#: ../data/glade/print-custom-widget.glade.h:1
-msgid "<b>Options</b>"
-msgstr "<b>Volby</b>"
-
-#: ../data/glade/print-custom-widget.glade.h:2
-msgid "<b>Print control (Merge)</b>"
-msgstr "<b>OvlÃ¡dÃ¡nÃ tisku (sluÄ?ovÃ¡nÃ)</b>"
-
-#: ../data/glade/print-custom-widget.glade.h:3
-msgid "<b>Print control (Simple)</b>"
-msgstr "<b>OvlÃ¡dÃ¡nÃ tisku (jednoduchÃ½)</b>"
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "NepojmenovanÃ½"
 
-#: ../data/glade/property-bar.glade.h:1
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "TuÄ?nÄ?"
 
-#: ../data/glade/property-bar.glade.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "Na stÅ?ed"
 
-#: ../data/glade/property-bar.glade.h:4
-msgid "Font family"
-msgstr "Rodina pÃsma"
-
-#: ../data/glade/property-bar.glade.h:5
-msgid "Font size"
-msgstr "Velikost pÃsma"
-
-#: ../data/glade/property-bar.glade.h:6
-msgid "Italic"
-msgstr "KurzÃva"
-
-#: ../data/glade/property-bar.glade.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "ZarovnÃ¡nÃ vlevo"
 
-#: ../data/glade/property-bar.glade.h:9
-msgid "Line width"
-msgstr "TlouÅ¡Å¥ka obrysu"
-
-#: ../data/glade/property-bar.glade.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "ZarovnÃ¡nÃ vpravo"
 
-#: ../data/glade/property-bar.glade.h:11
-msgid "Text Color"
-msgstr "Barva textu"
-
-#: ../data/glade/property-bar.glade.h:12
-msgid "Text color"
-msgstr "Barva textu"
-
-#: ../data/glade/template-designer.glade.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(napÅ?. â??AdresnÃ Å¡tÃtkyâ??, â??Vizitkyâ??, â?¦)"
 
-#: ../data/glade/template-designer.glade.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(napÅ?. 8163A)"
 
-#: ../data/glade/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(napÅ?. Avery, Acme, â?¦)"
 
-#: ../data/glade/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. VnÄ?jÅ¡Ã polomÄ?r:"
 
-#: ../data/glade/template-designer.glade.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. PolomÄ?r:"
 
-#: ../data/glade/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Å ÃÅ?ka:"
 
-#: ../data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. VÃ½Å¡ka:"
 
-#: ../data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. VnitÅ?nÃ polomÄ?r:"
 
-#: ../data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. OdsazenÃ (umoÅ¾Å?uje pÅ?etisk):"
 
-#: ../data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. Å ÃÅ?ka oÅ?ÃznutÃ:"
 
-#: ../data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Okraj"
 
-#: ../data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. ZaoblenÃ (polomÄ?r rohu):"
 
-#: ../data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. VÃ½Å¡ka oÅ?ÃznutÃ:"
 
-#: ../data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. VodorovnÃ© odsazenÃ (umoÅ¾Å?uje pÅ?etisk):"
 
-#: ../data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. SvislÃ© odsazenÃ (umoÅ¾Å?uje pÅ?etisk):"
 
-#: ../data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. OdsazenÃ (umoÅ¾Å?uje pÅ?etisk):"
 
-#: ../data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Okraj"
 
-#: ../data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "ZnaÄ?ka/VÃ½robce:"
 
-#: ../data/glade/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD (vÄ?etnÄ? vizitkovÃ½ch CD)"
 
-#: ../data/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1918,23 +2406,19 @@ msgstr ""
 "V opaÄ?nÃ©m pÅ?ÃpadÄ? kliknÄ?te na â??ZruÅ¡itâ?? pro zahozenÃ nÃ¡vrhu\n"
 "nebo na â??ZpÄ?tâ?? pro dalÅ¡Ã Ãºpravy tohoto nÃ¡vrhu."
 
-#: ../data/glade/template-designer.glade.h:27
-msgid "Description:"
-msgstr "Popis:"
-
-#: ../data/glade/template-designer.glade.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "VzdÃ¡lenost od levÃ©ho okraje (x0):"
 
-#: ../data/glade/template-designer.glade.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "VzdÃ¡lenost od hornÃho okraje (y0):"
 
-#: ../data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "VodorovnÃ¡ rozteÄ? (dx):"
 
-#: ../data/glade/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1948,47 +2432,38 @@ msgstr ""
 "jednoduchÃ© mÅ?ÃÅ¾ce. VÄ?tÅ¡ina Å¡ablon potÅ?ebuje jedno rozvrÅ¾enÃ jako v\n"
 "prvnÃm pÅ?Ãkladu. DruhÃ½ pÅ?Ãklad ilustruje dvÄ? rozvrÅ¾enÃ."
 
-#: ../data/glade/template-designer.glade.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "RozvrÅ¾enÃ Ä?. 1"
 
-#: ../data/glade/template-designer.glade.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "RozvrÅ¾enÃ Ä?. 2"
 
-#: ../data/glade/template-designer.glade.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "PoÄ?et napÅ?ÃÄ? (nx):"
 
-#: ../data/glade/template-designer.glade.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "PoÄ?et svisle (ny):"
 
-#: ../data/glade/template-designer.glade.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "PoÄ?et rozvrÅ¾enÃ:"
 
-#: ../data/glade/template-designer.glade.h:42
-#: ../data/glade/wdgt-media-select.glade.h:3
-msgid "Page size:"
-msgstr "Velikost strÃ¡nky:"
-
-#: ../data/glade/template-designer.glade.h:43
-msgid "Part #:"
-msgstr "ProduktovÃ© Ä?Ãslo:"
-
-#: ../data/glade/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr ""
 "VyplÅ?te, prosÃm, nÃ¡sledujÃcÃ identifikaÄ?nÃ informace o papÃru pro Å¡ablonu."
 
-#: ../data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "VyplÅ?te, prosÃm, nÃ¡sledujÃcÃ informaci o rozvrÅ¾enÃ."
 
-#: ../data/glade/template-designer.glade.h:46
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
@@ -1996,7 +2471,7 @@ msgstr ""
 "VyplÅ?te, prosÃm, nÃ¡sledujÃcÃ parametry velikosti jednÃ© etikety ve vaÅ¡Ã "
 "Å¡ablonÄ?."
 
-#: ../data/glade/template-designer.glade.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
@@ -2004,27 +2479,27 @@ msgstr ""
 "VyplÅ?te, prosÃm, nÃ¡sledujÃcÃ parametry velikosti jednÃ© etikety nebo vizitky "
 "ve vaÅ¡Ã Å¡ablonÄ?."
 
-#: ../data/glade/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr "Vyberte, prosÃm, zÃ¡kladnÃ tvar etiket nebo vizitek."
 
-#: ../data/glade/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "Vyberte, prosÃm, velikost strÃ¡nky papÃru pro Å¡ablonu."
 
-#: ../data/glade/template-designer.glade.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Vytisknout testovacÃ strÃ¡nku"
 
-#: ../data/glade/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "ObdÃ©lnÃkovÃ½ nebo Ä?tvercovÃ½ (mÅ¯Å¾e mÃt zaoblenÃ© rohy)"
 
-#: ../data/glade/template-designer.glade.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "OvÃ¡lnÃ½"
 
-#: ../data/glade/template-designer.glade.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -2032,7 +2507,7 @@ msgstr ""
 "Å ablony, kterÃ© potÅ?ebujÃ\n"
 "dvÄ? rozvrÅ¾enÃ."
 
-#: ../data/glade/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2040,11 +2515,11 @@ msgstr ""
 "Å ablony, kterÃ© potÅ?ebujÃ\n"
 "jedno rozvrÅ¾enÃ."
 
-#: ../data/glade/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "SvislÃ¡ rozteÄ? (dy):"
 
-#: ../data/glade/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2054,390 +2529,432 @@ msgstr ""
 "\n"
 "Tento dialog vÃ¡m pomÅ¯Å¾e pÅ?i vytvÃ¡Å?enÃ vlastnÃ Å¡ablony gLabels."
 
-#: ../data/glade/template-designer.glade.h:62
-msgid "cd_size_page"
-msgstr "karta_velikost_cd"
-
-#: ../data/glade/template-designer.glade.h:63
-msgid "finish_page"
-msgstr "karta_dokonÄ?enÃ"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "SeÅ?adit"
 
-#: ../data/glade/template-designer.glade.h:65
-msgid "layout_page"
-msgstr "karta_rozvrÅ¾enÃ"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "Copies"
+msgstr "Kopie:"
 
-#: ../data/glade/template-designer.glade.h:66
-msgid "name_page"
-msgstr "karta_nÃ¡zev"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "Kopie:"
 
-#: ../data/glade/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "karta_poÄ?et_rozvrÅ¾enÃ"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Merge Control"
+msgstr ""
 
-#: ../data/glade/template-designer.glade.h:68
-msgid "pg_size_page"
-msgstr "karta_velikost_strany"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>Volby</b>"
 
-#: ../data/glade/template-designer.glade.h:69
-msgid "rect_size_page"
-msgstr "karta_velikost_obdÃ©lnÃku"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "StrÃ¡nky:"
 
-#: ../data/glade/template-designer.glade.h:70
-msgid "round_size_page"
-msgstr "karta_velikost_ovalu"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "ZaÄ?Ãt na etiketÄ?"
 
-#: ../data/glade/template-designer.glade.h:71
-msgid "shape_page"
-msgstr "karta_tvar"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "od:"
 
-#: ../data/glade/template-designer.glade.h:72
-msgid "start_page"
-msgstr "karta_Ãºvod"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "na prvnÃ strÃ¡nce"
 
-#: ../data/glade/wdgt-media-select.glade.h:1
-msgid "Brand:"
-msgstr "ZnaÄ?ka:"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "do:"
 
-#: ../data/glade/wdgt-media-select.glade.h:2
-msgid "Category:"
-msgstr "Kategorie:"
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "VytvÃ¡Å?ejte etikety, vizitky a obaly mÃ©diÃ"
 
-#: ../data/glade/wdgt-media-select.glade.h:4
-msgid "Recent templates"
-msgstr "NedÃ¡vno pouÅ¾itÃ© Å¡ablony"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "NÃ¡vrhÃ¡Å? etiket gLabels"
 
-#: ../data/glade/wdgt-media-select.glade.h:5
-msgid "Search all templates"
-msgstr "Vyhledat ve vÅ¡ech Å¡ablonÃ¡ch"
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "ProjektovÃ½ soubor gLabels"
 
-#: ../data/glade/wdgt-rotate-label.glade.h:1
-msgid "Rotate"
-msgstr "OtoÄ?it"
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
 
 #. Other ISO A series sizes
-#: ../data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0"
 
-#: ../data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1"
 
-#: ../data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10"
 
-#: ../data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2"
 
-#: ../data/templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3"
 
-#: ../data/templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4"
 
-#: ../data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5"
 
-#: ../data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6"
 
-#: ../data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7"
 
-#: ../data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8"
 
-#: ../data/templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9"
 
 #. ISO B series sizes
-#: ../data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0"
 
-#: ../data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1"
 
-#: ../data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10"
 
-#: ../data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2"
 
-#: ../data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3"
 
-#: ../data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4"
 
-#: ../data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5"
 
-#: ../data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6"
 
-#: ../data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7"
 
-#: ../data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8"
 
-#: ../data/templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9"
 
-#: ../data/templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "US Executive"
 
 #. Other US paper sizes
-#: ../data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "US Legal"
 
-#: ../data/templates/categories.xml.h:1
+#: ../templates/categories.xml.h:1
 msgid "Any card"
 msgstr "LibovolnÃ¡ karta"
 
-#: ../data/templates/categories.xml.h:2
+#: ../templates/categories.xml.h:2
 msgid "Any label"
 msgstr "LibovolnÃ¡ etiketa"
 
-#: ../data/templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "Vizitky"
 
-#: ../data/templates/categories.xml.h:4
+#: ../templates/categories.xml.h:4
 msgid "CD/DVD or other media"
 msgstr "CD/DVD nebo jinÃ¡ mÃ©dia"
 
-#: ../data/templates/categories.xml.h:5
+#: ../templates/categories.xml.h:5
 msgid "Mailing/shipping products"
 msgstr "PoÅ¡tovnÃ/pÅ?epravnÃ produkty"
 
-#: ../data/templates/categories.xml.h:6
+#: ../templates/categories.xml.h:6
 msgid "Rectangular labels"
 msgstr "ObdÃ©lnÃkovÃ© etikety"
 
-#: ../data/templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "OvÃ¡lnÃ© etikety"
 
-#: ../data/templates/categories.xml.h:8
+#: ../templates/categories.xml.h:8
 msgid "Square labels"
 msgstr "Ä?tvercovÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:2
-#: ../data/templates/avery-us-templates.xml.h:2
-#: ../data/templates/dymo-other-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:2
-#: ../data/templates/zweckform-iso-templates.xml.h:2
-msgid "Address Labels"
-msgstr "AdresnÃ etikety"
-
+#. ********************************************************************
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:4
-msgid "Address labels"
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "AdresnÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:6
-msgid "Allround labels"
-msgstr "UniverzÃ¡lnÃ etikety"
-
 #. ============================================================
 #. ===================================================================
 #. ********************************************************************
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:8
-#: ../data/templates/avery-us-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:12
-#: ../data/templates/misc-us-templates.xml.h:4
-#: ../data/templates/zweckform-iso-templates.xml.h:6
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "Vizitky"
 
-#. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:10
-msgid "CD Booklet"
-msgstr "PÅ?ebal CD"
-
-#. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:12
-msgid "CD Inlet"
-msgstr "Vsuvky do krabiÄ?ky na CD"
-
+#. ===================================================================
 #. ===============================================================
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:14
-#: ../data/templates/avery-us-templates.xml.h:6
-#: ../data/templates/misc-iso-templates.xml.h:16
-#: ../data/templates/misc-us-templates.xml.h:8
-#: ../data/templates/zweckform-iso-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
 msgstr "Etikety na CD/DVD"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:16
-#: ../data/templates/avery-us-templates.xml.h:12
-msgid "Diskette Labels"
-msgstr "Etikety na diskety"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:18
-msgid "Diskette labels"
-msgstr "Etikety na diskety"
-
-#. ===============================================================
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:20
-#: ../data/templates/misc-iso-templates.xml.h:36
-#: ../data/templates/misc-us-templates.xml.h:18
-#: ../data/templates/zweckform-iso-templates.xml.h:16
-msgid "Mailing Labels"
-msgstr "PoÅ¡tovnÃ etikety"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:22
-msgid "Mailing labels"
-msgstr "PoÅ¡tovnÃ etikety"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:24
-msgid "Mini Address Labels"
-msgstr "Mini adresnÃ etikety"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:26
-msgid "Mini Labels"
-msgstr "Mini etikety"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:28
-msgid "Shipping labels"
-msgstr "PÅ?epravnÃ etikety"
-
-#. ===================================================================
-#: ../data/templates/avery-other-templates.xml.h:2
-msgid "File Folder Labels"
-msgstr "Etikety na sloÅ¾ky"
-
-#. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "Etikety na CD/DVD (diskovÃ© etikety)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:10
+#: ../templates/avery-us-templates.xml.h:10
 msgid "CD/DVD Labels (Spine Labels)"
 msgstr "Etikety na CD/DVD (hÅ?betnÃ etikety)"
 
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
+msgid "Diskette Labels"
+msgstr "Etikety na diskety"
+
 #. the LSK labels can be torn in half down the center
-#: ../data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:14
 msgid "Divider Labels"
 msgstr "RozdÄ?lovacÃ etikety na karty"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+msgid "File Folder Labels"
+msgstr "Etikety na sloÅ¾ky"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr "Etikety na kartotÃ©ky"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:18
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "CelostrÃ¡nkovÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 msgid "ID Labels"
 msgstr "IdentifikaÄ?nÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 msgid "Index Cards"
 msgstr "IndexovÃ© karty"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "VelkÃ© ovÃ¡lnÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:26
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "Etikety na jmenovky"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr "Pohlednice"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:30
-#: ../data/templates/dymo-other-templates.xml.h:12
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "ZpÃ¡teÄ?nÃ adresa"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:32
-#: ../data/templates/misc-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "OvÃ¡lnÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:34
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "DopravnÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:36
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "MalÃ© ovÃ¡lnÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:38
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "Ä?tvercovÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr "PÅ?Ã¡nÃÄ?ka"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:42
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "Etikety na Ä?elnÃ stranu videokazety"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:44
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr "Etikety na hÅ?bet videokazet"
 
-#: ../data/templates/brother-other-templates.xml.h:1
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:4
+msgid "Address labels"
+msgstr "AdresnÃ etikety"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:6
+msgid "Allround labels"
+msgstr "UniverzÃ¡lnÃ etikety"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:10
+msgid "CD Booklet"
+msgstr "PÅ?ebal CD"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:12
+msgid "CD Inlet"
+msgstr "Vsuvky do krabiÄ?ky na CD"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:18
+msgid "Diskette labels"
+msgstr "Etikety na diskety"
+
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr "PoÅ¡tovnÃ etikety"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:22
+msgid "Mailing labels"
+msgstr "PoÅ¡tovnÃ etikety"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:24
+msgid "Mini Address Labels"
+msgstr "Mini adresnÃ etikety"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:26
+msgid "Mini Labels"
+msgstr "Mini etikety"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:28
+msgid "Shipping labels"
+msgstr "PÅ?epravnÃ etikety"
+
+#: ../templates/brother-other-templates.xml.h:1
 msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr "VÃceÃºÄ?elovÃ© etikety 17Ã?54 mm"
 
-#: ../data/templates/brother-other-templates.xml.h:2
+#: ../templates/brother-other-templates.xml.h:2
 msgid "Shipping Labels 62mm x 100mm"
 msgstr "PÅ?epravnÃ etikety 62Ã?100 mm"
 
@@ -2458,277 +2975,577 @@ msgstr "PÅ?epravnÃ etikety 62Ã?100 mm"
 #. *********************************************************************
 #. *********************************************************************
 #.
-#: ../data/templates/brother-other-templates.xml.h:20
+#: ../templates/brother-other-templates.xml.h:20
 msgid "Standard Address Labels 29mm x 90mm"
 msgstr "StandardnÃ adresnÃ etikety 29Ã?90 mm"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:2
 msgid "3.5in Diskette"
 msgstr "3,5Êº disketa"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:6
 msgid "File Folder"
 msgstr "KancelÃ¡Å?skÃ¡ sloÅ¾ka"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:8
+#: ../templates/dymo-other-templates.xml.h:8
 msgid "Hanging Folder"
 msgstr "ZÃ¡vÄ?snÃ¡ sloÅ¾ka"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:10
+#: ../templates/dymo-other-templates.xml.h:10
 msgid "Large Address Labels"
 msgstr "VelkÃ© adresnÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:14
 msgid "Shipping Address Labels"
 msgstr "PÅ?epravnÃ adresnÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:4
-#: ../data/templates/zweckform-iso-templates.xml.h:4
+#: ../templates/misc-us-templates.xml.h:2
+msgid "Business Card CD"
+msgstr "VizitkovÃ© CD"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
+msgid "CD Template Rectangles"
+msgstr "ObdÃ©lnÃkovÃ© Å¡ablony na CD"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
+msgid "CD/DVD Labels (Face Only)"
+msgstr "Etikety na CD/DVD (pouze povrch)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
+msgid "CD/DVD Labels (face only)"
+msgstr "Etikety na CD/DVD (pouze pÅ?edek)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:14
+msgid "Cassette Labels"
+msgstr "Etikety na kazety"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:16
+msgid "DLT Labels"
+msgstr "Etikety na pÃ¡sky DLT"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "PÅ?ebal CD"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
+msgid "Microtube labels"
+msgstr "Etikety na zkumavky"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
+msgid "Mini-CD Labels"
+msgstr "Etikety na Mini-CD"
+
+#: ../templates/misc-us-templates.xml.h:25
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr "PRO CD Labels 2-up (pouze hÅ?bet)"
+
+#: ../templates/misc-us-templates.xml.h:26
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr "PRO CD Labels 2-up (pouze povrch)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
+msgid "PRO CD Labels 2-up (face only)"
+msgstr "PRO CD Labels 2-up (pouze povrch)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
+msgid "Slimline CD Case (rightside up)"
+msgstr "TenkÃ¡ krabiÄ?ka na CD (pravÃ¡ strana)"
+
+#: ../templates/misc-us-templates.xml.h:33
+msgid "Slimline CD Case (upside down)"
+msgstr "TenkÃ¡ krabiÄ?ka na CD (hornÃ strana)"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Allround Labels"
 msgstr "UniverzÃ¡lnÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:6
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr "Etikety na poÅ?adaÄ?e"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr "Etikety na poÅ?adaÄ?e (velkÃ©)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:10
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr "Etikety na poÅ?adaÄ?e (malÃ©)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:14
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "Etikety na CD"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:18
-#: ../data/templates/misc-us-templates.xml.h:12
-msgid "CD/DVD Labels (face only)"
-msgstr "Etikety na CD/DVD (pouze pÅ?edek)"
-
-#. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "Etikety standardnÃho formÃ¡tu na CD/DVD (pouze pÅ?edek)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:22
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "Etikety na diskety (pouze pÅ?edek)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "Samolepky EPSON Photo Stickers 16"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "Etikety"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "ReklamnÃ magnetky na ledniÄ?ku"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:30
 msgid "General Labels"
 msgstr "ObecnÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr "Etikety na inkoustovÃ½/laserovÃ½ tisk 70Ã?37 mm"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:38
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr "PoÅ¡tovnÃ etikety - 2 sloupce"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:40
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr "PoÅ¡tovnÃ etikety - 3 sloupce"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:42
-#: ../data/templates/misc-us-templates.xml.h:26
-msgid "PRO CD Labels 2-up (face only)"
-msgstr "PRO CD Labels 2-up (pouze povrch)"
-
-#. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:44
-#: ../data/templates/zweckform-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Rectangular Labels"
 msgstr "ObdÃ©lnÃkovÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "ObecnÃ© etikety"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "Etikety na videokazety (pouze pÅ?edek)"
 
 #. ===================================================================
-#: ../data/templates/misc-other-templates.xml.h:2
+#: ../templates/misc-other-templates.xml.h:2
 msgid "Multi-Purpose Labels"
 msgstr "VÃceÃºÄ?elovÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:2
-msgid "Business Card CD"
-msgstr "VizitkovÃ© CD"
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "AdresnÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:6
-msgid "CD Template Rectangles"
-msgstr "ObdÃ©lnÃkovÃ© Å¡ablony na CD"
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Etikety na diskety"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:10
-msgid "CD/DVD Labels (Face Only)"
-msgstr "Etikety na CD/DVD (pouze povrch)"
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:14
-msgid "Cassette Labels"
-msgstr "Etikety na kazety"
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Vizitky"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:16
-msgid "DLT Labels"
-msgstr "Etikety na pÃ¡sky DLT"
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Vizitky"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:20
-msgid "Microtube labels"
-msgstr "Etikety na zkumavky"
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Vizitky"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:22
-msgid "Mini-CD Labels"
-msgstr "Etikety na Mini-CD"
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Vizitky"
 
-#: ../data/templates/misc-us-templates.xml.h:23
-msgid "PRO CD Labels 2-up (CD spine only)"
-msgstr "PRO CD Labels 2-up (pouze hÅ?bet)"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "UniverzÃ¡lnÃ etikety"
 
-#: ../data/templates/misc-us-templates.xml.h:24
-msgid "PRO CD Labels 2-up (Face only)"
-msgstr "PRO CD Labels 2-up (pouze povrch)"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Vizitky"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:30
-msgid "Slimline CD Case (rightside up)"
-msgstr "TenkÃ¡ krabiÄ?ka na CD (pravÃ¡ strana)"
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
 
-#: ../data/templates/misc-us-templates.xml.h:31
-msgid "Slimline CD Case (upside down)"
-msgstr "TenkÃ¡ krabiÄ?ka na CD (hornÃ strana)"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Etikety"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:10
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Etikety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Etikety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+#, fuzzy
+msgid "Name plates"
+msgstr "karta_nÃ¡zev"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "O aplikaci gLabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "Ä?tvercovÃ© etikety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "Ä?tvercovÃ© etikety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr "OpravnÃ© a pÅ?elepovacÃ etikety"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:12
 msgid "File Back Labels"
 msgstr "Etikety do diÃ¡Å?e"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:14
+#: ../templates/zweckform-iso-templates.xml.h:14
 msgid "Lever Arch File Labels"
 msgstr "Etikety na pÃ¡kovÃ© poÅ?adaÄ?e"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr "VÃceÃºÄ?elovÃ© odnÃmatelnÃ© etikety"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:20
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr "Etikety na QSL karty 70mm Ã? 50,8mm"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:22
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
 msgstr "ObdÃ©lnÃkovÃ© etikety do kopÃrky"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "Video etikety (zadnÃ strana)"
 
-#: ../data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "VytvÃ¡Å?ejte etikety, vizitky a obaly mÃ©diÃ"
+#~ msgid "- gLabels label designer"
+#~ msgstr "- nÃ¡vrhÃ¡Å? etiket gLabels"
 
-#: ../data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "NÃ¡vrhÃ¡Å? etiket gLabels"
+#~ msgid "- batch process gLabels label files"
+#~ msgstr "- dÃ¡vkovÃ© zpracovÃ¡nÃ souborÅ¯ s etiketami gLabels"
 
-#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "ProjektovÃ½ soubor gLabels"
+#~ msgid "Show tooltips"
+#~ msgstr "Zobrazovat tipy"
 
-#: ../barcode-0.98/compat/getopt.c:583
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: pÅ?epÃnaÄ? â??%sâ?? je nejednoznaÄ?nÃ½\n"
+#~ msgid "Show tooltips for property toolbar"
+#~ msgstr "Zobrazovat tipy v panelu vlastnostÃ"
 
-#: ../barcode-0.98/compat/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: pÅ?epÃnaÄ? â??--%sâ?? neumoÅ¾Å?uje argument\n"
+#~ msgid "Show tooltips for main toolbar"
+#~ msgstr "Zobrazovat tipy v hlavnÃm panelu"
 
-#: ../barcode-0.98/compat/getopt.c:612
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: pÅ?epÃnaÄ? â??%c%sâ?? neumoÅ¾Å?uje argument\n"
+#~ msgid "Show tooltips for drawing toolbar"
+#~ msgstr "Zobrazovat tipy v panelu kreslenÃ"
 
-#: ../barcode-0.98/compat/getopt.c:629
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: pÅ?epÃnaÄ? â??-%sâ?? vyÅ¾aduje argument\n"
+#~ msgid "xmlParseDoc error"
+#~ msgstr "chyba xmlParseDoc"
 
-#. --option
-#: ../barcode-0.98/compat/getopt.c:658
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nerozpoznanÃ½ pÅ?epÃnaÄ? â??--%sâ??\n"
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "TextovÃ½ soubor se sloupci oddÄ?lenÃ½mi Ä?Ã¡rkami (CSV)"
 
-#. +option or -option
-#: ../barcode-0.98/compat/getopt.c:662
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nerozpoznanÃ½ pÅ?epÃnaÄ? â??%c%sâ??\n"
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "TextovÃ½ soubor se sloupci oddÄ?lenÃ½mi dvojteÄ?kami"
 
-#. 1003.2 specifies the format of this message.
-#: ../barcode-0.98/compat/getopt.c:688
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nedovolenÃ½ pÅ?epÃnaÄ? -- %c\n"
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "TextovÃ½ soubor se sloupci oddÄ?lenÃ½mi tabulÃ¡tory"
 
-#: ../barcode-0.98/compat/getopt.c:691
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: neplatnÃ½ pÅ?epÃnaÄ? -- %c\n"
+#~ msgid "Data from a file containing VCards"
+#~ msgstr "Data ze souboru obsahujÃcÃho kontakty ve formÃ¡tu VCards"
 
-#: ../barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: pÅ?epÃnaÄ? vyÅ¾aduje argument -- %c\n"
+#~ msgid "%s x %s %s"
+#~ msgstr "%s Ã? %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g Ã? %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "prÅ¯mÄ?r %.5g %s"
+
+#~ msgid "Choose Custom Color"
+#~ msgstr "Vyberte vlastnÃ barvu"
+
+#~ msgid "light brown"
+#~ msgstr "svÄ?tle hnÄ?dÃ¡"
+
+#~ msgid "brown gold"
+#~ msgstr "zlatohnÄ?dÃ¡"
+
+#~ msgid "dark green #2"
+#~ msgstr "tmavÄ? zelenÃ¡ Ä?. 2"
+
+#~ msgid "navy"
+#~ msgstr "nÃ¡moÅ?nickÃ¡ modÅ?"
+
+#~ msgid "purple #2"
+#~ msgstr "purpurovÃ¡ Ä?. 2"
+
+#~ msgid "very dark gray"
+#~ msgstr "velmi tmavÄ? Å¡edÃ¡"
+
+#~ msgid "red-orange"
+#~ msgstr "Ä?ervenooranÅ¾ovÃ¡"
+
+#~ msgid "dull blue"
+#~ msgstr "matnÃ¡ modrÃ¡"
+
+#~ msgid "dull purple"
+#~ msgstr "matnÃ¡ purpurovÃ¡"
+
+#~ msgid "dark grey"
+#~ msgstr "tmavÄ? Å¡edÃ¡"
+
+#~ msgid "lime"
+#~ msgstr "citrÃ³novÃ¡"
+
+#~ msgid "dull blue #2"
+#~ msgstr "matnÃ¡ modrÃ¡ Ä?. 2"
+
+#~ msgid "sky blue #2"
+#~ msgstr "nebeskÃ¡ modÅ? Ä?. 2"
+
+#~ msgid "gray"
+#~ msgstr "Å¡edÃ¡"
+
+#~ msgid "magenta"
+#~ msgstr "fialovÃ¡"
+
+#~ msgid "bright orange"
+#~ msgstr "jasnÄ? oranÅ¾ovÃ¡"
+
+#~ msgid "bright blue"
+#~ msgstr "jasnÄ? modrÃ¡"
+
+#~ msgid "red purple"
+#~ msgstr "Ä?ervenofialovÃ¡"
+
+#~ msgid "light grey"
+#~ msgstr "svÄ?tle Å¡edÃ¡"
+
+#~ msgid "light orange"
+#~ msgstr "svÄ?tle oranÅ¾ovÃ¡"
+
+#~ msgid "light blue"
+#~ msgstr "svÄ?tle modrÃ¡"
+
+#~ msgid "light purple"
+#~ msgstr "svÄ?tle purpurovÃ¡"
+
+#~ msgid "purplish blue"
+#~ msgstr "fialovomodrÃ¡"
+
+#~ msgid "dark purple"
+#~ msgstr "tmavÄ? purpurovÃ¡"
+
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>Orientace etikety</b>"
+
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>Typ mÃ©dia</b>"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Vlastnosti objektu xxx</span>"
+
+#~ msgid "Select A File"
+#~ msgstr "VÃ½bÄ?r souboru"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">VÃ½chozÃ velikost strÃ¡nky</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">VÃ½plÅ?</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Obrys</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Text</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Jednotky</span>"
+
+#~ msgid "<b>Print control (Merge)</b>"
+#~ msgstr "<b>OvlÃ¡dÃ¡nÃ tisku (sluÄ?ovÃ¡nÃ)</b>"
+
+#~ msgid "<b>Print control (Simple)</b>"
+#~ msgstr "<b>OvlÃ¡dÃ¡nÃ tisku (jednoduchÃ½)</b>"
+
+#~ msgid "Text Color"
+#~ msgstr "Barva textu"
+
+#~ msgid "cd_size_page"
+#~ msgstr "karta_velikost_cd"
+
+#~ msgid "finish_page"
+#~ msgstr "karta_dokonÄ?enÃ"
+
+#~ msgid "layout_page"
+#~ msgstr "karta_rozvrÅ¾enÃ"
+
+#~ msgid "nlayouts_page"
+#~ msgstr "karta_poÄ?et_rozvrÅ¾enÃ"
+
+#~ msgid "pg_size_page"
+#~ msgstr "karta_velikost_strany"
+
+#~ msgid "rect_size_page"
+#~ msgstr "karta_velikost_obdÃ©lnÃku"
+
+#~ msgid "round_size_page"
+#~ msgstr "karta_velikost_ovalu"
+
+#~ msgid "shape_page"
+#~ msgstr "karta_tvar"
+
+#~ msgid "start_page"
+#~ msgstr "karta_Ãºvod"
+
+#~ msgid "Search all templates"
+#~ msgstr "Vyhledat ve vÅ¡ech Å¡ablonÃ¡ch"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: pÅ?epÃnaÄ? â??%sâ?? je nejednoznaÄ?nÃ½\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: pÅ?epÃnaÄ? â??--%sâ?? neumoÅ¾Å?uje argument\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: pÅ?epÃnaÄ? â??%c%sâ?? neumoÅ¾Å?uje argument\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: pÅ?epÃnaÄ? â??-%sâ?? vyÅ¾aduje argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: nerozpoznanÃ½ pÅ?epÃnaÄ? â??--%sâ??\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: nerozpoznanÃ½ pÅ?epÃnaÄ? â??%c%sâ??\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nedovolenÃ½ pÅ?epÃnaÄ? -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: neplatnÃ½ pÅ?epÃnaÄ? -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: pÅ?epÃnaÄ? vyÅ¾aduje argument -- %c\n"
diff --git a/po/da.po b/po/da.po
index 3b6606c..868d325 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels glabels_2_2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:12+0200\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-05-25 14:52+0000\n"
 "Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -74,7 +74,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A eller UPC-E)"
 
-#: ../src/bc.c:107
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -86,7 +86,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:116
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -98,7 +98,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:125
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -106,11 +106,11 @@ msgstr "ISBN"
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:131
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr "Kode 39"
 
-#: ../src/bc.c:134
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr "Kode 128"
 
@@ -124,12 +124,12 @@ msgstr "Kode 128B"
 
 # joe kom.: to provide blank leaves in (a book) for notes or written comments.
 # kender ikke et dansk udtryk for det her. indflyttet, eller interfolierede
-#: ../src/bc.c:143
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr "Interfolierede 2 af 5"
 
 # hvad er dettte. Codabar is a linear barcode symbology developed in 1972 by Pitney Bowes Corp.
-#: ../src/bc.c:146
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr "Codabar"
 
@@ -142,19 +142,258 @@ msgstr "MSI"
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:155
+#: ../src/bc.c:155 ../src/bc.c:213
 msgid "Code 93"
 msgstr "Kode 93"
 
 #: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Kode 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Kode 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Kode 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Kode 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Kode 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
 msgid "GS1-128"
 msgstr "GS1-128"
 
-#: ../src/bc.c:169
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Kode 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Kode 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+#, fuzzy
+msgid "HIBC QR Code"
+msgstr "IEC18004 (QRCode)"
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+# navn? The Plessey Company plc was a British-based international electronics, defence and telecommunications company.
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "IndsÃ¦t"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Stregkode"
+
+#: ../src/bc.c:330
+#, fuzzy
+msgid "Pharmacode 2-track"
+msgstr "Stregkodedata"
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Slet"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+# navn? The Plessey Company plc was a British-based international electronics, defence and telecommunications company.
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:176
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr "IEC18004 (QRCode)"
 
@@ -324,7 +563,7 @@ msgstr "gLabels - fatal fejl!"
 msgid "New Label or Card"
 msgstr "Ny etiket eller kort"
 
-#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "Etiketegenskaber"
 
@@ -444,64 +683,64 @@ msgstr "0123456789 .:,;(*!?)"
 msgid "Sample text"
 msgstr "PrÃ¸vetekst"
 
-#: ../src/glabels-batch.c:52
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "angiv filnavn for uddata (standard=output.pdf)"
 
-#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "filnavn"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "antal ark (ark=1)"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "ark"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "antal kopier (standard=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "kopier"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "fÃ¸rste etiket pÃ¥ fÃ¸rste ark (standard=1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "fÃ¸rste"
 
-#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "udskriv omkreds (for at teste printeropsÃ¦tning)"
 
-#: ../src/glabels-batch.c:62 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "udskriv omvendt (det vil sige et spejlbillede)"
 
 # tilfÃ¸jet af joe: crop marks: Marks that show where a publication page will be trimmed
-#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "udskriv beskÃ¦ringsmÃ¦rker"
 
-#: ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "inddatafil for sammenflet"
 
-#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[FIL...]"
 
-#: ../src/glabels-batch.c:98
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr "Udskriv filer oprettet med gLabels."
 
-#: ../src/glabels-batch.c:106 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
@@ -511,12 +750,12 @@ msgstr ""
 "KÃ¸r '%s --help' for at se en fuldstÃ¦ndig liste over tilgÃ¦ngelige "
 "kommandolinjetilvalg.\n"
 
-#: ../src/glabels-batch.c:149
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "kan ikke udfÃ¸re dokumentsammenfletning med glabelsfil %s\n"
 
-#: ../src/glabels-batch.c:184
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "kan ikke Ã¥bne glabelsfil %s\n"
@@ -538,11 +777,11 @@ msgstr "Stregkodedata"
 msgid "Barcode property"
 msgstr "Egenskaber for stregkode"
 
-#: ../src/label-barcode.c:483
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr "Stregkodedata er tomme"
 
-#: ../src/label-barcode.c:487
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr "Ugyldige stregkodedata"
 
@@ -565,80 +804,80 @@ msgstr "Linjefarve"
 msgid "Line width"
 msgstr "Linjebredde"
 
-#: ../src/label.c:399
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: ../src/label.c:702 ../src/ui.c:422
+#: ../src/label.c:705 ../src/ui.c:422
 msgid "Merge properties"
 msgstr "SammenfÃ¸j egenskaber"
 
-#: ../src/label.c:1184 ../src/ui.c:215
+#: ../src/label.c:1197 ../src/ui.c:215
 msgid "Delete"
 msgstr "Slet"
 
-#: ../src/label.c:1217 ../src/ui.c:324
+#: ../src/label.c:1230 ../src/ui.c:324
 msgid "Bring to front"
 msgstr "Hent frem"
 
-#: ../src/label.c:1253 ../src/ui.c:331
+#: ../src/label.c:1266 ../src/ui.c:331
 msgid "Send to back"
 msgstr "Send tilbage"
 
-#: ../src/label.c:1294
+#: ../src/label.c:1307
 msgid "Rotate"
 msgstr "Roter"
 
-#: ../src/label.c:1329 ../src/ui.c:338
+#: ../src/label.c:1342 ../src/ui.c:338
 msgid "Rotate left"
 msgstr "Roter mod venstre"
 
-#: ../src/label.c:1362 ../src/ui.c:345
+#: ../src/label.c:1375 ../src/ui.c:345
 msgid "Rotate right"
 msgstr "Roter til hÃ¸jre"
 
-#: ../src/label.c:1397 ../src/ui.c:352
+#: ../src/label.c:1410 ../src/ui.c:352
 msgid "Flip horizontally"
 msgstr "Vend vandret"
 
-#: ../src/label.c:1432 ../src/ui.c:359
+#: ../src/label.c:1445 ../src/ui.c:359
 msgid "Flip vertically"
 msgstr "Vend lodret"
 
-#: ../src/label.c:1472 ../src/ui.c:366
+#: ../src/label.c:1485 ../src/ui.c:366
 msgid "Align left"
 msgstr "Juster venstre"
 
-#: ../src/label.c:1529 ../src/ui.c:373
+#: ../src/label.c:1542 ../src/ui.c:373
 msgid "Align right"
 msgstr "Juster hÃ¸jre"
 
-#: ../src/label.c:1590 ../src/ui.c:380
+#: ../src/label.c:1603 ../src/ui.c:380
 msgid "Align horizontal center"
 msgstr "Juster vandret centrum"
 
-#: ../src/label.c:1666 ../src/ui.c:387
+#: ../src/label.c:1679 ../src/ui.c:387
 msgid "Align tops"
 msgstr "Juster Ã¸verst"
 
-#: ../src/label.c:1723 ../src/ui.c:394
+#: ../src/label.c:1736 ../src/ui.c:394
 msgid "Align bottoms"
 msgstr "Juster nederste kanter"
 
 # openoffice: juster lodret centreret
-#: ../src/label.c:1784 ../src/ui.c:401
+#: ../src/label.c:1797 ../src/ui.c:401
 msgid "Align vertical center"
 msgstr "Juster lodret centreret"
 
-#: ../src/label.c:1862 ../src/ui.c:408
+#: ../src/label.c:1875 ../src/ui.c:408
 msgid "Center horizontally"
 msgstr "Centrer vandret"
 
-#: ../src/label.c:1909 ../src/ui.c:415
+#: ../src/label.c:1922 ../src/ui.c:415
 msgid "Center vertically"
 msgstr "Centrer lodret"
 
-#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
 msgid "Paste"
 msgstr "IndsÃ¦t"
 
@@ -646,11 +885,11 @@ msgstr "IndsÃ¦t"
 msgid "Create ellipse object"
 msgstr "Opret ellipseobjekt"
 
-#: ../src/label-image.c:161 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:312
 msgid "Create image object"
 msgstr "Opret billedeobjekt"
 
-#: ../src/label-image.c:265 ../src/label-image.c:336
+#: ../src/label-image.c:333 ../src/label-image.c:474
 msgid "Set image"
 msgstr "Angiv billede"
 
@@ -820,12 +1059,22 @@ msgstr "Tekst: Kolonadskilte vÃ¦rdier"
 msgid "Text: Colon separated values with keys on line 1"
 msgstr "Tekst: Kolonadskilte vÃ¦rdier med nÃ¸gler pÃ¥ linje 1"
 
-#: ../src/merge-init.c:104
+#: ../src/merge-init.c:102
+#, fuzzy
+msgid "Text: Semicolon separated values"
+msgstr "Tekst: Kolonadskilte vÃ¦rdier"
+
+#: ../src/merge-init.c:109
+#, fuzzy
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr "Tekst: Kolonadskilte vÃ¦rdier med nÃ¸gler pÃ¥ linje 1"
+
+#: ../src/merge-init.c:119
 msgid "Evolution Addressbook"
 msgstr "Evolutionadressebog"
 
 # bÃ¸r nok vÃ¦re VCard (formatnavn ifÃ¸lge wiki)
-#: ../src/merge-init.c:110
+#: ../src/merge-init.c:125
 msgid "VCards"
 msgstr "VCards"
 
@@ -850,7 +1099,7 @@ msgstr "VÃ¦lg"
 msgid "Record/Field"
 msgstr "Optag/felt"
 
-#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "Data"
 
@@ -946,7 +1195,7 @@ msgstr "Indstillinger for gLabels"
 
 #. ===================================================================
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:217
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etiketter"
@@ -1099,10 +1348,9 @@ msgstr "Design fÃ¦rdigt"
 msgid "Edit gLabels Template"
 msgstr "Rediger gLabels-skabelon"
 
-#: ../src/template-designer.c:1422
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
 msgstr ""
 "<span foreground='red' weight='bold'>MÃ¦rk og del#-match en eksisterende "
 "skabelon!</span>"
@@ -1337,7 +1585,8 @@ msgstr "VÃ¦lg tilstand"
 msgid "Select, move and modify objects"
 msgstr "VÃ¦lg, flyt eller Ã¦ndre objekter"
 
-#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Tekst"
 
@@ -1349,7 +1598,8 @@ msgstr "Boks"
 msgid "Create box/rectangle object"
 msgstr "Opret boks-/rektangelobjekt"
 
-#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Linje"
 
@@ -1361,7 +1611,7 @@ msgstr "Ellipse"
 msgid "Create ellipse/circle object"
 msgstr "Opret ellipse-/cirkelobjekt"
 
-#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Billede"
 
@@ -1547,53 +1797,58 @@ msgstr "(ingen) - gLabels"
 msgid "(modified)"
 msgstr "(Ã¦ndret)"
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Ugyldig rodknude = \"%s\""
 
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "dÃ¥rlig knude =  \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:227
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "xmlParseFile-fejl"
 
-#: ../src/xml-label.c:264
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Ingen dokumentrod"
 
-#: ../src/xml-label.c:272
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Importerer fra glabels 0.1 format"
 
-#: ../src/xml-label.c:281
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Importerer fra glabels 0.4 format"
 
-#: ../src/xml-label.c:291
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "Ukendt glabelsnavnerum -- bruger %s"
 
-#: ../src/xml-label.c:360
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "dÃ¥rlig knude i dokumentknude =  \"%s\""
 
-#: ../src/xml-label.c:856
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "dÃ¥rlig knude i dataknude =  \"%s\""
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Ukendt sidestÃ¸rrelse-id eller navn \"%s\""
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Utf8 - konverteringsfejl."
 
 # Kunne ikke gemme xml-fil.
-#: ../src/xml-label.c:1104
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "Problem under gemning af xml-fil."
 
@@ -1610,7 +1865,7 @@ msgstr "Anden"
 msgid "User defined"
 msgstr "Brugerdefineret"
 
-#: ../libglabels/db.c:650
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1618,7 +1873,7 @@ msgstr ""
 "Kunne ikke finde definitioner for papirstÃ¸rrelse. Libglabels er mÃ¥ske ikke "
 "installeret korrekt!"
 
-#: ../libglabels/db.c:1042
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1626,14 +1881,14 @@ msgstr ""
 "Kunne ikke finde definitioner for kategorier. Libglabels er mÃ¥ske ikke "
 "installeret korrekt!"
 
-#: ../libglabels/db.c:2061
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 "Kunne ikke finde skabelonfiler. Libglabels er mÃ¥ske ikke installeret korrekt!"
 
-#: ../libglabels/db.c:2128
+#: ../libglabels/db.c:2164
 #, c-format
 msgid "%s full page label"
 msgstr "%s hel sideetiket"
@@ -1643,12 +1898,24 @@ msgstr "%s hel sideetiket"
 msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr "Tilsvarende del (\"%s\") for \"%s\", er ikke tidligere defineret."
 
-#: ../libglabels/template.c:722 ../libglabels/template.c:726
-msgid "per sheet"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr ""
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
 msgstr "per ark"
 
-#: ../libglabels/template.c:796 ../libglabels/template.c:802
-#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
 msgid "diameter"
 msgstr "diameter"
 
@@ -1656,13 +1923,13 @@ msgstr "diameter"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:40
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr "punkter"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
 #: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr "tommer"
@@ -1723,25 +1990,27 @@ msgstr "Navneattribut mangler ogsÃ¥."
 #. * End:                   -- emacs
 #.
 #: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>Optag markering/forhÃ¥ndsvisning</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Kilde</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "Placering:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>Optag markering/forhÃ¥ndsvisning</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "VÃ¦lg alle"
 
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Kilde</b>"
+
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "FravÃ¦lg alle"
@@ -1824,133 +2093,129 @@ msgstr "Producent:"
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Xxx-objektegenskaber</span>"
-
-#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../data/ui/object-editor.ui.h:5
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "Tillader automatisk at sammenfÃ¸jning kan formindske tekst"
 
-#: ../data/ui/object-editor.ui.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Vinkel:"
 
 # TjekbelÃ¸b
-#: ../data/ui/object-editor.ui.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Kontrolsum"
 
-#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Farve:"
 
-#: ../data/ui/object-editor.ui.h:10
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "SlÃ¥ skygge til"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Familie:"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Fil:"
 
-#: ../data/ui/object-editor.ui.h:13
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Fyld"
 
-#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "HÃ¸jde:"
 
-#: ../data/ui/object-editor.ui.h:16
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "NÃ¸gle:"
 
-#: ../data/ui/object-editor.ui.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "LÃ¦ngde:"
 
-#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "Linjemellemrum:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Bogstavelig:"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "Ugennemsigtighed:"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Placering"
 
-#: ../data/ui/object-editor.ui.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Nulstil billedstÃ¸rrelse"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Skygge"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: ../data/ui/object-editor.ui.h:26
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "StÃ¸rrelse:"
 
-#: ../data/ui/object-editor.ui.h:27
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../data/ui/object-editor.ui.h:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
 #: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Bredde:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "X-forskydning:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "Y-forskydning:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "grader"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "dialog 1"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "tal:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "format:"
 
@@ -1958,66 +2223,56 @@ msgstr "format:"
 msgid "   "
 msgstr "   "
 
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Standard for sidestÃ¸rrelse</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Fyld</span>"
-
 #: ../data/ui/prefs-dialog.ui.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linje</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Tekst</span>"
+#, fuzzy
+msgid "Default page size"
+msgstr "Nulstil billedstÃ¸rrelse"
 
 #: ../data/ui/prefs-dialog.ui.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Enheder</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Skrifttype:"
 
-#: ../data/ui/prefs-dialog.ui.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/ui/prefs-dialog.ui.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Tommer"
 
-#: ../data/ui/prefs-dialog.ui.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "Sprog"
 
-#: ../data/ui/prefs-dialog.ui.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "Millimeter"
 
-#: ../data/ui/prefs-dialog.ui.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "Objektstandarder"
 
-#: ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Punkter"
 
-#: ../data/ui/prefs-dialog.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "VÃ¦lg standardegenskaber for nye objekter."
 
-#: ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "VÃ¦lg opfÃ¸rsel specifikt efter lokalt omrÃ¥de."
 
-#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Uden titel"
+
 #: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Fed"
@@ -2255,27 +2510,30 @@ msgstr ""
 "\n"
 "Denne guide vil assistere dig i oprettelsen af en tilpasset gLabels-skabelon."
 
+# oversÃ¦ttelse hentet fra dia
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "<b>Copies</b>"
-msgstr "<b>Kopier</b>"
+msgid "Collate"
+msgstr "Saml ind"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-msgid "<b>Merge Control</b>"
-msgstr "<b>SammenfÃ¸jningskontrol</b>"
+#, fuzzy
+msgid "Copies"
+msgstr "Kopier:"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>Indstillinger</b>"
-
-# oversÃ¦ttelse hentet fra dia
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-msgid "Collate"
-msgstr "Saml ind"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
 msgid "Copies:"
 msgstr "Kopier:"
 
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "<b>SammenfÃ¸jningskontrol</b>"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>Indstillinger</b>"
+
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
 msgstr "Ark:"
@@ -3060,3 +3318,24 @@ msgstr "RektangulÃ¦r Copieretiketter"
 #: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "Video-etiketter (bagside)"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Xxx-objektegenskaber</span>"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Standard for sidestÃ¸rrelse</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Fyld</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Linje</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Tekst</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Enheder</span>"
+
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>Kopier</b>"
diff --git a/po/de.po b/po/de.po
index 1c9421b..56d82d2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels master\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2010-07-07 03:16+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-07-07 11:58+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Language-Team: German <gnome-de gnome org>\n"
@@ -68,7 +68,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A oder UPC-E)"
 
-#: ../src/bc.c:107
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -80,7 +80,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:116
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -92,7 +92,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:125
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -100,11 +100,11 @@ msgstr "ISBN"
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:131
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr "Code 39"
 
-#: ../src/bc.c:134
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr "Code 128"
 
@@ -116,11 +116,11 @@ msgstr "Code 128C"
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc.c:143
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr "Interleaved 2 of 5"
 
-#: ../src/bc.c:146
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr "Codabar"
 
@@ -132,19 +132,256 @@ msgstr "MSI"
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:155
+#: ../src/bc.c:155 ../src/bc.c:213
 msgid "Code 93"
 msgstr "Code 93"
 
 #: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
 msgid "GS1-128"
 msgstr "GS1-128"
 
-#: ../src/bc.c:169
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+#, fuzzy
+msgid "HIBC QR Code"
+msgstr "IEC18004 (QRCode)"
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "EinfÃ¼gen"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Strichcode"
+
+#: ../src/bc.c:330
+#, fuzzy
+msgid "Pharmacode 2-track"
+msgstr "Strichcode-Daten"
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "LÃ¶schen"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:176
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr "IEC18004 (QRCode)"
 
@@ -332,7 +569,8 @@ msgstr "Auswahl des Dateinamens ist leer"
 
 #: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
-msgstr "Bitte wÃ¤hlen Sie eine Datei oder geben Sie einen gÃ¼ltigen Dateinamen an"
+msgstr ""
+"Bitte wÃ¤hlen Sie eine Datei oder geben Sie einen gÃ¼ltigen Dateinamen an"
 
 #: ../src/file.c:335
 msgid "File does not exist"
@@ -381,7 +619,8 @@ msgstr "Ã?nderungen am Dokument Â»%sÂ« vor dem SchlieÃ?en speichern?"
 
 #: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
-msgstr "Nicht gespeicherte Ã?nderungen gehen verloren, wenn Sie nicht speichern."
+msgstr ""
+"Nicht gespeicherte Ã?nderungen gehen verloren, wenn Sie nicht speichern."
 
 #: ../src/file.c:751
 msgid "Close without saving"
@@ -434,63 +673,63 @@ msgstr "0123456789 .:,;(*!?)"
 msgid "Sample text"
 msgstr "Beispieltext"
 
-#: ../src/glabels-batch.c:52
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "Ausgabe-Dateiname festlegen (Vorgabe: Â»output.pdfÂ«)"
 
-#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "Dateiname"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "Anzahl der BlÃ¤tter (Vorgabe: 1)"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "BlÃ¤tter"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "Anzahl der Kopien (Vorgabe: 1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "Kopien"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "Erstes Etikett auf dem ersten Blatt (Vorgabe: 1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "Erste"
 
-#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "Begrenzungen drucken (um Druckausrichtung zu testen)"
 
-#: ../src/glabels-batch.c:62 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "Spiegelbildlich drucken"
 
-#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "Schnittmarken drucken"
 
-#: ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "Eingabedatei zum Mischen"
 
-#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[DATEI...]"
 
-#: ../src/glabels-batch.c:98
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr "Mit gLabels erstellte Dateien drucken."
 
-#: ../src/glabels-batch.c:106 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
@@ -500,13 +739,13 @@ msgstr ""
 "Rufen Sie %s --helpÂ« auf, um eine vollstÃ¤ndige Liste der verfÃ¼gbaren "
 "Befehlszeilenoptionen zu sehen.\n"
 
-#: ../src/glabels-batch.c:149
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr ""
 "Dokumentverarbeitung kann mit gLabels-Datei %s nicht ausgefÃ¼hrt werden\n"
 
-#: ../src/glabels-batch.c:184
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "glabels-Datei %s kann nicht geÃ¶ffnet werden\n"
@@ -527,11 +766,11 @@ msgstr "Strichcode-Daten"
 msgid "Barcode property"
 msgstr "Strichcode-Eigenschaft"
 
-#: ../src/label-barcode.c:483
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr "Strichcode-Daten sind leer"
 
-#: ../src/label-barcode.c:487
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr "UngÃ¼ltige Strichcode-Daten"
 
@@ -795,7 +1034,8 @@ msgstr "Text: Durch Tabulatoren getrennte Werte (TSV)"
 
 #: ../src/merge-init.c:79
 msgid "Text: Tab Separated Values (TSV) with keys on line 1"
-msgstr "Text: Durch Tabulatoren getrennte Werte (TSV) mit SchlÃ¼sseln in Zeile 1"
+msgstr ""
+"Text: Durch Tabulatoren getrennte Werte (TSV) mit SchlÃ¼sseln in Zeile 1"
 
 #: ../src/merge-init.c:87
 msgid "Text: Colon separated values"
@@ -1438,7 +1678,8 @@ msgstr "Eigenschaften-Werkzeugleiste"
 #: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr ""
-"Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ein- oder ausschalten"
+"Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ein- oder "
+"ausschalten"
 
 #: ../src/ui.c:458
 msgid "Grid"
@@ -1446,7 +1687,8 @@ msgstr "Raster"
 
 #: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
-msgstr "Die Sichtbarkeit des Rasters im aktuellen Fenster ein- oder ausschalten"
+msgstr ""
+"Die Sichtbarkeit des Rasters im aktuellen Fenster ein- oder ausschalten"
 
 #: ../src/ui.c:466
 msgid "Markup"
@@ -1581,11 +1823,11 @@ msgstr "UngÃ¼ltiger Node im Daten-Node = Â»%sÂ«"
 msgid "Unknown embedded file format: \"%s\""
 msgstr "Unbekanntes eingebettetes Dateiformat: Â»%sÂ«"
 
-#: ../src/xml-label.c:1143 ../libglabels/xml-template.c:802
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Fehler in der UTF8-Umwandlung."
 
-#: ../src/xml-label.c:1150
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "Problem beim Speichern der XML-Datei."
 
@@ -2178,7 +2420,8 @@ msgstr "Bitte geben Sie die folgenden Layout-Informationen ein."
 
 #: ../data/ui/template-designer.ui.h:46
 msgid ""
-"Please enter the following size parameters of a single label in your template."
+"Please enter the following size parameters of a single label in your "
+"template."
 msgstr ""
 "Bitte geben Sie die folgenden GrÃ¶Ã?enwerte des einzelnen Etiketts in Ihrer "
 "Vorlage an."
@@ -3029,4 +3272,3 @@ msgstr "Rechteckige Kopieretiketten"
 #: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "Video-Etiketten (RÃ¼ckseite)"
-
diff --git a/po/eo.po b/po/eo.po
index cda51ce..6efa67a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-19 20:43-0400\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2007-06-06 16:48+0200\n"
 "Last-Translator: Antonio C. Codazzi <f_sophia libero it>\n"
 "Language-Team:  Esperanto <eo li org>\n"
@@ -20,1823 +20,2391 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: src/glabels.c:116
-msgid "Could not initialize Bonobo!\n"
-msgstr "Estas neeble prepari Bonobon!\n"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (iu ajn)"
 
-#: src/glabels-batch.c:52
-msgid "print this message"
-msgstr "presu tiun Ä?i mesaÄ?on"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (nur ZIP/CAP)"
 
-#: src/glabels-batch.c:54
-msgid "print the version of glabels-batch being used"
-msgstr "presu version de uzata staplo de glabels"
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP/CAP+4)"
 
-#: src/glabels-batch.c:56
-msgid "set output filename (default=\"output.ps\")"
-msgstr "agordu dosiernomon de eligo (defaÅlte \"output.ps\")"
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
 
-#: src/glabels-batch.c:56 src/glabels-batch.c:70
-msgid "filename"
-msgstr "dosiernomo"
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr ""
 
-#: src/glabels-batch.c:58
-msgid "number of sheets (default=1)"
-msgstr "nombro da folioj (defaÅlte 1)"
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (iu ajn)"
 
-#: src/glabels-batch.c:58
-msgid "sheets"
-msgstr "folioj"
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
 
-#: src/glabels-batch.c:60
-msgid "number of copies (default=1)"
-msgstr "nombro da ekzempleroj (defaÅlte 1)"
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
 
-#: src/glabels-batch.c:60
-msgid "copies"
-msgstr "ekzempleroj"
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
 
-#: src/glabels-batch.c:62
-msgid "first label on first sheet (default=1)"
-msgstr "unua etikedo de unua folio (defaÅlte 1)"
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
 
-#: src/glabels-batch.c:62
-msgid "first"
-msgstr "unua"
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
 
-#: src/glabels-batch.c:64 src/print-dialog.c:336
-msgid "print outlines (to test printer alignment)"
-msgstr "presu konturojn (por testi alliniÄ?on de la printilo)"
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
 
-#: src/glabels-batch.c:66 src/print-dialog.c:344
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "presu inverse (ekz. iun spegulitan bildon)"
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A aÅ UPC-E)"
 
-#: src/glabels-batch.c:68 src/print-dialog.c:351
-msgid "print crop marks"
-msgstr "presu liniojn de tranÄ?o"
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
 
-#: src/glabels-batch.c:70
-msgid "input file for merging"
-msgstr "eniga dosiero por kunfandi"
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
 
-#: src/glabels-batch.c:107
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr "[OPTION...] GLABELS_FILE..."
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
 
-#: src/glabels-batch.c:127
-#, c-format
-msgid "missing glabels file\n"
-msgstr "mankanta dosero de glabels\n"
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
 
-#: src/glabels-batch.c:158
-#, c-format
-msgid "cannot perform document merge with glabels file %s\n"
-msgstr "estas neeble kunfandi dokumentojn kun dosiero de glabels %s\n"
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
 
-#: src/glabels-batch.c:182
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "estas neeble malfermi dosieron de glabels %s\n"
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
 
-#: src/window.c:244
-msgid "(none) - gLabels"
-msgstr "(nenio) - gLabels"
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
 
-#: src/window.c:414
-msgid "(modified)"
-msgstr "(modifita)"
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
 
-#: src/stock.c:65 data/ui/glabels-ui.xml.h:162
-msgid "_Select Mode"
-msgstr "Modu_so de Elektado"
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Kodo 39"
 
-#: src/stock.c:66 data/ui/glabels-ui.xml.h:163
-msgid "_Text"
-msgstr "_Teksto"
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Kodo 128"
 
-#: src/stock.c:67 data/ui/glabels-ui.xml.h:148
-msgid "_Line"
-msgstr "_Linio"
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Kodo 128C"
 
-#: src/stock.c:68 data/ui/glabels-ui.xml.h:130
-msgid "_Box"
-msgstr "_Fako"
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Kodo 128B"
 
-#: src/stock.c:69 data/ui/glabels-ui.xml.h:141
-msgid "_Ellipse"
-msgstr "_Elipso"
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "Interleaved 2 of 5"
 
-#: src/stock.c:70 data/ui/glabels-ui.xml.h:146
-msgid "_Image"
-msgstr "_Bildo"
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
 
-#: src/stock.c:71 data/ui/glabels-ui.xml.h:11
-msgid "Bar_code"
-msgstr "Strek_kodo"
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
 
-#: src/stock.c:72
-msgid "_Merge Properties"
-msgstr "Ecoj de Ku_nfando"
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
 
-#: src/stock.c:73
-msgid "Object _Properties"
-msgstr "Ecoj de _Objekto"
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Kodo 39"
 
-#: src/stock.c:74 data/ui/glabels-ui.xml.h:13
-msgid "Bring to _Front"
-msgstr "Portu _Fronten"
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:109
-msgid "Send to _Back"
-msgstr "_Sendu MalantaÅen"
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:96
-msgid "Rotate _Left"
-msgstr "Turnu _Maldekstren"
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:97
-msgid "Rotate _Right"
-msgstr "Turnu _Dekstren"
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
-msgstr "Renversu _Horizontale"
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
-msgstr "Renversu _Vertikale"
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:147
-msgid "_Lefts"
-msgstr "_Maldekstre"
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Kodo 39"
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:159
-msgid "_Rights"
-msgstr "_Dekstre"
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Kodo 128"
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:131
-msgid "_Centers"
-msgstr "_Centre"
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Kodo 128"
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:164
-msgid "_Tops"
-msgstr "_Supre"
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
 
-#: src/stock.c:84
-msgid "Bottoms"
-msgstr "Sube"
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr "Centre"
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
-msgstr "Ce_ntrita Etikedo"
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
-msgstr "Koloro de plenigo"
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Kodo 39"
 
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
-msgstr "Koloro de linio"
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Kodo 39"
 
-#: src/stock.c:90 src/stock.c:92
-msgid "Linked"
-msgstr "Kunligita"
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
 
-#: src/stock.c:91 src/stock.c:93
-msgid "Not Linked"
-msgstr "Neniu Kunligo"
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
 
-#: src/ui-property-bar.c:345 src/object-editor.c:499
-msgid "Default"
+#: ../src/bc.c:225
+msgid "Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Kodo 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Kodo 39"
+
+#: ../src/bc.c:270
+msgid "HIBC Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+msgid "PLANET"
+msgstr ""
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Enmetu"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Strek_kodo"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Forigu"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
 msgstr "DefaÅlto"
 
-#: src/ui-property-bar.c:360 src/object-editor.c:512
-msgid "No fill"
-msgstr "Neniu Plenigo"
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "malhela ruÄ?o"
 
-#: src/ui-property-bar.c:375 src/object-editor.c:505
-msgid "No line"
-msgstr "Neniu Linio"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/ui-sidebar.c:180
-msgid "Object properties"
-msgstr "Ecoj de objekto"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/commands.c:385
-msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-
-#: src/commands.c:399
-msgid "See the file AUTHORS for additional credits,"
-msgstr "Vidigu la dosieron nomitan AUTHORS por pluaj informoj,"
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "malhela verdo"
 
-#: src/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
-msgstr "aÅ vizitu http://glabels.sourceforge.net/";
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
 
-#: src/commands.c:409
-msgid " "
-msgstr " "
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/commands.c:424
-msgid "glabels"
-msgstr "glabels"
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "malhela bluo"
 
-#: src/file.c:100
-msgid "New Label or Card"
-msgstr "Nova Etikedo aÅ Karto"
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "Refaru"
 
-#: src/file.c:132 src/file.c:304
-msgid "Media Type"
-msgstr "Speco de plurmedio"
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "oranÄ?a koloro"
 
-#: src/file.c:138 src/file.c:310
-msgid "Label orientation"
-msgstr "Orientado de etikedo"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
+
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "nebrila verdo"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
 
-#: src/file.c:269
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "bluo"
+
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "violo"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
+
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "oro"
+
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "flavo"
+
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "verdo"
+
+#: ../src/color-combo-menu.c:103
+#, fuzzy
+msgid "Cyan"
+msgstr "cejano"
+
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "Ä?ielbluo"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
+
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "rozkoloro"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
+
+#: ../src/color-combo-menu.c:109
+#, fuzzy
+msgid "Light Yellow"
+msgstr "hela flavo"
+
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "hela verdo"
+
+#: ../src/color-combo-menu.c:111
+#, fuzzy
+msgid "Light Cyan"
+msgstr "hela cejano"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:113
+#, fuzzy
+msgid "Thistle"
+msgstr "blanko"
+
+#: ../src/color-combo-menu.c:115
+#, fuzzy
+msgid "White"
+msgstr "blanko"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:126
+#, fuzzy
+msgid "Black"
+msgstr "nigro"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+#, fuzzy
+msgid "Custom Color"
+msgstr "Personigita Koloro:"
+
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "Personigita Koloro:"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr ""
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "Nova Etikedo aÅ Karto"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "Ecoj de etikedo"
 
-#: src/file.c:452 src/file.c:870
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr "Ä?iuj dosieroj"
 
-#: src/file.c:457 src/file.c:875
+#: ../src/file.c:272 ../src/file.c:562
 msgid "gLabels documents"
 msgstr "Dokumentoj de gLabels"
 
-#: src/file.c:505 src/file.c:617 src/file.c:934 src/file.c:1130
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
 msgstr "Elektado de nomon de vakua dosiero"
 
-#: src/file.c:506 src/file.c:520 src/file.c:618 src/file.c:632
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
 msgstr "Bonvolu indiki dosieron aÅ validan dosiernomon"
 
-#: src/file.c:519 src/file.c:631
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "la dosiero ne ekzistas"
 
-#: src/file.c:563 data/ui/glabels-ui.xml.h:74
-msgid "Open"
-msgstr "Malfermu"
-
-#: src/file.c:565
-msgid "Open label"
-msgstr "Malfermu etikedon"
-
-#: src/file.c:707
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Estas neeble malfermi dosieron \"%s\""
 
-#: src/file.c:715
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr "La formato de dosiero ne estas subtenita"
 
-#: src/file.c:797 src/file.c:979 src/file.c:1174
+#: ../src/file.c:491 ../src/file.c:670
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "estas neeble konservi dosieron \"%s\""
 
-#: src/file.c:805 src/file.c:987 src/file.c:1182
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "Eraro dum konservado. la dosiero ankoraÅ ne estas konservita."
 
-#: src/file.c:848 src/file.c:1048
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Konservu \"%s\" kiel"
 
-#: src/file.c:935 src/file.c:1131
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr "Bonvolu indiki validan dosiernomon"
 
-#: src/file.c:952 src/file.c:1147
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Ä?u mi devas anstataÅigi dosieron \"%s\"?"
 
-#: src/file.c:960 src/file.c:1155
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr "La dosiero jam ekzistas."
 
-#: src/file.c:1271
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
-msgstr "Ä?u mi devas konservi la modifojn de la dokumento \"%s\" antaÅ ol fermi?"
+msgstr ""
+"Ä?u mi devas konservi la modifojn de la dokumento \"%s\" antaÅ ol fermi?"
 
-#: src/file.c:1279
+#: ../src/file.c:748
 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:1282
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "fermu sen konservi"
 
-#. Should not happen
-#: src/prefs.c:156 src/prefs.c:163 data/glade/prefs-dialog.glade.h:23
-#: data/glade/object-editor.glade.h:37
-msgid "points"
-msgstr "punktoj"
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "Fre_Å?aj Dosieroj"
 
-#: src/prefs.c:158 data/glade/object-editor.glade.h:36
-#: data/glade/template-designer.glade.h:74
-msgid "inches"
-msgstr "coloj"
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
 
-#: src/prefs.c:160
-msgid "mm"
-msgstr "mm"
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
 
-#: src/prefs-dialog.c:248 data/glade/prefs-dialog.glade.h:22
-msgid "gLabels Preferences"
-msgstr "Agordoj de gLabels"
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "Ä?iuj dosieroj"
 
 #.
-#. * Submenu: Order
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
 #.
-#: src/view.c:3574 data/ui/glabels-ui.xml.h:154
-msgid "_Order"
-msgstr "_Ordo"
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
 
-#.
-#. * Submenu: Rotate/Flip
-#.
-#: src/view.c:3595 data/ui/glabels-ui.xml.h:160
-msgid "_Rotate/Flip"
-msgstr "_Rotacio/Renverso"
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
 
-#.
-#. * Submenu: Align Horizontally
-#.
-#: src/view.c:3628
-msgid "Align _Horizontally"
-msgstr "LaÅlinnigu _Horizontale"
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
 
-#.
-#. * Submenu: Align Vertically
-#.
-#: src/view.c:3667
-msgid "Align _Vertically"
-msgstr "LaÅlinnigu _Verticale"
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
 
-#: src/view.c:3728 data/ui/glabels-ui.xml.h:137
-msgid "_Delete"
-msgstr "_Forigu"
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
 
-#. Build editor.
-#: src/view-box.c:224
-msgid "Box object properties"
-msgstr "Ecoj de Fako"
+#: ../src/glabels-batch.c:53
+#, fuzzy
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "agordu dosiernomon de eligo (defaÅlte \"output.ps\")"
 
-#. Build editor.
-#: src/view-ellipse.c:224
-msgid "Ellipse object properties"
-msgstr "Ecoj de Elipso"
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
+msgid "filename"
+msgstr "dosiernomo"
 
-#. Build editor.
-#: src/view-line.c:224
-msgid "Line object properties"
-msgstr "Ecoj de Linio"
+#: ../src/glabels-batch.c:55
+msgid "number of sheets (default=1)"
+msgstr "nombro da folioj (defaÅlte 1)"
 
-#. Build editor.
-#: src/view-image.c:223
-msgid "Image object properties"
-msgstr "Ecoj de Bildo"
+#: ../src/glabels-batch.c:55
+msgid "sheets"
+msgstr "folioj"
 
-#. Build editor.
-#: src/view-text.c:251
-msgid "Text object properties"
-msgstr "Ecoj de Teksto"
+#: ../src/glabels-batch.c:57
+msgid "number of copies (default=1)"
+msgstr "nombro da ekzempleroj (defaÅlte 1)"
 
-#: src/view-text.c:563 data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "Teksto"
+#: ../src/glabels-batch.c:57
+msgid "copies"
+msgstr "ekzempleroj"
 
-#. Build editor.
-#: src/view-barcode.c:210
-msgid "Barcode object properties"
-msgstr "Ecoj de Strekkodo"
+#: ../src/glabels-batch.c:59
+msgid "first label on first sheet (default=1)"
+msgstr "unua etikedo de unua folio (defaÅlte 1)"
 
-#: src/view-barcode.c:580 src/print.c:1089
-msgid "Invalid barcode data"
-msgstr "Nevalida strekkodo"
+#: ../src/glabels-batch.c:59
+msgid "first"
+msgstr "unua"
 
-#: src/merge-properties-dialog.c:231
-msgid "Merge Properties"
-msgstr "Ecoj de Kunfando"
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "presu konturojn (por testi alliniÄ?on de la printilo)"
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "Fonto"
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "presu inverse (ekz. iun spegulitan bildon)"
 
-#: src/merge-properties-dialog.c:245
-msgid "Format:"
-msgstr "Formato:"
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
+msgstr "presu liniojn de tranÄ?o"
 
-#. Location line
-#: src/merge-properties-dialog.c:273
-msgid "Location:"
-msgstr "LokiÄ?o:"
+#: ../src/glabels-batch.c:67
+msgid "input file for merging"
+msgstr "eniga dosiero por kunfandi"
 
-#: src/merge-properties-dialog.c:282 src/merge-properties-dialog.c:393
-msgid "Select merge-database source"
-msgstr "Elektu fonton de kunfand-datumbazo"
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr ""
 
-#: src/merge-properties-dialog.c:289 src/merge-properties-dialog.c:404
-msgid "N/A"
-msgstr "N/A"
+#: ../src/glabels-batch.c:99
+msgid "Print files created with gLabels."
+msgstr ""
 
-#. ---- Sample Fields section ----
-#: src/merge-properties-dialog.c:300
-msgid "Record selection/preview:"
-msgstr "Elektado/AntaÅmontro de rikordo:"
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "Elektu"
+#: ../src/glabels-batch.c:151
+#, c-format
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "estas neeble kunfandi dokumentojn kun dosiero de glabels %s\n"
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
-msgstr "Rikordo/Kampo"
+#: ../src/glabels-batch.c:186
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "estas neeble malfermi dosieron de glabels %s\n"
 
-#: src/merge-properties-dialog.c:342 data/glade/object-editor.glade.h:9
-msgid "Data"
-msgstr "Datumoj"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr ""
 
-#: src/print-dialog.c:266 data/ui/glabels-ui.xml.h:81
-msgid "Print"
-msgstr "Presu"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Keu strekkodan objekton"
 
-#: src/print-dialog.c:281
-msgid "_Job"
-msgstr "_Laboro"
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "Strek_kodo"
 
-#: src/print-dialog.c:286
-msgid "P_rinter"
-msgstr "P_rintilo"
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "Ecoj de Strekkodo"
 
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:314
-msgid "Copies"
-msgstr "Ekzempleroj"
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr ""
 
-#. ------- Add merge control widget ------------
-#: src/print-dialog.c:322
-msgid "Document merge control"
-msgstr "Kontrolo de kunfando de dokumento"
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "Nevalida strekkodo"
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "Opcioj"
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "Kreu tekstan objekton"
 
-#: src/print-dialog.c:553 src/print-dialog.c:592
-msgid "Print preview"
-msgstr "AntaÅmontro de presado"
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "Koloro de plenigo"
 
-#: src/template-designer.c:409 data/glade/template-designer.glade.h:73
-msgid "gLabels Template Designer"
-msgstr "Desegnilo de modeloj por gLabels"
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "Koloro de linio"
 
-#: src/bc.c:60
-msgid "POSTNET (any)"
-msgstr "POSTNET (iu ajn)"
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "LarÄ?o de linio"
 
-#: src/bc.c:63
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (nur ZIP/CAP)"
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "Sen nomo"
 
-#: src/bc.c:66
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP/CAP+4)"
+#: ../src/label.c:705 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "Ecoj de Kunfando"
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "Forigu"
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr "EAN (iu ajn)"
+#: ../src/label.c:1230 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "Portu _Fronten"
 
-#: src/bc.c:75
-msgid "EAN-8"
-msgstr "EAN-8"
+#: ../src/label.c:1266 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "_Sendu MalantaÅen"
 
-#: src/bc.c:78
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
+#: ../src/label.c:1307
+msgid "Rotate"
+msgstr "Rotacio"
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
+#: ../src/label.c:1342 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "Turnu _Maldekstren"
 
-#: src/bc.c:84
-msgid "EAN-13"
-msgstr "EAN-13"
+#: ../src/label.c:1375 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "Turnu _Dekstren"
 
-#: src/bc.c:87
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
+#: ../src/label.c:1410 ../src/ui.c:352
+#, fuzzy
+msgid "Flip horizontally"
+msgstr "Renversu _Horizontale"
 
-#: src/bc.c:90
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
+#: ../src/label.c:1445 ../src/ui.c:359
+#, fuzzy
+msgid "Flip vertically"
+msgstr "Renversu _Vertikale"
 
-#: src/bc.c:93
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A aÅ UPC-E)"
+#: ../src/label.c:1485 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "AlliniÄ?o:"
 
-#: src/bc.c:96
-msgid "UPC-A"
-msgstr "UPC-A"
+#: ../src/label.c:1542 ../src/ui.c:373
+#, fuzzy
+msgid "Align right"
+msgstr "LaÅlinnigu _Horizontale"
 
-#: src/bc.c:99
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
+#: ../src/label.c:1603 ../src/ui.c:380
+#, fuzzy
+msgid "Align horizontal center"
+msgstr "LaÅlinnigu objektojn laÅ horizontala centro"
 
-#: src/bc.c:102
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
+#: ../src/label.c:1679 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "LaÅlinnigu objektojn supre"
 
-#: src/bc.c:105
-msgid "UPC-E"
-msgstr "UPC-E"
+#: ../src/label.c:1736 ../src/ui.c:394
+#, fuzzy
+msgid "Align bottoms"
+msgstr "LaÅlinnigu objektojn sube"
 
-#: src/bc.c:108
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
+#: ../src/label.c:1797 ../src/ui.c:401
+#, fuzzy
+msgid "Align vertical center"
+msgstr "LaÅliniigu objektojn laÅ verticala centro"
 
-#: src/bc.c:111
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
+#: ../src/label.c:1875 ../src/ui.c:408
+#, fuzzy
+msgid "Center horizontally"
+msgstr "Renversu objekton horizontale"
 
-#: src/bc.c:114
-msgid "ISBN"
-msgstr "ISBN"
+#: ../src/label.c:1922 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "Renversu objekton vertikale"
 
-#: src/bc.c:117
-msgid "ISBN +5"
-msgstr "ISBN +5"
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "Enmetu"
 
-#: src/bc.c:120
-msgid "Code 39"
-msgstr "Kodo 39"
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Kreu linian objekton"
 
-#: src/bc.c:123
-msgid "Code 128"
-msgstr "Kodo 128"
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Kreu bildan objekton"
 
-#: src/bc.c:126
-msgid "Code 128C"
-msgstr "Kodo 128C"
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "Restarigu grandon de bildo"
 
-#: src/bc.c:129
-msgid "Code 128B"
-msgstr "Kodo 128B"
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Kreu linian objekton"
 
-#: src/bc.c:132
-msgid "Interleaved 2 of 5"
-msgstr "Interleaved 2 of 5"
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
 
-#: src/bc.c:135
-msgid "Codabar"
-msgstr "Codabar"
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Grando de paÄ?o:"
 
-#: src/bc.c:138
-msgid "MSI"
-msgstr "MSI"
+#: ../src/label-object.c:1185
+msgid "Shadow state"
+msgstr ""
 
-#: src/bc.c:141
-msgid "Plessey"
-msgstr "Plessey"
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
+msgstr ""
 
-#: src/label.c:569
-msgid "Untitled"
-msgstr "Sen nomo"
+#: ../src/label-object.c:1276
+msgid "Shadow color"
+msgstr ""
 
-#: src/xml-label.c:176 src/xml-label.c:213
-msgid "xmlParseFile error"
-msgstr "Eraro de xml-dosiero de sintaksa analizo"
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
+msgstr ""
 
-#: src/xml-label.c:250
-msgid "No document root"
-msgstr "Neniu radika dokumento"
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Kreu tekstan objekton"
 
-#: src/xml-label.c:264
-msgid "Importing from glabels 0.1 format"
-msgstr "Importante el formato de glabels 0.1"
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "rozkoloro"
 
-#: src/xml-label.c:272
-msgid "Importing from glabels 0.4 format"
-msgstr "Importante el formato de glabels 0.4"
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "Nomo de tiparo"
 
-#: src/xml-label.c:279
-msgid "Importing from glabels 1.91 format"
-msgstr "Importante el formato de glabels 1.91"
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Tipargrando"
 
-#: src/xml-label.c:282
-msgid "bad document, unknown glabels Namespace"
-msgstr "Nekorekta dokumento, nekonata Nomospaco de glabels"
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Nomo de tiparo"
 
-#: src/xml-label.c:311 src/xml-label-04.c:75 src/xml-label-191.c:131
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Nekorekta radika nodo = \"%s\""
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "Kursivo"
 
-#: src/xml-label.c:348 src/xml-label-191.c:165
-#, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "nekorekta nodo en nodo de Dokumeto = \"%s\""
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "AlliniÄ?o:"
 
-#: src/xml-label.c:393 src/xml-label-04.c:123 src/xml-label-191.c:197
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "nekorekta nodo = \"%s\""
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "Interspaco:"
 
-#: src/xml-label.c:796 src/xml-label-191.c:605
-#, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "nekorekta nodo en nodo de Datumoj = \"%s\""
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "Koloro de teksto"
 
-#: src/xml-label.c:962 libglabels/xml-template.c:535
-msgid "Utf8 conversion error."
-msgstr "eraro de konvertado en Utf8."
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
 
-#: src/xml-label.c:969 libglabels/xml-template.c:542
-msgid "Problem saving xml file."
-msgstr "Problemo laÅ konservo de xml-dosiero"
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+msgctxt "Brand"
+msgid "Any"
+msgstr ""
 
-#. This should always be an id, but just in case a name
-#. slips by!
-#: src/xml-label-191.c:680 libglabels/xml-template.c:199
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
-msgstr "Nekonata id \"%s\" de grando de paÄ?o, provante kiel nomo"
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
+msgstr ""
 
-#: src/xml-label-191.c:690 libglabels/xml-template.c:209
-#, c-format
-msgid "Unknown page size id or name \"%s\""
-msgstr "Nekonata id de (paÄ?o)grando aÅ de nomo \"%s\""
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
+msgstr ""
 
-#: src/merge.c:172 src/merge.c:213 src/merge.c:399 src/merge.c:402
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "Neniu modelo estis trovita!"
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr ""
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Neniu modelo estis trovita!"
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
 msgstr "Nenio"
 
-#: src/merge-init.c:53
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Teksta dosiero kun komo kiel disigilo (CSV)"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr ""
 
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
-msgstr "Teksta dosiero kun komo kiel disigilo"
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+#, fuzzy
+msgid "Couldn't open addressbook."
+msgstr "Estas neeble malfermi dosieron \"%s\""
 
-#: src/merge-init.c:67
-msgid "Text file with tab delimeters"
-msgstr "Teksta dosiero kun TAB kiel disigilo"
+#: ../src/merge-evolution.c:348
+#, fuzzy
+msgid "Couldn't list available fields."
+msgstr "estas neeble konservi dosieron \"%s\""
 
-#: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11
-msgid "File:"
-msgstr "Dosiero:"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr ""
 
-#: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "Å?losilo:"
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "Folioj:"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "Etikedoj"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "de:"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "Ä?is:"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr "Starto en etikedo"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "en 1a folio"
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "Ekzempleroj:"
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "LaÅkajere"
+#: ../src/merge-init.c:119
+msgid "Evolution Addressbook"
+msgstr ""
 
-#: src/wdgt-media-select.c:269 data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "Priskribo:"
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr ""
 
-#: src/wdgt-media-select.c:279 data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "Grando de paÄ?o:"
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Ecoj de Kunfando"
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "Grando de etikedo:"
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Elektu fonton de kunfand-datumbazo"
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "Aspekto:"
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d  (%d por folio)"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Elektu"
 
-#: src/wdgt-media-select.c:582
-#, c-format
-msgid "%d per sheet"
-msgstr "%d por folio"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Rikordo/Kampo"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "Datumoj"
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+#, fuzzy
+msgid "Fixed"
+msgstr "Dosiero:"
 
-#: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s diametro"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
 
-#: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s diametro"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Modu_so de Elektado"
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "Rotacio"
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "Orientado de etikedo"
 
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
-msgid "custom"
-msgstr "personigita"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
-msgid "Custom Color:"
-msgstr "Personigita Koloro:"
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "DefaÅlto"
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr "Elektu personigitan koloron"
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "Ecoj de objekto"
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-msgstr "nigro"
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "Ecoj de Fako"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr "hela bruna koloro"
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "Ecoj de Elipso"
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
-msgstr "malhela oro"
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "Ecoj de Linio"
 
-#: src/mygal/color-palette.c:582
-msgid "dark green #2"
-msgstr "malhela verdo #2"
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "Ecoj de Bildo"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
-msgstr "mararmea bluo"
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "Ecoj de Teksto"
 
-#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr "malhela bluo"
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "Ecoj de Strekkodo"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr "viola koloro #2"
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Enigu campon de kunfando"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr "tre malhela grizo"
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+#, fuzzy
+msgid "No Fill"
+msgstr "Neniu Plenigo"
 
-#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr "malhela ruÄ?o"
+#: ../src/object-editor-image-page.c:278
+#, fuzzy
+msgid "All Files"
+msgstr "Ä?iuj dosieroj"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
-msgstr "ruÄ?-oranÄ?o"
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "Bildo"
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr "oro"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr ""
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr "malhela verdo"
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+#, fuzzy
+msgid "No Line"
+msgstr "Neniu Linio"
 
-#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr "nebrila bluo"
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "Agordoj de gLabels"
 
-#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
-msgid "blue"
-msgstr "bluo"
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "Etikedoj"
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr "nebrila violo"
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "Modu_so de Elektado"
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-msgstr "malhela grizo"
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "_Teksto"
 
-#: src/mygal/color-palette.c:599
-msgid "red"
-msgstr "ruÄ?o"
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "_Linio"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr "oranÄ?a koloro"
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "_Fako"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr "limeta koloro"
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "_Elipso"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr "nebrila verdo"
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "_Bildo"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr "nebrila bluo #2"
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "Strek_kodo"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr "Ä?ielbluo #2"
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "Ecoj de Ku_nfando"
 
-#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
-msgid "purple"
-msgstr "violo"
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "Ecoj de _Objekto"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr "grizo"
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "Portu _Fronten"
 
-#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
-msgid "magenta"
-msgstr "intense karmezina"
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "_Sendu MalantaÅen"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
-msgstr "brila oranÄ?o"
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "Turnu _Maldekstren"
 
-#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
-msgid "yellow"
-msgstr "flavo"
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "Turnu _Dekstren"
 
-#: src/mygal/color-palette.c:612
-msgid "green"
-msgstr "verdo"
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "Renversu _Horizontale"
 
-#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr "cejano"
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "Renversu _Vertikale"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr "brila bluo"
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "_Maldekstre"
 
-#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
-msgid "red purple"
-msgstr "ruÄ?-violo"
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "_Dekstre"
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
-msgstr "hela grizo"
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "_Centre"
 
-#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
-msgid "pink"
-msgstr "rozkoloro"
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "_Supre"
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
-msgstr "hela oranÄ?o"
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "Sube"
 
-#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr "hela flavo"
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "Centre"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
-msgstr "hela verdo"
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "Ce_ntrita Etikedo"
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
-msgstr "hela cejano"
+#: ../src/stock.c:95 ../src/stock.c:97
+msgid "Linked"
+msgstr "Kunligita"
 
-#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
-msgid "light blue"
-msgstr "hela bluo"
+#: ../src/stock.c:96 ../src/stock.c:98
+msgid "Not Linked"
+msgstr "Neniu Kunligo"
 
-#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
-msgid "light purple"
-msgstr "hela violo"
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "Desegnilo de modeloj por gLabels"
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr "blanko"
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr ""
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
-msgstr "viol-bluo"
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "Nomo kaj Priskribo"
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr "malhela violo"
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Grando de paÄ?o"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr "Ä?ielbluo"
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Formo de etikedo aÅ de karto"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr "Ä?enerala %s plena paÄ?o"
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "Formo de etikedo aÅ de karto"
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "Neniu modelo estis trovita!"
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "Grando de etikedo (Ronda)"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr "AliaÄµoj"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Grando de etikedo (KD/DVD)"
 
-#: libglabels/paper.c:361
-msgid "No paper files found!"
-msgstr "Neniu papera dosiero estis trovita!!"
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "Nombro da Aspektoj"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
-msgstr "Pri glabels"
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "Aspekto(j)"
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr "Pri..."
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "Fino de Projektado"
 
-#: data/ui/glabels-ui.xml.h:3
-msgid "Align _Horizontal"
-msgstr "LaÅlinnigu _Horizontale"
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Desegnilo de modeloj por gLabels"
 
-#: data/ui/glabels-ui.xml.h:4
-msgid "Align _Vertical"
-msgstr "LaÅlinnigu _Verticale"
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr "LaÅlinnigu objektojn sube"
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "_Dosiero"
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr "LaÅlinnigu objektojn laÅ horizontala centro"
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "Fre_Å?aj Dosieroj"
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr "LaÅlinnigu objektojn laÅ maldekstra rando"
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "R_edaktu"
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr "LaÅlinnigu objektojn laÅ dekstra rando"
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "_Videbligo"
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr "LaÅlinnigu objektojn supre"
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
+msgstr "Personigu Ä?efan ilarstangon"
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr "LaÅliniigu objektojn laÅ verticala centro"
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
+msgstr "Personigu ilarstangon de desegno"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr "Dika"
+#: ../src/ui.c:99
+#, fuzzy
+msgid "Customize Properties Toolbar"
+msgstr "Personigu ilarstangon de ecoj"
 
-#: data/ui/glabels-ui.xml.h:14
-msgid "Center align"
-msgstr "LaÅliniiÄ?u centre"
+#: ../src/ui.c:100
+msgid "_Objects"
+msgstr "_Objektoj"
 
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
-msgstr "Centrigu objektojn laÅ horizontala centro de etikedo"
+#: ../src/ui.c:101
+#, fuzzy
+msgid "_Create"
+msgstr "_Centre"
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr "Centrigu objektojn laÅ vertikala centro de etikedo"
+#: ../src/ui.c:102
+msgid "_Order"
+msgstr "_Ordo"
 
-#: data/ui/glabels-ui.xml.h:17
-msgid "Change the visibility of markup lines in the current window"
-msgstr "Å?angu videblecon de linioj de demarkacio en nuna fenestro"
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "_Rotacio/Renverso"
 
-#: data/ui/glabels-ui.xml.h:18
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr "Å?angu videblecon de la ilarstango de desegno en nuna fenestro"
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
+msgstr "LaÅlinnigu _Horizontale"
 
-#: data/ui/glabels-ui.xml.h:19
-msgid "Change the visibility of the grid in the current window"
-msgstr "Å?angu videblecon de la krado en nuna fenestro"
+#: ../src/ui.c:105
+msgid "Align _Vertical"
+msgstr "LaÅlinnigu _Verticale"
 
-#: data/ui/glabels-ui.xml.h:20
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr "Å?angu videblecon de la Ä?efa ilarstango en nuna fenestro"
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "_Helpilo"
 
-#: data/ui/glabels-ui.xml.h:21
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr "Å?angu videblecon de ilarstango de ecoj en nuna fenestro"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+#, fuzzy
+msgid "Context Menu"
+msgstr "Entenoj"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr "Fermu"
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "_Nova"
 
-#: data/ui/glabels-ui.xml.h:23
-msgid "Close the current file"
-msgstr "Fermu la nunan dosieron"
+#: ../src/ui.c:117
+#, fuzzy
+msgid "Create a new file"
+msgstr "Kreu novan dokumenton"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr "Agordu la programon"
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "M_alfermu..."
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
-msgstr "Entenoj"
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "Malfermu iun dosieron"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr "Kopiu"
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "_Konservu"
 
-#: data/ui/glabels-ui.xml.h:27
-msgid "Copy the selection"
-msgstr "Kopiu la elektaÄµon"
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "Konservu la nunan dosieron"
 
-#: data/ui/glabels-ui.xml.h:28
-msgid "Create a custom template"
-msgstr "Kreu personigitan modelon"
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "Konservu kiel..."
 
-#: data/ui/glabels-ui.xml.h:29
-msgid "Create a new document"
-msgstr "Kreu novan dokumenton"
+#: ../src/ui.c:138
+#, fuzzy
+msgid "Save the current file to a different name"
+msgstr "Konservu la nunan dosieron per alia nomo"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "Keu strekkodan objekton"
+#: ../src/ui.c:143
+msgid "_Print..."
+msgstr "_Presu..."
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "Kreu objekton de areo/rektangulo"
+#: ../src/ui.c:145
+msgid "Print the current file"
+msgstr "Presu la nunan dosieron"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "Kreu objekton de elipse/circlo"
+#: ../src/ui.c:150
+#, fuzzy
+msgid "Properties..."
+msgstr "E_coj..."
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "Kreu bildan objekton"
+#: ../src/ui.c:152
+msgid "Modify document properties"
+msgstr "Radaktu ecojn de dokumento"
 
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
-msgstr "Kreu linian objekton"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr "_Desegnilo de Modeloj..."
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "Kreu tekstan objekton"
+#: ../src/ui.c:159
+msgid "Create a custom template"
+msgstr "Kreu personigitan modelon"
 
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
-msgstr "El_tondu"
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "_Fermu"
 
-#: data/ui/glabels-ui.xml.h:37
-msgid "Customize"
-msgstr "Personigu"
+#: ../src/ui.c:166
+msgid "Close the current file"
+msgstr "Fermu la nunan dosieron"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
-msgstr "Personigu ilarstangon de desegno"
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "_Eliro"
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
-msgstr "Personigu Ä?efan ilarstangon"
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "Eliru el programo"
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
-msgstr "Personigu ilarstangon de ecoj"
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "Malfaru"
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
-msgstr "Personigu ilarstangojn"
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr "Refaru"
 
-#: data/ui/glabels-ui.xml.h:42
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Eltondu"
 
-#: data/ui/glabels-ui.xml.h:43
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Eltondu elektaÄµon"
 
-#: data/ui/glabels-ui.xml.h:44
-msgid "Decrease magnification"
-msgstr "Malpliigu zomon"
+#: ../src/ui.c:201
+msgid "Copy"
+msgstr "Kopiu"
 
-#: data/ui/glabels-ui.xml.h:45
-msgid "Delete"
-msgstr "Forigu"
+#: ../src/ui.c:203
+msgid "Copy the selection"
+msgstr "Kopiu la elektaÄµon"
+
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
+msgstr "Enmetu la poÅ?on"
 
-#: data/ui/glabels-ui.xml.h:46
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Forigu elektitajn objektojn"
 
-#: data/ui/glabels-ui.xml.h:47
-msgid "Drawing toolbar"
-msgstr "Ilarstango de desegno"
+#: ../src/ui.c:222
+msgid "Select All"
+msgstr "Elektu Ä?ion"
 
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
-msgstr "Å?utu XML"
+#: ../src/ui.c:224
+msgid "Select all objects"
+msgstr "Elektu Ä?iujn objektojn"
 
-#: data/ui/glabels-ui.xml.h:49
-msgid "Dump the UI Xml description"
-msgstr "Å?utu priskribon de UI xml"
+#: ../src/ui.c:229
+msgid "Un-select All"
+msgstr "Malelektu Ä?ion"
 
-#: data/ui/glabels-ui.xml.h:50
-msgid "Edit merge properties"
-msgstr "Redaktu ecojn de kunfando"
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "Formovu Ä?iujn elektaÄµojn"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
-msgstr "Renversu objekton horizontale"
+#: ../src/ui.c:236
+msgid "Preferences"
+msgstr "Agordoj"
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
-msgstr "Renversu objekton vertikale"
+#: ../src/ui.c:238
+msgid "Configure the application"
+msgstr "Agordu la programon"
 
-#: data/ui/glabels-ui.xml.h:56
-msgid "Font name"
-msgstr "Nomo de tiparo"
+#: ../src/ui.c:245
+#, fuzzy
+msgid "Zoom in"
+msgstr "_Zomo"
 
-#: data/ui/glabels-ui.xml.h:57
-msgid "Font selector"
-msgstr "Elektilo de tiparo"
+#: ../src/ui.c:247
+msgid "Increase magnification"
+msgstr "Pliigu zomon"
 
-#: data/ui/glabels-ui.xml.h:58
-msgid "Font size"
-msgstr "Tipargrando"
+#: ../src/ui.c:252
+#, fuzzy
+msgid "Zoom out"
+msgstr "_Malzomo"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
-msgstr "Ikono kaj _Teksto"
+#: ../src/ui.c:254
+msgid "Decrease magnification"
+msgstr "Malpliigu zomon"
 
-#: data/ui/glabels-ui.xml.h:60
-msgid "Increase magnification"
-msgstr "Pliigu zomon"
+#: ../src/ui.c:259
+#, fuzzy
+msgid "Zoom 1 to 1"
+msgstr "Zomo je _1:1"
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
-msgstr "Kursivo"
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
+msgstr "Reen 100%"
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
-msgstr "LaÅliniigu maldekstren"
+#: ../src/ui.c:266
+#, fuzzy
+msgid "Zoom to fit"
+msgstr "AlÄ?ustigu"
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
-msgstr "LarÄ?o de linio"
+#: ../src/ui.c:268
+#, fuzzy
+msgid "Set scale to fit window"
+msgstr "AlÄ?ustigu al la fenestro"
 
-#: data/ui/glabels-ui.xml.h:66
-msgid "Lower object to bottom"
-msgstr "Subentiru objekton Ä?is la fundo"
+#: ../src/ui.c:275
+#, fuzzy
+msgid "Select Mode"
+msgstr "Modu_so de Elektado"
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
-msgstr "M_arkado"
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "Elektu, movu kaj redaktu objektojn"
 
-#: data/ui/glabels-ui.xml.h:68
-msgid "Main toolbar"
-msgstr "Ä?efa ilarstango"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Text"
+msgstr "Teksto"
 
-#: data/ui/glabels-ui.xml.h:69
-msgid "Markup"
-msgstr "MarkaÄµoj"
+#: ../src/ui.c:289
+#, fuzzy
+msgid "Box"
+msgstr "_Fako"
 
-#: data/ui/glabels-ui.xml.h:70
-msgid "Modify document properties"
-msgstr "Radaktu ecojn de dokumento"
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "Kreu objekton de areo/rektangulo"
 
-#: data/ui/glabels-ui.xml.h:71
-msgid "New"
-msgstr "Nova"
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Line"
+msgstr "Linio"
 
-#: data/ui/glabels-ui.xml.h:72
-msgid "Object property editor"
-msgstr "Redaktilo de ecoj por objekto"
+#: ../src/ui.c:303
+#, fuzzy
+msgid "Ellipse"
+msgstr "_Elipso"
 
-#: data/ui/glabels-ui.xml.h:73
-msgid "Only show icons in the main toolbar"
-msgstr "Videbligu nur ikonojn en Ä?efa ilarstango"
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "Kreu objekton de elipse/circlo"
 
-#: data/ui/glabels-ui.xml.h:75
-msgid "Open a file"
-msgstr "Malfermu iun dosieron"
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
+msgid "Image"
+msgstr "Bildo"
 
-#: data/ui/glabels-ui.xml.h:76
-msgid "Open the glabels manual"
-msgstr "Malfermu manlibron de glabels"
+#: ../src/ui.c:317
+#, fuzzy
+msgid "Barcode"
+msgstr "Strek_kodo"
 
-#: data/ui/glabels-ui.xml.h:77
-msgid "Paste"
-msgstr "Enmetu"
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr "Suprentiru objekton Ä?is la pinto"
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste the clipboard"
-msgstr "Enmetu la poÅ?on"
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
+msgstr "Subentiru objekton Ä?is la fundo"
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Pr_eferences..."
-msgstr "A_gordoj..."
+#: ../src/ui.c:340
+#, fuzzy
+msgid "Rotate object 90 degrees counter-clockwise"
+msgstr "Turnu la objekton je 90Â° kontraÅmontrile"
 
-#: data/ui/glabels-ui.xml.h:80
-msgid "Preferences"
-msgstr "Agordoj"
+#: ../src/ui.c:347
+#, fuzzy
+msgid "Rotate object 90 degrees clockwise"
+msgstr "Turnu la objekton je 90Â° dekstroÄ?ire"
 
-#: data/ui/glabels-ui.xml.h:82
-msgid "Print the current file"
-msgstr "Presu la nunan dosieron"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
+msgstr "Renversu objekton horizontale"
 
-#: data/ui/glabels-ui.xml.h:83
-msgid "Proper_ties..."
-msgstr "E_coj..."
+#: ../src/ui.c:361
+msgid "Flip object vertically"
+msgstr "Renversu objekton vertikale"
 
-#: data/ui/glabels-ui.xml.h:84
-msgid "Properties"
-msgstr "Ecoj"
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
+msgstr "LaÅlinnigu objektojn laÅ maldekstra rando"
 
-#: data/ui/glabels-ui.xml.h:85
-msgid "Property toolbar"
-msgstr "Ilarstango de ecoj"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
+msgstr "LaÅlinnigu objektojn laÅ dekstra rando"
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Quit"
-msgstr "Eliro"
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
+msgstr "LaÅlinnigu objektojn laÅ horizontala centro"
 
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit the program"
-msgstr "Eliru el programo"
+#: ../src/ui.c:389
+#, fuzzy
+msgid "Align objects to top edges"
+msgstr "LaÅlinnigu objektojn laÅ maldekstra rando"
 
-#: data/ui/glabels-ui.xml.h:88
-msgid "Raise object to top"
-msgstr "Suprentiru objekton Ä?is la pinto"
+#: ../src/ui.c:396
+#, fuzzy
+msgid "Align objects to bottom edges"
+msgstr "LaÅlinnigu objektojn sube"
 
-#: data/ui/glabels-ui.xml.h:89
-msgid "Recent _Files"
-msgstr "Fre_Å?aj Dosieroj"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
+msgstr "LaÅliniigu objektojn laÅ verticala centro"
 
-#: data/ui/glabels-ui.xml.h:90
-msgid "Redo"
-msgstr "Refaru"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr "Centrigu objektojn laÅ horizontala centro de etikedo"
 
-#: data/ui/glabels-ui.xml.h:91
-msgid "Redo the undone action"
-msgstr "Refaru la lastan malfaritan agon"
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr "Centrigu objektojn laÅ vertikala centro de etikedo"
 
-#: data/ui/glabels-ui.xml.h:92
-msgid "Remove all selections"
-msgstr "Formovu Ä?iujn elektaÄµojn"
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "Redaktu ecojn de kunfando"
 
-#: data/ui/glabels-ui.xml.h:94
-#, no-c-format
-msgid "Restore scale to 100%"
-msgstr "Reen 100%"
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr "Entenoj"
 
-#: data/ui/glabels-ui.xml.h:95
-msgid "Right align"
-msgstr "laÅliniigu dekstren"
+#: ../src/ui.c:433
+#, fuzzy
+msgid "Open glabels manual"
+msgstr "Malfermu manlibron de glabels"
 
-#: data/ui/glabels-ui.xml.h:98
-msgid "Rotate object 90 clockwise"
-msgstr "Turnu la objekton je 90Â° dekstroÄ?ire"
+#: ../src/ui.c:438
+msgid "About..."
+msgstr "Pri..."
 
-#: data/ui/glabels-ui.xml.h:99
-msgid "Rotate object 90 counter-clockwise"
-msgstr "Turnu la objekton je 90Â° kontraÅmontrile"
+#: ../src/ui.c:440
+msgid "About glabels"
+msgstr "Pri glabels"
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Save"
-msgstr "Konservu"
+#: ../src/ui.c:450
+msgid "Property toolbar"
+msgstr "Ilarstango de ecoj"
 
-#: data/ui/glabels-ui.xml.h:101
-msgid "Save As"
-msgstr "Konservu kiel"
+#: ../src/ui.c:452
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr "Å?angu videblecon de ilarstango de ecoj en nuna fenestro"
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save _As..."
-msgstr "Konservu kiel..."
+#: ../src/ui.c:458
+#, fuzzy
+msgid "Grid"
+msgstr "_Krado"
 
-#: data/ui/glabels-ui.xml.h:103
-msgid "Save the current file"
-msgstr "Konservu la nunan dosieron"
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr "Å?angu videblecon de la krado en nuna fenestro"
 
-#: data/ui/glabels-ui.xml.h:104
-msgid "Save the current file with a different name"
-msgstr "Konservu la nunan dosieron per alia nomo"
+#: ../src/ui.c:466
+msgid "Markup"
+msgstr "MarkaÄµoj"
 
-#: data/ui/glabels-ui.xml.h:105
-msgid "Select All"
-msgstr "Elektu Ä?ion"
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
+msgstr "Å?angu videblecon de linioj de demarkacio en nuna fenestro"
 
-#: data/ui/glabels-ui.xml.h:106
-msgid "Select _All"
-msgstr "Elektu _Ä?ion"
+#: ../src/ui.c:479
+msgid "Main toolbar"
+msgstr "Ä?efa ilarstango"
 
-#: data/ui/glabels-ui.xml.h:107
-msgid "Select all objects"
-msgstr "Elektu Ä?iujn objektojn"
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
+msgstr "Å?angu videblecon de la Ä?efa ilarstango en nuna fenestro"
 
-#: data/ui/glabels-ui.xml.h:108
-msgid "Select, move and modify objects"
-msgstr "Elektu, movu kaj redaktu objektojn"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
+msgstr "Ilarstango de desegno"
 
-#: data/ui/glabels-ui.xml.h:110
-msgid "Set main toolbar button style according to desktop default"
-msgstr "Agordu butonstilon de Ä?efa ilarstango laÅ defaÅlto de labortablo"
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
+msgstr "Å?angu videblecon de la ilarstango de desegno en nuna fenestro"
+
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Show _Tooltips"
-msgstr "Mon_tru Sugestojn"
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
+msgstr "Vidigu la dosieron nomitan AUTHORS por pluaj informoj,"
+
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
+msgstr "aÅ vizitu http://glabels.sourceforge.net/";
+
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:112
-msgid "Show both icons and texts in the main toolbar"
-msgstr "Vidigu kaj ikonojn kaj tekstojn en la Ä?efa ilarstango"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show tooltips in the drawing toolbar"
-msgstr "Vidigu sugestojn en la ilarstango de desegno"
+#: ../src/ui-commands.c:1161
+msgid ""
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:114
-msgid "Show tooltips in the main toolbar"
-msgstr "Vidigu sugestojn en la Ä?efa ilarstango"
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "glabels"
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show tooltips in the property toolbar"
-msgstr "Vidigu sugestojn en la ilarstango de ecoj"
+#: ../src/warning-handler.c:69
+#, fuzzy
+msgid "gLabels Error!"
+msgstr "Agordoj de gLabels"
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Template Designer"
-msgstr "Desegnilo de Modeloj"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(nenio) - gLabels"
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Template _Designer..."
-msgstr "_Desegnilo de Modeloj..."
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(modifita)"
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Text color"
-msgstr "Koloro de teksto"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "Nekorekta radika nodo = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "U_n-select All"
-msgstr "Malelektu Ä?io_n"
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "nekorekta nodo = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Un-select All"
-msgstr "Malelektu Ä?ion"
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
+msgid "xmlParseFile error"
+msgstr "Eraro de xml-dosiero de sintaksa analizo"
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Undo"
-msgstr "Malfaru"
+#: ../src/xml-label.c:274
+msgid "No document root"
+msgstr "Neniu radika dokumento"
 
-#: data/ui/glabels-ui.xml.h:122
-msgid "Undo the last action"
-msgstr "Nuligu lastan agon"
+#: ../src/xml-label.c:282
+msgid "Importing from glabels 0.1 format"
+msgstr "Importante el formato de glabels 0.1"
 
-#: data/ui/glabels-ui.xml.h:123
-msgid "Zoom _1:1"
-msgstr "Zomo je _1:1"
+#: ../src/xml-label.c:291
+msgid "Importing from glabels 0.4 format"
+msgstr "Importante el formato de glabels 0.4"
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Zoom _In"
-msgstr "_Zomo"
+#: ../src/xml-label.c:301
+#, fuzzy, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "Nekorekta dokumento, nekonata Nomospaco de glabels"
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Zoom _Out"
-msgstr "_Malzomo"
+#: ../src/xml-label.c:370
+#, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "nekorekta nodo en nodo de Dokumeto = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:126
-msgid "Zoom to _fit"
-msgstr "AlÄ?ustigu"
+#: ../src/xml-label.c:868
+#, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "nekorekta nodo en nodo de Datumoj = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:127
-msgid "Zoom to fit window"
-msgstr "AlÄ?ustigu al la fenestro"
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Nekonata id de (paÄ?o)grando aÅ de nomo \"%s\""
 
-#: data/ui/glabels-ui.xml.h:128
-msgid "_About..."
-msgstr "_Pri..."
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr "eraro de konvertado en Utf8."
 
-#: data/ui/glabels-ui.xml.h:129
-msgid "_Bottoms"
-msgstr "Su_be"
+#: ../src/xml-label.c:1157
+msgid "Problem saving xml file."
+msgstr "Problemo laÅ konservo de xml-dosiero"
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Close"
-msgstr "_Fermu"
+#. Create and append an "Other" entry.
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
+msgid "Other"
+msgstr "AliaÄµoj"
 
-#: data/ui/glabels-ui.xml.h:133
-msgid "_Contents"
-msgstr "_Entenoj"
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
+#, fuzzy
+msgid "User defined"
+msgstr "Enigu campon de kunfando"
 
-#: data/ui/glabels-ui.xml.h:134
-msgid "_Copy"
-msgstr "_Kopiu"
+#: ../libglabels/db.c:665
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:135
-msgid "_Create Object"
-msgstr "_Kreu Objekton"
+#: ../libglabels/db.c:1057
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Debug"
-msgstr "_Sencimigo"
+#: ../libglabels/db.c:2097
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:138
-msgid "_Desktop Default"
-msgstr "DefaÅlto por Labortabulo"
+#: ../libglabels/db.c:2164
+#, fuzzy, c-format
+msgid "%s full page label"
+msgstr "Ä?enerala %s plena paÄ?o"
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Drawing Toolbar"
-msgstr "Ilarstango de _Desegno"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:140
-msgid "_Edit"
-msgstr "R_edaktu"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d  (%d por folio)"
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_File"
-msgstr "_Dosiero"
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr "%d por folio"
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Grid"
-msgstr "_Krado"
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s diametro"
 
-#: data/ui/glabels-ui.xml.h:144
-msgid "_Help"
-msgstr "_Helpilo"
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "punktoj"
 
-#: data/ui/glabels-ui.xml.h:145
-msgid "_Icon"
-msgstr "_Ikono"
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "coloj"
 
-#: data/ui/glabels-ui.xml.h:149
-msgid "_Main Toolbar"
-msgstr "_Ä?efa Ilarstango"
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
 
-#: data/ui/glabels-ui.xml.h:150
-msgid "_Merge Properties..."
-msgstr "_Kunfandu Ecojn..."
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:151
-msgid "_New"
-msgstr "_Nova"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Objects"
-msgstr "_Objektoj"
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:153
-msgid "_Open..."
-msgstr "M_alfermu..."
+#. This should always be an id, but just in case a name
+#. slips by!
+#: ../libglabels/xml-template.c:244
+#, c-format
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr "Nekonata id \"%s\" de grando de paÄ?o, provante kiel nomo"
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Paste"
-msgstr "_Enmetu"
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
+msgstr "Nekonata id de (paÄ?o)grando aÅ de nomo \"%s\""
 
-#: data/ui/glabels-ui.xml.h:156
-msgid "_Print..."
-msgstr "_Presu..."
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:157
-msgid "_Property Toolbar"
-msgstr "Ilarstango de Eco_j"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Quit"
-msgstr "_Eliro"
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Save"
-msgstr "_Konservu"
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
+msgid "Format:"
+msgstr "Formato:"
 
-#: data/ui/glabels-ui.xml.h:165
-msgid "_View"
-msgstr "_Videbligo"
+#: ../data/ui/merge-properties-dialog.ui.h:2
+msgid "Location:"
+msgstr "LokiÄ?o:"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
-msgstr "   "
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "Elektado/AntaÅmontro de rikordo:"
 
-#: data/glade/prefs-dialog.glade.h:2 data/glade/object-editor.glade.h:1
-#: data/glade/template-designer.glade.h:5
-msgid "*"
-msgstr "*"
+#: ../data/ui/merge-properties-dialog.ui.h:4
+#, fuzzy
+msgid "Select all"
+msgstr "Elektu Ä?ion"
 
-#: data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">DefaÅlta grando de paÄ?o</span>"
+#: ../data/ui/merge-properties-dialog.ui.h:5
+msgid "Source"
+msgstr "Fonto"
 
-#: data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Plenigo</span>"
+#: ../data/ui/merge-properties-dialog.ui.h:6
+#, fuzzy
+msgid "Unselect all"
+msgstr "Malelektu Ä?ion"
 
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linio</span>"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Teksto</span>"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:7
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Unitoj</span>"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "personigita"
 
-#: data/glade/prefs-dialog.glade.h:8 data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "AlliniÄ?o:"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "Grando de paÄ?o:"
 
-#: data/glade/prefs-dialog.glade.h:9 data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "Koloro:"
+#: ../data/ui/media-select.ui.h:5
+#, fuzzy
+msgid "Recent"
+msgstr "Fre_Å?aj Dosieroj"
 
-#: data/glade/prefs-dialog.glade.h:10
-msgid "Font:"
-msgstr "Tiparo:"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Elektu Ä?ion"
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "ISO A4"
-msgstr "ISO A4"
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:12
-msgid "Inches"
-msgstr "Coloj"
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "Priskribo:"
 
-#: data/glade/prefs-dialog.glade.h:13 data/glade/object-editor.glade.h:19
-msgid "Line Spacing:"
-msgstr "Interspaco:"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Grando de etikedo:"
 
-#: data/glade/prefs-dialog.glade.h:14
-msgid "Locale"
-msgstr "Nacia"
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "Aspekto:"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "Milimetroj"
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "Formato:"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
-msgstr "DefaÅltoj de objekto"
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "Parto #:"
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "Punktoj"
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:18
-msgid "Select default properties for new objects."
-msgstr "Elektu defaÅltajn ecojn por novaj objektoj."
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "Rotacio"
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
-msgstr "Elektu nacian specifan agmanieron."
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
 
-#. Most popular (at top of list)
-#: data/glade/prefs-dialog.glade.h:20 data/templates/paper-sizes.xml.h:29
-msgid "US Letter"
-msgstr "USÂ·Letero"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:21 data/glade/object-editor.glade.h:29
-#: data/glade/template-designer.glade.h:72
-msgid "Width:"
-msgstr "LarÄ?o:"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Xxx ecoj de objekto</span>"
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
+msgid "Alignment:"
+msgstr "AlliniÄ?o:"
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Angulo:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Kontrolsumo"
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
+msgid "Color:"
+msgstr "Koloro:"
+
+#: ../data/ui/object-editor.ui.h:9
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Familio:"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
+msgid "File:"
+msgstr "Dosiero:"
+
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Plenigo"
 
-#: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Alto:"
 
-#: data/glade/object-editor.glade.h:14
-msgid "Image"
-msgstr "Bildo"
-
-#: data/glade/object-editor.glade.h:15
-msgid "Insert merge field"
-msgstr "Enigu campon de kunfando"
+#: ../data/ui/object-editor.ui.h:15
+msgid "Key:"
+msgstr "Å?losilo:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Longo:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "Linio"
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
+msgid "Line Spacing:"
+msgstr "Interspaco:"
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Literalo:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
-msgstr "Å?argu bildon"
+#: ../data/ui/object-editor.ui.h:20
+msgid "Opacity:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "LokiÄ?o"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Restarigu grandon de bildo"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:23
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Grando"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Grando:"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Stilo"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Stilo:"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "LarÄ?o:"
+
+#: ../data/ui/object-editor.ui.h:30
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:32
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "gradoj"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "fenestr1"
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "ciferoj:"
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "formato:"
 
-#: data/glade/template-designer.glade.h:1
-msgid "  "
-msgstr "  "
+#: ../data/ui/prefs-dialog.ui.h:1
+msgid "   "
+msgstr "   "
+
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "Restarigu grandon de bildo"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "Font:"
+msgstr "Tiparo:"
+
+#: ../data/ui/prefs-dialog.ui.h:7
+msgid "ISO A4"
+msgstr "ISO A4"
 
-#: data/glade/template-designer.glade.h:2
+#: ../data/ui/prefs-dialog.ui.h:8
+msgid "Inches"
+msgstr "Coloj"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Locale"
+msgstr "Nacia"
+
+#: ../data/ui/prefs-dialog.ui.h:12
+msgid "Millimeters"
+msgstr "Milimetroj"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Object defaults"
+msgstr "DefaÅltoj de objekto"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Points"
+msgstr "Punktoj"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Select default properties for new objects."
+msgstr "Elektu defaÅltajn ecojn por novaj objektoj."
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Select locale specific behavior."
+msgstr "Elektu nacian specifan agmanieron."
+
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr "USÂ·Letero"
+
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Sen nomo"
+
+#: ../data/ui/property-bar.ui.h:1
+msgid "Bold"
+msgstr "Dika"
+
+#: ../data/ui/property-bar.ui.h:2
+msgid "Center align"
+msgstr "LaÅliniiÄ?u centre"
+
+#: ../data/ui/property-bar.ui.h:7
+msgid "Left align"
+msgstr "LaÅliniigu maldekstren"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Right align"
+msgstr "laÅliniigu dekstren"
+
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(es., \"Etichette di spedizione,\" \"Vizitkartoj,\" ...)"
 
-#: data/glade/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(es. 8163A)"
 
-#: data/glade/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(es. Avery, Acme, ...)"
 
-#: data/glade/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. Ekstera radiuso:"
 
-#: data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. Radiuso:"
 
-#: data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. LarÄ?o:"
 
-#: data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. Alto:"
 
-#: data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. Interna radiuso:"
 
-#: data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. ForÄµetaÄµo (surskrivebla):"
 
-#: data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. MarÄ?eno"
 
-#: data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. Rondo (radiuso de angulo):"
 
-#: data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. Horiz. forÄµetaÄµo (surskrivebla):"
 
-#: data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. Vert. forÄµetaÄµo (surskrivebla):"
 
-#: data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. ForÄµetaÄµo (surskrivebla):"
 
-#: data/glade/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. MarÄ?eno"
 
-#: data/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "Marca/Produttore:"
 
-#: data/glade/template-designer.glade.h:21
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "KD/DVD"
 
-#: data/glade/template-designer.glade.h:22
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1854,23 +2422,19 @@ msgstr ""
 "Male, alklaku sur \"Nuligu\" por nuligi\n"
 "vian projekton tutan aÅ \"Retroen\" por ankoraÅ redakti tiun Ä?i desegnon."
 
-#: data/glade/template-designer.glade.h:30
-msgid "Design Completed"
-msgstr "Fino de Projektado"
-
-#: data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "Distanco el maldekstra rando (x0):"
 
-#: data/glade/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "Distanco el supra rando (y0):"
 
-#: data/glade/template-designer.glade.h:34
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "Horizontala kvanto (dx):"
 
-#: data/glade/template-designer.glade.h:35
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1879,81 +2443,44 @@ msgid ""
 "The second example illustrates when two layouts are needed."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:40
-msgid "Label Size (CD/DVD)"
-msgstr "Grando de etikedo (KD/DVD)"
-
-#: data/glade/template-designer.glade.h:41
-msgid "Label Size (Round)"
-msgstr "Grando de etikedo (Ronda)"
-
-#: data/glade/template-designer.glade.h:42
-msgid "Label or Card Shape"
-msgstr "Formo de etikedo aÅ de karto"
-
-#: data/glade/template-designer.glade.h:43
-msgid "Label or Card Size (Rectangular)"
-msgstr "Formo de etikedo aÅ de karto (Rektangula)"
-
-#: data/glade/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "Aspekto #1"
 
-#: data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "Aspekto #2"
 
-#: data/glade/template-designer.glade.h:46
-msgid "Layout(s)"
-msgstr "Aspekto(j)"
-
-#: data/glade/template-designer.glade.h:47
-msgid "Name and Description"
-msgstr "Nomo kaj Priskribo"
-
-#: data/glade/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "Numero transverse (nx):"
 
-#: data/glade/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "Numero sube (ny):"
 
-#: data/glade/template-designer.glade.h:50
-msgid "Number of Layouts"
-msgstr "Nombro da Aspektoj"
-
-#: data/glade/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "Nombro da aspektoj:"
 
-#: data/glade/template-designer.glade.h:52
-msgid "Page Size"
-msgstr "Grando de paÄ?o"
-
-#: data/glade/template-designer.glade.h:54
-msgid "Part #:"
-msgstr "Parto #:"
-
-#: data/glade/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:56
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "Bonvolu enmeti menditajn informojn."
 
-#: data/glade/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:46
 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."
+"Bonvolu enmeti menditajn parametrojn de grando por unu etikedo en la modelo."
 
-#: data/glade/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
@@ -1961,27 +2488,27 @@ msgstr ""
 "Bonvolu enmeti menditajn parametrojn de grando por unu etikedo aÅ karto en "
 "la modelo."
 
-#: data/glade/template-designer.glade.h:59
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:60
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "Bonvolu elekti grandon de paÄ?o por modelo de skribvaroj."
 
-#: data/glade/template-designer.glade.h:61
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Presu paÄ?on de elprovo"
 
-#: data/glade/template-designer.glade.h:62
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "Rektangula aÅ kvadra (ankaÅ kun rondaj anguloj)"
 
-#: data/glade/template-designer.glade.h:63
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "Ronda"
 
-#: data/glade/template-designer.glade.h:64
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -1989,7 +2516,7 @@ msgstr ""
 "Modeloj necesas\n"
 "du aspektojn."
 
-#: data/glade/template-designer.glade.h:66
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -1997,11 +2524,11 @@ msgstr ""
 "Modeloj necesas nur \n"
 "unu aspekton."
 
-#: data/glade/template-designer.glade.h:68
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "Vertikala kvanto (dy):"
 
-#: data/glade/template-designer.glade.h:69
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2011,428 +2538,1148 @@ msgstr ""
 "\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
+#, fuzzy
+msgid "Merge Control"
+msgstr "Kontrolo de kunfando de dokumento"
+
+#: ../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:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "Starto en etikedo"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "de:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "en 1a folio"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "Ä?is:"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "Kreu etikedojn, vizitkartojn kaj kovrilojn de plurmediaÄµoj"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "gLabels Designer di etichetta"
+
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "Dosiero de Projekto de gLabels"
+
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
+
 #. Other ISO A series sizes
-#: data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0"
 
-#: data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1"
 
-#: data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10"
 
-#: data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2"
 
-#: data/templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3"
 
-#: data/templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4"
 
-#: data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5"
 
-#: data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6"
 
-#: data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7"
 
-#: data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8"
 
-#: data/templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9"
 
 #. ISO B series sizes
-#: data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0"
 
-#: data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1"
 
-#: data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10"
 
-#: data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2"
 
-#: data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3"
 
-#: data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4"
 
-#: data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5"
 
-#: data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6"
 
-#: data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7"
 
-#: data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8"
 
-#: data/templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9"
 
-#: data/templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "US Executive"
 
 #. Other US paper sizes
-#: data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "US Legal"
 
+#: ../templates/categories.xml.h:1
+msgid "Any card"
+msgstr ""
+
+#: ../templates/categories.xml.h:2
+#, fuzzy
+msgid "Any label"
+msgstr "Malfermu etikedon"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
+#, fuzzy
+msgid "Business cards"
+msgstr "Vizitkartoj"
+
+#: ../templates/categories.xml.h:4
+msgid "CD/DVD or other media"
+msgstr ""
+
+#: ../templates/categories.xml.h:5
+msgid "Mailing/shipping products"
+msgstr ""
+
+#: ../templates/categories.xml.h:6
+#, fuzzy
+msgid "Rectangular labels"
+msgstr "Rektangulaj Etikedoj"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
+#, fuzzy
+msgid "Round labels"
+msgstr "Plenrondaj etikedoj"
+
+#: ../templates/categories.xml.h:8
+#, fuzzy
+msgid "Square labels"
+msgstr "Kvardaj etikedoj"
+
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:2
-#: data/templates/zweckform-iso-templates.xml.h:2
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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"
 
 #. ===================================================================
 #. ============================================================
 #. ===================================================================
-#. ======================================================
-#: data/templates/avery-us-templates.xml.h:4
-#: data/templates/avery-iso-templates.xml.h:4
-#: data/templates/zweckform-iso-templates.xml.h:6
-#: data/templates/misc-us-templates.xml.h:3
-#: data/templates/misc-iso-templates.xml.h:17
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "Vizitkartoj"
 
-#: data/templates/avery-us-templates.xml.h:5
+#. ===================================================================
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
+msgid "CD/DVD Labels"
+msgstr "Etikedoj por KD/DVD"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "Etikedoj por KD/DVD (Etikedoj por diskoj)"
 
-#: data/templates/avery-us-templates.xml.h:6
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:10
 msgid "CD/DVD Labels (Spine Labels)"
 msgstr "Etikedoj por KD/DVD (Etikedoj por diskoj)"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr "Etikedoj por disketoj"
 
+#. 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/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+#, fuzzy
+msgid "File Folder Labels"
+msgstr "Arkaj etikedoj por dosieroj"
+
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:10
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:12
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "PaÄ?o plena da ekikedoj"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:22
+#, fuzzy
+msgid "ID Labels"
+msgstr "Etikedoj por KD"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:24
+#, fuzzy
+msgid "Index Cards"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "Grandaj rondigitaj etikedoj"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "NomÅ?ildetoj"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:18
+#: ../templates/avery-us-templates.xml.h:30
+msgid "Post cards"
+msgstr ""
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "Etikedoj por adreso de sendinto"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
+#, fuzzy
+msgid "Round Labels"
+msgstr "Plenrondaj etikedoj"
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "Etikedoj por ekspedo"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "Malgrandaj rondigitaj etikedoj"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "Kvardaj etikedoj"
 
-#: data/templates/avery-us-templates.xml.h:25
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:42
+msgid "Tent Cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "Etikedoj por videokasedo (faco)"
 
-#: data/templates/avery-us-templates.xml.h:26
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr "Etikedoj por videokasedo (dorso)"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:4
 msgid "Address labels"
 msgstr "Etikedoj por adreso"
 
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Allround labels"
+msgstr "Plenrondaj etikedoj"
+
 #. ===============================================================
-#: data/templates/avery-iso-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "CD Booklet"
 msgstr "CD Booklet"
 
 #. ===============================================================
-#: data/templates/avery-iso-templates.xml.h:8
+#: ../templates/avery-iso-templates.xml.h:12
 msgid "CD Inlet"
 msgstr "CD Inlet"
 
-#. ===============================================================
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:10
-#: data/templates/zweckform-iso-templates.xml.h:8
-#: data/templates/misc-us-templates.xml.h:5
-#: data/templates/misc-iso-templates.xml.h:21
-msgid "CD/DVD Labels"
-msgstr "Etikedoj por KD/DVD"
-
-#. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:18
 msgid "Diskette labels"
 msgstr "Etikedoj por disketoj"
 
 #. ===============================================================
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:14
-#: data/templates/zweckform-iso-templates.xml.h:14
-#: data/templates/misc-iso-templates.xml.h:35
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
 msgstr "Etikedoj por poÅ?to"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-iso-templates.xml.h:22
 msgid "Mailing labels"
 msgstr "Etikedoj por poÅ?to"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:18
+#: ../templates/avery-iso-templates.xml.h:24
 msgid "Mini Address Labels"
 msgstr "Eta etikedoj por adreso"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:20
+#: ../templates/avery-iso-templates.xml.h:26
+#, fuzzy
+msgid "Mini Labels"
+msgstr "Etikedoj por Mini-KD"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:28
 msgid "Shipping labels"
 msgstr "Etikedo por ekspedo"
 
-#. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:4
-msgid "Allround Labels"
-msgstr "Plenrondaj etikedoj"
+#: ../templates/brother-other-templates.xml.h:1
+msgid "Multi Purpose Labels 17mm x 54mm"
+msgstr ""
 
-#. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:10
-msgid "Correction and Cover-up Labels"
-msgstr "Etikedoj por korektado kaj kovrado"
+#: ../templates/brother-other-templates.xml.h:2
+#, fuzzy
+msgid "Shipping Labels 62mm x 100mm"
+msgstr "Etikedoj por ekspedo"
+
+#.
+#. *********************************************************************
+#. *********************************************************************
+#. 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.
+#.
+#. One difference from typical templates is that the template size is
+#. not the actual media size - it is the size of the printable area,
+#. which is smaller than the media size.  This is because (at least with
+#. the Brother driver) coordinates are relative the corner of this area.
+#.
+#. *********************************************************************
+#. *********************************************************************
+#.
+#: ../templates/brother-other-templates.xml.h:20
+#, fuzzy
+msgid "Standard Address Labels 29mm x 90mm"
+msgstr "Etikedoj por adreso de sendinto"
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:12
-msgid "Lever Arch File Labels"
-msgstr "Levilaj arkaj etikedoj por dosieroj"
+#: ../templates/dymo-other-templates.xml.h:2
+msgid "3.5in Diskette"
+msgstr ""
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:16
-msgid "QSL-Karten Etiketten 70mm x 50,8mm"
-msgstr "QSL-Karten Etiketten 70mm x 50,8mm"
+#: ../templates/dymo-other-templates.xml.h:6
+#, fuzzy
+msgid "File Folder"
+msgstr "Koloro de plenigo"
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:18
-msgid "Rectangular Copier Labels"
-msgstr "Rektangulaj etikedoj por kopiado"
+#: ../templates/dymo-other-templates.xml.h:8
+msgid "Hanging Folder"
+msgstr ""
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:20
-#: data/templates/misc-iso-templates.xml.h:44
-msgid "Rectangular Labels"
-msgstr "Rektangulaj Etikedoj"
+#: ../templates/dymo-other-templates.xml.h:10
+#, fuzzy
+msgid "Large Address Labels"
+msgstr "Etikedo por adreso"
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:22
-msgid "Video Labels (back)"
-msgstr "Etikedo por Video (retro)"
+#: ../templates/dymo-other-templates.xml.h:14
+#, fuzzy
+msgid "Shipping Address Labels"
+msgstr "Eta etikedoj por adreso"
 
-#: data/templates/misc-us-templates.xml.h:1
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:2
 msgid "Business Card CD"
 msgstr "Vizitkarto KD"
 
-#: data/templates/misc-us-templates.xml.h:4
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
 msgid "CD Template Rectangles"
 msgstr "Modelaj Rektanguloj por KD"
 
-#: data/templates/misc-us-templates.xml.h:6
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
 msgid "CD/DVD Labels (Face Only)"
 msgstr "Etikedoj por KD/DVD (nur faco)"
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:7
-#: data/templates/misc-iso-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "CD/DVD Labels (face only)"
 msgstr "Etikedoj por KD/DVD (nur faco)"
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:9
+#: ../templates/misc-us-templates.xml.h:14
 msgid "Cassette Labels"
 msgstr "Etikedoj por kasedoj"
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:11
+#: ../templates/misc-us-templates.xml.h:16
 msgid "DLT Labels"
 msgstr "Etikedoj DLT"
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:13
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "CD Booklet"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr "Mikrotubaj etikedoj"
 
-#: data/templates/misc-us-templates.xml.h:14
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr "Etikedoj por Mini-KD"
 
-#: data/templates/misc-us-templates.xml.h:15
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr "Etikedoj por PRO CD (nur KD-dorso)"
 
-#: data/templates/misc-us-templates.xml.h:16
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "Etikedoj por PRO CD (nur faco)"
 
-#: data/templates/misc-us-templates.xml.h:17
-#: data/templates/misc-iso-templates.xml.h:42
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr "Etikedoj por PRO CD (nur faco)"
 
-#: data/templates/misc-us-templates.xml.h:18
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr "Subtila KD-ujo (dekstrosupra)"
 
-#: data/templates/misc-us-templates.xml.h:19
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr "Subtila KD-ujo (kaposuba)"
 
-#: data/templates/misc-iso-templates.xml.h:1
-msgid "Agipa 119488: Business Cards"
-msgstr "Agipa 119488: Vizitkartoj"
-
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:3
-msgid "Allround Labels --24"
-msgstr "Plenrondaj etikedoj --24"
-
-#. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:5
-msgid "Allround Labels --44"
-msgstr "Plenrondaj etikedoj --44"
-
-#. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:7
-msgid "Allround Labels --64"
-msgstr "Plenrondaj etikedoj --64"
-
-#. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:9
-msgid "Allround Labels --65"
-msgstr "Plenrondaj etikedoj --65"
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
+msgid "Allround Labels"
+msgstr "Plenrondaj etikedoj"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:11
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr "Arkaj etikedoj por dosieroj"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:13
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr "Arkaj etikedoj por dosieroj (grandaj)"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:15
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr "Arkaj etikedoj por dosieroj (etaj)"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:19
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "Etikedoj por KD"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:25
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "Etikedoj kun standarta formato por KD/DVD (nur faco)"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:27
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "Etikedoj por disketoj (nur faco)"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:29
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "EPSON Photo Stickers 16"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:31
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "Etiketten"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:33
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "MagnetaÄµoj por fridujo"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:37
-msgid "Mailing Labels --14"
-msgstr "Etikedo por poÅ?to --14"
+#: ../templates/misc-iso-templates.xml.h:30
+#, fuzzy
+msgid "General Labels"
+msgstr "Etikedoj por poÅ?to"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:39
+#: ../templates/misc-iso-templates.xml.h:32
+msgid "Inkjet/Laser Labels 70x37mm"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr "Etikedo por poÅ?to kun 2 kolumnoj"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:41
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr "Etikedo por poÅ?to kun 3 kolumnoj"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
+msgid "Rectangular Labels"
+msgstr "Rektangulaj Etikedoj"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "Eta etikedoj por adreso"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "Etikedoj por video (nur frontispico)"
 
-#: data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "Kreu etikedojn, vizitkartojn kaj kovrilojn de plurmediaÄµoj"
+#. ===================================================================
+#: ../templates/misc-other-templates.xml.h:2
+#, fuzzy
+msgid "Multi-Purpose Labels"
+msgstr "Mikrotubaj etikedoj"
 
-#: data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "gLabels Designer di etichetta"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Etikedo por adreso"
 
-#: data/mime/glabels.keys.in.h:1 data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "Dosiero de Projekto de gLabels"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Etikedoj por disketoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Etikedoj por disketoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Vizitkartoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Etikedoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Etikedoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Etikedoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Pri glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "Kvardaj etikedoj"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Self-adhesive labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
+msgid "Correction and Cover-up Labels"
+msgstr "Etikedoj por korektado kaj kovrado"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:12
+#, fuzzy
+msgid "File Back Labels"
+msgstr "Arkaj etikedoj por dosieroj"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:14
+msgid "Lever Arch File Labels"
+msgstr "Levilaj arkaj etikedoj por dosieroj"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:18
+msgid "Multi-purpose Stick+Lift Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:20
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr "QSL-Karten Etiketten 70mm x 50,8mm"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:22
+msgid "Rectangular Copier Labels"
+msgstr "Rektangulaj etikedoj por kopiado"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:26
+msgid "Video Labels (back)"
+msgstr "Etikedo por Video (retro)"
+
+#~ msgid "Could not initialize Bonobo!\n"
+#~ msgstr "Estas neeble prepari Bonobon!\n"
+
+#~ msgid "print this message"
+#~ msgstr "presu tiun Ä?i mesaÄ?on"
+
+#~ msgid "print the version of glabels-batch being used"
+#~ msgstr "presu version de uzata staplo de glabels"
+
+#~ msgid "[OPTION...] GLABELS_FILE..."
+#~ msgstr "[OPTION...] GLABELS_FILE..."
+
+#~ msgid "missing glabels file\n"
+#~ msgstr "mankanta dosero de glabels\n"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Media Type"
+#~ msgstr "Speco de plurmedio"
+
+#~ msgid "Open"
+#~ msgstr "Malfermu"
+
+#~ msgid "Align _Horizontally"
+#~ msgstr "LaÅlinnigu _Horizontale"
+
+#~ msgid "Align _Vertically"
+#~ msgstr "LaÅlinnigu _Verticale"
+
+#~ msgid "_Delete"
+#~ msgstr "_Forigu"
+
+#~ msgid "Print"
+#~ msgstr "Presu"
+
+#~ msgid "_Job"
+#~ msgstr "_Laboro"
+
+#~ msgid "P_rinter"
+#~ msgstr "P_rintilo"
+
+#~ msgid "Print preview"
+#~ msgstr "AntaÅmontro de presado"
+
+#~ msgid "Importing from glabels 1.91 format"
+#~ msgstr "Importante el formato de glabels 1.91"
+
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "Teksta dosiero kun komo kiel disigilo (CSV)"
+
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "Teksta dosiero kun komo kiel disigilo"
+
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "Teksta dosiero kun TAB kiel disigilo"
+
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s diametro"
+
+#~ msgid "Choose Custom Color"
+#~ msgstr "Elektu personigitan koloron"
+
+#~ msgid "light brown"
+#~ msgstr "hela bruna koloro"
+
+#~ msgid "brown gold"
+#~ msgstr "malhela oro"
+
+#~ msgid "dark green #2"
+#~ msgstr "malhela verdo #2"
+
+#~ msgid "navy"
+#~ msgstr "mararmea bluo"
+
+#~ msgid "purple #2"
+#~ msgstr "viola koloro #2"
+
+#~ msgid "very dark gray"
+#~ msgstr "tre malhela grizo"
+
+#~ msgid "red-orange"
+#~ msgstr "ruÄ?-oranÄ?o"
+
+#~ msgid "dull blue"
+#~ msgstr "nebrila bluo"
+
+#~ msgid "dull purple"
+#~ msgstr "nebrila violo"
+
+#~ msgid "dark grey"
+#~ msgstr "malhela grizo"
+
+#~ msgid "red"
+#~ msgstr "ruÄ?o"
+
+#~ msgid "lime"
+#~ msgstr "limeta koloro"
+
+#~ msgid "dull blue #2"
+#~ msgstr "nebrila bluo #2"
+
+#~ msgid "sky blue #2"
+#~ msgstr "Ä?ielbluo #2"
+
+#~ msgid "gray"
+#~ msgstr "grizo"
+
+#~ msgid "magenta"
+#~ msgstr "intense karmezina"
+
+#~ msgid "bright orange"
+#~ msgstr "brila oranÄ?o"
+
+#~ msgid "bright blue"
+#~ msgstr "brila bluo"
+
+#~ msgid "red purple"
+#~ msgstr "ruÄ?-violo"
+
+#~ msgid "light grey"
+#~ msgstr "hela grizo"
+
+#~ msgid "light orange"
+#~ msgstr "hela oranÄ?o"
+
+#~ msgid "light blue"
+#~ msgstr "hela bluo"
+
+#~ msgid "light purple"
+#~ msgstr "hela violo"
+
+#~ msgid "purplish blue"
+#~ msgstr "viol-bluo"
+
+#~ msgid "dark purple"
+#~ msgstr "malhela violo"
+
+#~ msgid "No paper files found!"
+#~ msgstr "Neniu papera dosiero estis trovita!!"
+
+#~ msgid "Close"
+#~ msgstr "Fermu"
+
+#~ msgid "Cu_t"
+#~ msgstr "El_tondu"
+
+#~ msgid "Customize"
+#~ msgstr "Personigu"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personigu ilarstangojn"
+
+#~ msgid "Dump XML"
+#~ msgstr "Å?utu XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Å?utu priskribon de UI xml"
+
+#~ msgid "Font selector"
+#~ msgstr "Elektilo de tiparo"
+
+#~ msgid "Icon and _Text"
+#~ msgstr "Ikono kaj _Teksto"
+
+#~ msgid "M_arkup"
+#~ msgstr "M_arkado"
+
+#~ msgid "New"
+#~ msgstr "Nova"
+
+#~ msgid "Object property editor"
+#~ msgstr "Redaktilo de ecoj por objekto"
+
+#~ msgid "Only show icons in the main toolbar"
+#~ msgstr "Videbligu nur ikonojn en Ä?efa ilarstango"
+
+#~ msgid "Pr_eferences..."
+#~ msgstr "A_gordoj..."
+
+#~ msgid "Properties"
+#~ msgstr "Ecoj"
+
+#~ msgid "Quit"
+#~ msgstr "Eliro"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refaru la lastan malfaritan agon"
+
+#~ msgid "Save"
+#~ msgstr "Konservu"
+
+#~ msgid "Save As"
+#~ msgstr "Konservu kiel"
+
+#~ msgid "Select _All"
+#~ msgstr "Elektu _Ä?ion"
+
+#~ msgid "Set main toolbar button style according to desktop default"
+#~ msgstr "Agordu butonstilon de Ä?efa ilarstango laÅ defaÅlto de labortablo"
+
+#~ msgid "Show _Tooltips"
+#~ msgstr "Mon_tru Sugestojn"
+
+#~ msgid "Show both icons and texts in the main toolbar"
+#~ msgstr "Vidigu kaj ikonojn kaj tekstojn en la Ä?efa ilarstango"
+
+#~ msgid "Show tooltips in the drawing toolbar"
+#~ msgstr "Vidigu sugestojn en la ilarstango de desegno"
+
+#~ msgid "Show tooltips in the main toolbar"
+#~ msgstr "Vidigu sugestojn en la Ä?efa ilarstango"
+
+#~ msgid "Show tooltips in the property toolbar"
+#~ msgstr "Vidigu sugestojn en la ilarstango de ecoj"
+
+#~ msgid "Template Designer"
+#~ msgstr "Desegnilo de Modeloj"
+
+#~ msgid "U_n-select All"
+#~ msgstr "Malelektu Ä?io_n"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Nuligu lastan agon"
+
+#~ msgid "_About..."
+#~ msgstr "_Pri..."
+
+#~ msgid "_Bottoms"
+#~ msgstr "Su_be"
+
+#~ msgid "_Contents"
+#~ msgstr "_Entenoj"
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopiu"
+
+#~ msgid "_Create Object"
+#~ msgstr "_Kreu Objekton"
+
+#~ msgid "_Debug"
+#~ msgstr "_Sencimigo"
+
+#~ msgid "_Desktop Default"
+#~ msgstr "DefaÅlto por Labortabulo"
+
+#~ msgid "_Drawing Toolbar"
+#~ msgstr "Ilarstango de _Desegno"
+
+#~ msgid "_Icon"
+#~ msgstr "_Ikono"
+
+#~ msgid "_Main Toolbar"
+#~ msgstr "_Ä?efa Ilarstango"
+
+#~ msgid "_Merge Properties..."
+#~ msgstr "_Kunfandu Ecojn..."
+
+#~ msgid "_Paste"
+#~ msgstr "_Enmetu"
+
+#~ msgid "_Property Toolbar"
+#~ msgstr "Ilarstango de Eco_j"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">DefaÅlta grando de paÄ?o</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Plenigo</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Linio</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Teksto</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Unitoj</span>"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Xxx ecoj de objekto</span>"
+
+#~ msgid "Load image"
+#~ msgstr "Å?argu bildon"
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Label or Card Size (Rectangular)"
+#~ msgstr "Formo de etikedo aÅ de karto (Rektangula)"
+
+#~ msgid "Agipa 119488: Business Cards"
+#~ msgstr "Agipa 119488: Vizitkartoj"
+
+#~ msgid "Allround Labels --24"
+#~ msgstr "Plenrondaj etikedoj --24"
+
+#~ msgid "Allround Labels --44"
+#~ msgstr "Plenrondaj etikedoj --44"
+
+#~ msgid "Allround Labels --64"
+#~ msgstr "Plenrondaj etikedoj --64"
+
+#~ msgid "Allround Labels --65"
+#~ msgstr "Plenrondaj etikedoj --65"
 
+#~ msgid "Mailing Labels --14"
+#~ msgstr "Etikedo por poÅ?to --14"
diff --git a/po/es.po b/po/es.po
index 9ca0aad..3f9dc51 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 2.1.0\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2010-06-13 00:44+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-06-13 18:20+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: ES <gnome-es-list gnome org>\n"
@@ -68,7 +68,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A o UPC-E)"
 
-#: ../src/bc.c:107
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -80,7 +80,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:116
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -92,7 +92,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:125
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -100,11 +100,11 @@ msgstr "ISBN"
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:131
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr "Code 39"
 
-#: ../src/bc.c:134
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr "Code 128"
 
@@ -116,11 +116,11 @@ msgstr "Code 128C"
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc.c:143
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr "Intercalado 2 de 5"
 
-#: ../src/bc.c:146
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr "Codabar"
 
@@ -132,19 +132,256 @@ msgstr "MSI"
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:155
+#: ../src/bc.c:155 ../src/bc.c:213
 msgid "Code 93"
 msgstr "Code 93"
 
 #: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (matriz de datos)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
 msgid "GS1-128"
 msgstr "GS1-128"
 
-#: ../src/bc.c:169
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (matriz de datos)"
+
+#: ../src/bc.c:273
+#, fuzzy
+msgid "HIBC QR Code"
+msgstr "IEC18004 (CÃ³digo QR)"
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Pegar"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "CÃ³digo de barras"
+
+#: ../src/bc.c:330
+#, fuzzy
+msgid "Pharmacode 2-track"
+msgstr "Datos del cÃ³digo de barras"
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Borrar"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (matriz de datos)"
 
-#: ../src/bc.c:176
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr "IEC18004 (CÃ³digo QR)"
 
@@ -314,7 +551,7 @@ msgstr "Error fatal de gLables"
 msgid "New Label or Card"
 msgstr "Nueva etiqueta o tarjeta"
 
-#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "Propiedades de la etiqueta"
 
@@ -434,63 +671,63 @@ msgstr "0123456789 .:,;(*!?)"
 msgid "Sample text"
 msgstr "Texto de ejemplo"
 
-#: ../src/glabels-batch.c:52
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "establecer nombre de archivo de salida (predeterminado=\"output.pdf\")"
 
-#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "nombre de archivo"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "nÃºmero de hojas (predeterminado=1)"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "hojas"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "nÃºmero de copias (predeterminado=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "copias"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "primera etiqueta en primera hoja (predeterminado=1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "primero"
 
-#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "imprimir un esbozo (para verificar la alineaciÃ³n de la impresora)"
 
-#: ../src/glabels-batch.c:62 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "impresiÃ³n invertida (imagen espejo)"
 
-#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "imprimir marcas de corte"
 
-#: ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "archivo de entrada para combinar"
 
-#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[ARCHIVOâ?¦]"
 
-#: ../src/glabels-batch.c:98
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr "Imprimir los archivos creados con gLabels."
 
-#: ../src/glabels-batch.c:106 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
@@ -500,12 +737,12 @@ msgstr ""
 "Ejecute Â«%s --helpÂ» para ver una lista completa de las opciones de lÃnea de "
 "comandos.\n"
 
-#: ../src/glabels-batch.c:149
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "No se puede combinar el archivo %s\n"
 
-#: ../src/glabels-batch.c:184
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "No se puede abrir el archivo %s\n"
@@ -526,11 +763,11 @@ msgstr "Datos del cÃ³digo de barras"
 msgid "Barcode property"
 msgstr "Propiedades del cÃ³digo de barras"
 
-#: ../src/label-barcode.c:483
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr "El cÃ³digo de barras estÃ¡ vacÃo"
 
-#: ../src/label-barcode.c:487
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr "Datos de cÃ³digo de barras no vÃ¡lidos"
 
@@ -553,79 +790,79 @@ msgstr "Color de lÃnea"
 msgid "Line width"
 msgstr "Ancho de lÃnea"
 
-#: ../src/label.c:399
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr "Sin tÃtulo"
 
-#: ../src/label.c:702 ../src/ui.c:422
+#: ../src/label.c:705 ../src/ui.c:422
 msgid "Merge properties"
 msgstr "Mezclar propiedades"
 
-#: ../src/label.c:1184 ../src/ui.c:215
+#: ../src/label.c:1197 ../src/ui.c:215
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/label.c:1217 ../src/ui.c:324
+#: ../src/label.c:1230 ../src/ui.c:324
 msgid "Bring to front"
 msgstr "Traer al frente"
 
-#: ../src/label.c:1253 ../src/ui.c:331
+#: ../src/label.c:1266 ../src/ui.c:331
 msgid "Send to back"
 msgstr "Enviar al fondo"
 
-#: ../src/label.c:1294
+#: ../src/label.c:1307
 msgid "Rotate"
 msgstr "Rotar"
 
-#: ../src/label.c:1329 ../src/ui.c:338
+#: ../src/label.c:1342 ../src/ui.c:338
 msgid "Rotate left"
 msgstr "Rotar a la izquierda"
 
-#: ../src/label.c:1362 ../src/ui.c:345
+#: ../src/label.c:1375 ../src/ui.c:345
 msgid "Rotate right"
 msgstr "Rotar a la derecha"
 
-#: ../src/label.c:1397 ../src/ui.c:352
+#: ../src/label.c:1410 ../src/ui.c:352
 msgid "Flip horizontally"
 msgstr "Reflejar horizontalmente"
 
-#: ../src/label.c:1432 ../src/ui.c:359
+#: ../src/label.c:1445 ../src/ui.c:359
 msgid "Flip vertically"
 msgstr "Reflejar verticalmente"
 
-#: ../src/label.c:1472 ../src/ui.c:366
+#: ../src/label.c:1485 ../src/ui.c:366
 msgid "Align left"
 msgstr "Alinear a la izquierda"
 
-#: ../src/label.c:1529 ../src/ui.c:373
+#: ../src/label.c:1542 ../src/ui.c:373
 msgid "Align right"
 msgstr "Alinear a la derecha"
 
-#: ../src/label.c:1590 ../src/ui.c:380
+#: ../src/label.c:1603 ../src/ui.c:380
 msgid "Align horizontal center"
 msgstr "Alinear por centro horizontal"
 
-#: ../src/label.c:1666 ../src/ui.c:387
+#: ../src/label.c:1679 ../src/ui.c:387
 msgid "Align tops"
 msgstr "Alinear por parte superior"
 
-#: ../src/label.c:1723 ../src/ui.c:394
+#: ../src/label.c:1736 ../src/ui.c:394
 msgid "Align bottoms"
 msgstr "Alinear por parte inferior"
 
-#: ../src/label.c:1784 ../src/ui.c:401
+#: ../src/label.c:1797 ../src/ui.c:401
 msgid "Align vertical center"
 msgstr "Alinear por centro vertical"
 
-#: ../src/label.c:1862 ../src/ui.c:408
+#: ../src/label.c:1875 ../src/ui.c:408
 msgid "Center horizontally"
 msgstr "Centrar horizontalmente"
 
-#: ../src/label.c:1909 ../src/ui.c:415
+#: ../src/label.c:1922 ../src/ui.c:415
 msgid "Center vertically"
 msgstr "Centrar verticalmente"
 
-#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
 msgid "Paste"
 msgstr "Pegar"
 
@@ -633,11 +870,11 @@ msgstr "Pegar"
 msgid "Create ellipse object"
 msgstr "Crear un objeto elipse"
 
-#: ../src/label-image.c:167 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:312
 msgid "Create image object"
 msgstr "Crear una imagen"
 
-#: ../src/label-image.c:271 ../src/label-image.c:342
+#: ../src/label-image.c:333 ../src/label-image.c:474
 msgid "Set image"
 msgstr "Establecer imagen"
 
@@ -839,7 +1076,7 @@ msgstr "Seleccionar"
 msgid "Record/Field"
 msgstr "Registro/Campo"
 
-#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "Datos"
 
@@ -935,7 +1172,7 @@ msgstr "Preferencias de gLabels"
 
 #. ===================================================================
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:217
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etiquetas"
@@ -1084,10 +1321,9 @@ msgstr "DiseÃ±o completo"
 msgid "Edit gLabels Template"
 msgstr "Editar plantilla de gLabels"
 
-#: ../src/template-designer.c:1422
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
 msgstr ""
 "<span foreground='red' weight='bold'>La marca y el nÃºmero de parte coinciden "
 "con una plantilla existente</span>"
@@ -1322,7 +1558,8 @@ msgstr "Modo de selecciÃ³n"
 msgid "Select, move and modify objects"
 msgstr "Seleccionar, mover y modificar objetos"
 
-#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Texto"
 
@@ -1334,7 +1571,8 @@ msgstr "Caja"
 msgid "Create box/rectangle object"
 msgstr "Crear un objeto de caja o rectÃ¡ngulo"
 
-#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "LÃnea"
 
@@ -1346,7 +1584,7 @@ msgstr "Elipse"
 msgid "Create ellipse/circle object"
 msgstr "Crear un cÃrculo o elipse"
 
-#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Imagen"
 
@@ -1531,52 +1769,57 @@ msgstr "(sin nombre) - gLabels"
 msgid "(modified)"
 msgstr "(modificado)"
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Nodo raÃz errÃ³neo = \"%s\""
 
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "Nodo errÃ³neo =  \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:227
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "error de xmlParseFile"
 
-#: ../src/xml-label.c:264
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "No hay documento raÃz"
 
-#: ../src/xml-label.c:272
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Importando desde formato glabels 0.1"
 
-#: ../src/xml-label.c:281
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Importando desde formato glabels 0.4"
 
-#: ../src/xml-label.c:291
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "Espacio de nombres de glabels desconocido -- Usando %s"
 
-#: ../src/xml-label.c:360
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Nodo errÃ³neo en secciÃ³n Document = \"%s\""
 
-#: ../src/xml-label.c:856
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "Nodo errÃ³neo en secciÃ³n Data =  \"%s\""
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "CÃ³digo \"%s\" o nombre de pÃ¡gina desconocido"
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "ConversiÃ³n UTF-8 errÃ³nea"
 
-#: ../src/xml-label.c:1104
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "Problemas al guardar archivo xml"
 
@@ -1627,12 +1870,24 @@ msgstr "Etiqueta a pÃ¡gina completa %s"
 msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr "No se definiÃ³ previamente la parte equivalente (Â«%sÂ») para Â«%sÂ»."
 
-#: ../libglabels/template.c:722 ../libglabels/template.c:726
-msgid "per sheet"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d  (%d por hoja)"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
 msgstr "por hoja"
 
-#: ../libglabels/template.c:796 ../libglabels/template.c:802
-#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
 msgid "diameter"
 msgstr "diÃ¡metro"
 
@@ -1640,13 +1895,13 @@ msgstr "diÃ¡metro"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:40
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr "puntos"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
 #: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr "pulgadas"
@@ -1706,25 +1961,27 @@ msgstr "TambiÃ©n falta el atributo del nombre."
 #. * End:                   -- emacs
 #.
 #: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>Grabar la selecciÃ³n/vista previa</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Origen</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "UbicaciÃ³n:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>Grabar la selecciÃ³n/vista previa</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Seleccionar todo"
 
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Origen</b>"
+
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Deseleccionar todo"
@@ -1807,133 +2064,128 @@ msgstr "Fabricante:"
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Propiedades de objecto xxx</span>"
-
-#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "AlineaciÃ³n:"
 
-#: ../data/ui/object-editor.ui.h:5
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "Permitir ampliar texto automÃ¡ticamente"
 
-#: ../data/ui/object-editor.ui.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Ã?ngulo:"
 
-#: ../data/ui/object-editor.ui.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "VerificaciÃ³n"
 
-#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Color:"
 
-#: ../data/ui/object-editor.ui.h:10
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Activar sombra"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Familia:"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Archivo:"
 
-#: ../data/ui/object-editor.ui.h:13
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Relleno"
 
-#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Alto:"
 
-#: ../data/ui/object-editor.ui.h:16
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../data/ui/object-editor.ui.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Longitud:"
 
-#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "Espaciado:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Literal:"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "Opacidad:"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "PosiciÃ³n"
 
-#: ../data/ui/object-editor.ui.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Restablecer el tamaÃ±o de la imagen"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Sombra"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: ../data/ui/object-editor.ui.h:26
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "TamaÃ±o:"
 
-#: ../data/ui/object-editor.ui.h:27
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Estilo:"
 
-#: ../data/ui/object-editor.ui.h:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
 #: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Ancho:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "Desplazamiento en X:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "Desplazamiento en Y:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "grados"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "dialogo1"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "dÃgitos:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "Formato:"
 
@@ -1941,66 +2193,55 @@ msgstr "Formato:"
 msgid "   "
 msgstr "   "
 
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">TamaÃ±o de pÃ¡gina predeterminado</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Relleno</span>"
-
 #: ../data/ui/prefs-dialog.ui.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">LÃnea</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Texto</span>"
+msgid "Default page size"
+msgstr "TamaÃ±o de pÃ¡gina por omisiÃ³n"
 
 #: ../data/ui/prefs-dialog.ui.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Medidas</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Fuente:"
 
-#: ../data/ui/prefs-dialog.ui.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/ui/prefs-dialog.ui.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Pulgadas"
 
-#: ../data/ui/prefs-dialog.ui.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "Documento"
 
-#: ../data/ui/prefs-dialog.ui.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "MilÃmetros"
 
-#: ../data/ui/prefs-dialog.ui.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "Objetos"
 
-#: ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Puntos"
 
-#: ../data/ui/prefs-dialog.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "Seleccione las propiedades predeterminadoas para los nuevos objetos."
 
-#: ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "Seleccione las propiedades del documento."
 
-#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "Carta"
 
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Sin tÃtulo"
+
 #: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Negrita"
@@ -2235,25 +2476,27 @@ msgstr ""
 "Este diÃ¡logo le asistirÃ¡ en la creaciÃ³n de una plantilla personalizada."
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "<b>Copies</b>"
-msgstr "<b>Copias</b>"
+msgid "Collate"
+msgstr "Intercalar"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-msgid "<b>Merge Control</b>"
-msgstr "<b>Control de mezcla</b>"
+msgid "Copies"
+msgstr "Copias"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>Opciones</b>"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-msgid "Collate"
-msgstr "Intercalar"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
 msgid "Copies:"
 msgstr "Copias:"
 
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "<b>Control de mezcla</b>"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>Opciones</b>"
+
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
 msgstr "Hojas:"
@@ -3036,6 +3279,28 @@ msgstr "Etiquetas para copiadoras rectangulares"
 msgid "Video Labels (back)"
 msgstr "Etiquetas de video (dorso)"
 
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Propiedades de objecto xxx</span>"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">TamaÃ±o de pÃ¡gina predeterminado</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Relleno</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">LÃnea</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Texto</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Medidas</span>"
+
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>Copias</b>"
+
 #~ msgid "%d %s"
 #~ msgstr "%d %s"
 
@@ -3150,9 +3415,6 @@ msgstr "Etiquetas de video (dorso)"
 #~ msgid "Text file with tab delimeters"
 #~ msgstr "Texto separado con tabuladores"
 
-#~ msgid "%d x %d  (%d per sheet)"
-#~ msgstr "%d x %d  (%d por hoja)"
-
 #~ msgid "%s x %s %s"
 #~ msgstr "%s x %s %s"
 
@@ -3388,9 +3650,6 @@ msgstr "Etiquetas de video (dorso)"
 #~ msgid "Display units"
 #~ msgstr "Mostrar unidades de medida"
 
-#~ msgid "Default page size"
-#~ msgstr "TamaÃ±o de pÃ¡gina por omisiÃ³n"
-
 #~ msgid "Outline"
 #~ msgstr "Contorno"
 
@@ -3523,6 +3782,3 @@ msgstr "Etiquetas de video (dorso)"
 
 #~ msgid "%s: option requires an argument -- %c\n"
 #~ msgstr "%s: la opciÃ³n necesita un argumento -- %c\n"
-
-#~ msgid "Copies"
-#~ msgstr "Copias"
diff --git a/po/fr.po b/po/fr.po
index 05bb005..31d95b4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels master\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2010-05-27 00:09+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-05-27 00:17+0200\n"
 "Last-Translator: Claude Paroz <claude 2xlibre net>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -69,7 +69,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A ou UPC-E)"
 
-#: ../src/bc.c:107
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -81,7 +81,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:116
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -93,7 +93,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:125
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -101,11 +101,11 @@ msgstr "ISBN"
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:131
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr "Code 39"
 
-#: ../src/bc.c:134
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr "Code 128"
 
@@ -117,11 +117,11 @@ msgstr "Code 128C"
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc.c:143
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr "EntrelacÃ© 2 de 5"
 
-#: ../src/bc.c:146
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr "Code-barre"
 
@@ -133,19 +133,256 @@ msgstr "MSI"
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:155
+#: ../src/bc.c:155 ../src/bc.c:213
 msgid "Code 93"
 msgstr "Code 93"
 
 #: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
 msgid "GS1-128"
 msgstr "GS1-128"
 
-#: ../src/bc.c:169
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+#, fuzzy
+msgid "HIBC QR Code"
+msgstr "IEC18004 (QRCode)"
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Coller"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Code-barre"
+
+#: ../src/bc.c:330
+#, fuzzy
+msgid "Pharmacode 2-track"
+msgstr "DonnÃ©es de code-barre"
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Supprimer"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:176
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr "IEC18004 (QRCode)"
 
@@ -316,7 +553,7 @@ msgstr "Erreur fatale de gLabelsÂ !"
 msgid "New Label or Card"
 msgstr "Nouvelle Ã©tiquette ou carte"
 
-#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "PropriÃ©tÃ©s de l'Ã©tiquette"
 
@@ -438,63 +675,63 @@ msgstr "0123456789 .:,;(*!?)"
 msgid "Sample text"
 msgstr "Exemple de texte"
 
-#: ../src/glabels-batch.c:52
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "dÃ©finit le fichier de sortie (dÃ©faut=Â«Â output.pdfÂ Â»)"
 
-#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "nom de fichier"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "nombre de pages (dÃ©faut=1)"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "feuilles"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "nombre de copies (dÃ©faut=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "copies"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "premiÃ¨re Ã©tiquette sur la premiÃ¨re page (dÃ©faut=1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "premiÃ¨re"
 
-#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "imprimer les bordures (pour tester l'alignement de l'imprimante)"
 
-#: ../src/glabels-batch.c:62 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "imprimer Ã  l'envers (i.e. une image miroir)"
 
-#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "imprimer les guides de coupe"
 
-#: ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "fichier d'entrÃ©e pour la fusion"
 
-#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[FICHIER...]"
 
-#: ../src/glabels-batch.c:98
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr "Imprimer des fichiers crÃ©Ã©s avec gLabels."
 
-#: ../src/glabels-batch.c:106 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
@@ -504,13 +741,13 @@ msgstr ""
 "Lancez Â«Â %s --helpÂ Â» pour afficher la liste complÃ¨te des options en ligne de "
 "commande.\n"
 
-#: ../src/glabels-batch.c:149
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr ""
 "impossible d'effectuer une fusion de document avec le fichier gLabels %s\n"
 
-#: ../src/glabels-batch.c:184
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "impossible d'ouvrir le fichier gLabels %s\n"
@@ -531,11 +768,11 @@ msgstr "DonnÃ©es de code-barre"
 msgid "Barcode property"
 msgstr "PropriÃ©tÃ© de code-barre"
 
-#: ../src/label-barcode.c:483
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr "DonnÃ©es de code-barre vides"
 
-#: ../src/label-barcode.c:487
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr "DonnÃ©es de code-barre non valides"
 
@@ -558,79 +795,79 @@ msgstr "Couleur de ligne"
 msgid "Line width"
 msgstr "Largeur de la ligne"
 
-#: ../src/label.c:399
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: ../src/label.c:702 ../src/ui.c:422
+#: ../src/label.c:705 ../src/ui.c:422
 msgid "Merge properties"
 msgstr "PropriÃ©tÃ©s de fusion"
 
-#: ../src/label.c:1184 ../src/ui.c:215
+#: ../src/label.c:1197 ../src/ui.c:215
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/label.c:1217 ../src/ui.c:324
+#: ../src/label.c:1230 ../src/ui.c:324
 msgid "Bring to front"
 msgstr "Mettre en premier plan"
 
-#: ../src/label.c:1253 ../src/ui.c:331
+#: ../src/label.c:1266 ../src/ui.c:331
 msgid "Send to back"
 msgstr "Placer en arriÃ¨re-plan"
 
-#: ../src/label.c:1294
+#: ../src/label.c:1307
 msgid "Rotate"
 msgstr "Rotation"
 
-#: ../src/label.c:1329 ../src/ui.c:338
+#: ../src/label.c:1342 ../src/ui.c:338
 msgid "Rotate left"
 msgstr "Rotation gauche"
 
-#: ../src/label.c:1362 ../src/ui.c:345
+#: ../src/label.c:1375 ../src/ui.c:345
 msgid "Rotate right"
 msgstr "Rotation droite"
 
-#: ../src/label.c:1397 ../src/ui.c:352
+#: ../src/label.c:1410 ../src/ui.c:352
 msgid "Flip horizontally"
 msgstr "Retourner horizontalement"
 
-#: ../src/label.c:1432 ../src/ui.c:359
+#: ../src/label.c:1445 ../src/ui.c:359
 msgid "Flip vertically"
 msgstr "Retourner verticalement"
 
-#: ../src/label.c:1472 ../src/ui.c:366
+#: ../src/label.c:1485 ../src/ui.c:366
 msgid "Align left"
 msgstr "Aligner Ã  gauche"
 
-#: ../src/label.c:1529 ../src/ui.c:373
+#: ../src/label.c:1542 ../src/ui.c:373
 msgid "Align right"
 msgstr "Aligner Ã  droite"
 
-#: ../src/label.c:1590 ../src/ui.c:380
+#: ../src/label.c:1603 ../src/ui.c:380
 msgid "Align horizontal center"
 msgstr "Aligner horizontalement les centres"
 
-#: ../src/label.c:1666 ../src/ui.c:387
+#: ../src/label.c:1679 ../src/ui.c:387
 msgid "Align tops"
 msgstr "Aligner les sommets"
 
-#: ../src/label.c:1723 ../src/ui.c:394
+#: ../src/label.c:1736 ../src/ui.c:394
 msgid "Align bottoms"
 msgstr "Aligner les bases"
 
-#: ../src/label.c:1784 ../src/ui.c:401
+#: ../src/label.c:1797 ../src/ui.c:401
 msgid "Align vertical center"
 msgstr "Aligner verticalement les centres"
 
-#: ../src/label.c:1862 ../src/ui.c:408
+#: ../src/label.c:1875 ../src/ui.c:408
 msgid "Center horizontally"
 msgstr "Centrer horizontalement"
 
-#: ../src/label.c:1909 ../src/ui.c:415
+#: ../src/label.c:1922 ../src/ui.c:415
 msgid "Center vertically"
 msgstr "Centrer verticalement"
 
-#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
 msgid "Paste"
 msgstr "Coller"
 
@@ -638,11 +875,11 @@ msgstr "Coller"
 msgid "Create ellipse object"
 msgstr "CrÃ©e un objet ellipse"
 
-#: ../src/label-image.c:161 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:312
 msgid "Create image object"
 msgstr "CrÃ©e un objet image"
 
-#: ../src/label-image.c:265 ../src/label-image.c:336
+#: ../src/label-image.c:333 ../src/label-image.c:474
 msgid "Set image"
 msgstr "DÃ©finir l'image"
 
@@ -815,11 +1052,22 @@ msgid "Text: Colon separated values with keys on line 1"
 msgstr ""
 "TexteÂ : valeurs sÃ©parÃ©es par des deux-points avec en-tÃªtes en premiÃ¨re ligne"
 
-#: ../src/merge-init.c:104
+#: ../src/merge-init.c:102
+#, fuzzy
+msgid "Text: Semicolon separated values"
+msgstr "TexteÂ : valeurs sÃ©parÃ©es par des deux-points"
+
+#: ../src/merge-init.c:109
+#, fuzzy
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+"TexteÂ : valeurs sÃ©parÃ©es par des deux-points avec en-tÃªtes en premiÃ¨re ligne"
+
+#: ../src/merge-init.c:119
 msgid "Evolution Addressbook"
 msgstr "Carnet d'adresses Evolution"
 
-#: ../src/merge-init.c:110
+#: ../src/merge-init.c:125
 msgid "VCards"
 msgstr "VCard"
 
@@ -843,7 +1091,7 @@ msgstr "SÃ©lectionner"
 msgid "Record/Field"
 msgstr "Enregistrements/Champs"
 
-#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "DonnÃ©es"
 
@@ -939,7 +1187,7 @@ msgstr "PrÃ©fÃ©rences de gLabels"
 
 #. ===================================================================
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:217
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Ã?tiquettes"
@@ -1089,10 +1337,9 @@ msgstr "CrÃ©ation terminÃ©e"
 msgid "Edit gLabels Template"
 msgstr "Modifier un modÃ¨le gLabels"
 
-#: ../src/template-designer.c:1422
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
 msgstr ""
 "<span foreground='red' weight='bold'>La marque et le numÃ©ro d'article "
 "correspondent Ã  un modÃ¨le existant.</span>"
@@ -1327,7 +1574,8 @@ msgstr "Mode sÃ©lection"
 msgid "Select, move and modify objects"
 msgstr "SÃ©lectionne, dÃ©place et modifie les objets"
 
-#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Texte"
 
@@ -1339,7 +1587,8 @@ msgstr "BoÃ®te"
 msgid "Create box/rectangle object"
 msgstr "CrÃ©e un objet boÃ®te/rectangle"
 
-#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Ligne"
 
@@ -1351,7 +1600,7 @@ msgstr "Ellipse"
 msgid "Create ellipse/circle object"
 msgstr "CrÃ©e un objet ellipse/cercle"
 
-#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Image"
 
@@ -1544,52 +1793,57 @@ msgstr "(vide) - gLabels"
 msgid "(modified)"
 msgstr "(modifiÃ©)"
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "NÅ?ud racine incorrect = \"%s\""
 
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "nÅ?ud incorrect =  \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:227
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "erreur xmlParseFile"
 
-#: ../src/xml-label.c:264
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Pas de racine de document"
 
-#: ../src/xml-label.c:272
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Importation Ã  partir du format glabels 0.1"
 
-#: ../src/xml-label.c:281
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Importation Ã  partir du format glabels 0.4"
 
-#: ../src/xml-label.c:291
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "Espace de noms inconnu de glabels -- Utilisation de %s"
 
-#: ../src/xml-label.c:360
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "nÅ?ud racine incorrect dans le nÅ?ud Document = Â«Â %sÂ Â»"
 
-#: ../src/xml-label.c:856
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "nÅ?ud incorrect dans le nÅ?ud DonnÃ©es = Â«Â %sÂ Â»"
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Identifiant ou nom de taille de papier Â«Â %sÂ Â» inconnu"
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Erreur de conversion Utf8."
 
-#: ../src/xml-label.c:1104
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "ProblÃ¨me lors de l'enregistrement du fichier xml."
 
@@ -1606,7 +1860,7 @@ msgstr "Autre"
 msgid "User defined"
 msgstr "DÃ©fini par l'utilisateur"
 
-#: ../libglabels/db.c:650
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1614,7 +1868,7 @@ msgstr ""
 "Impossible de trouver les dÃ©finitions des tailles de papier. Libglabels "
 "n'est peut-Ãªtre pas correctement installÃ©Â !"
 
-#: ../libglabels/db.c:1042
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1622,7 +1876,7 @@ msgstr ""
 "Impossible de trouver les dÃ©finitions des catÃ©gories. Libglabels n'est peut-"
 "Ãªtre pas correctement installÃ©Â !"
 
-#: ../libglabels/db.c:2061
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1630,7 +1884,7 @@ msgstr ""
 "Impossible de trouver les fichiers modÃ¨les. Libglabels n'est peut-Ãªtre pas "
 "correctement installÃ©Â !"
 
-#: ../libglabels/db.c:2128
+#: ../libglabels/db.c:2164
 #, c-format
 msgid "%s full page label"
 msgstr "Page %s complÃ¨te d'Ã©tiquettes"
@@ -1640,12 +1894,24 @@ msgstr "Page %s complÃ¨te d'Ã©tiquettes"
 msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr "Partie Ã©quivalente (Â«Â %sÂ Â») pour Â«Â %sÂ Â», non dÃ©finie auparavant."
 
-#: ../libglabels/template.c:722 ../libglabels/template.c:726
-msgid "per sheet"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr ""
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
 msgstr "par feuille"
 
-#: ../libglabels/template.c:796 ../libglabels/template.c:802
-#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
 msgid "diameter"
 msgstr "diamÃ¨tre"
 
@@ -1653,13 +1919,13 @@ msgstr "diamÃ¨tre"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:40
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr "points"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
 #: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr "pouces"
@@ -1719,25 +1985,27 @@ msgstr "L'attribut nom manque Ã©galement."
 #. * End:                   -- emacs
 #.
 #: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>SÃ©lection/AperÃ§u des enregistrements</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Source</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "FormatÂ :"
 
-#: ../data/ui/merge-properties-dialog.ui.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "EmplacementÂ :"
 
-#: ../data/ui/merge-properties-dialog.ui.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>SÃ©lection/AperÃ§u des enregistrements</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Tout sÃ©lectionner"
 
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Source</b>"
+
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "DÃ©sÃ©lectionner tout"
@@ -1820,133 +2088,129 @@ msgstr "FabricantÂ :"
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">PropriÃ©tÃ©s de l'objet Xxx</span>"
-
-#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "AlignementÂ :"
 
-#: ../data/ui/object-editor.ui.h:5
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 "Autoriser une diminution automatique de la taille du texte lors de la fusion"
 
-#: ../data/ui/object-editor.ui.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "AngleÂ :"
 
-#: ../data/ui/object-editor.ui.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Somme de contrÃ´le"
 
-#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "CouleurÂ :"
 
-#: ../data/ui/object-editor.ui.h:10
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Activer l'ombrage"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "FamilleÂ :"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "FichierÂ :"
 
-#: ../data/ui/object-editor.ui.h:13
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Remplissage"
 
-#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "HauteurÂ :"
 
-#: ../data/ui/object-editor.ui.h:16
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "ClÃ©Â :"
 
-#: ../data/ui/object-editor.ui.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "LongueurÂ :"
 
-#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "EspacementÂ :"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "LittÃ©ralÂ :"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "OpacitÃ©Â :"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Position"
 
-#: ../data/ui/object-editor.ui.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Restaurer la taille d'image"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Ombre"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Taille"
 
-#: ../data/ui/object-editor.ui.h:26
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "TailleÂ :"
 
-#: ../data/ui/object-editor.ui.h:27
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Style"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "StyleÂ :"
 
-#: ../data/ui/object-editor.ui.h:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
 #: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "LargeurÂ :"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "DÃ©calage XÂ :"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "XÂ :"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "DÃ©calage YÂ :"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "YÂ :"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "degrÃ©s"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "chiffresÂ :"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "formatÂ :"
 
@@ -1954,66 +2218,56 @@ msgstr "formatÂ :"
 msgid "   "
 msgstr "   "
 
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Taille de page par dÃ©faut</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Remplissage</span>"
-
 #: ../data/ui/prefs-dialog.ui.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Ligne</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Texte</span>"
+#, fuzzy
+msgid "Default page size"
+msgstr "Restaurer la taille d'image"
 
 #: ../data/ui/prefs-dialog.ui.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">UnitÃ©s</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "PoliceÂ :"
 
-#: ../data/ui/prefs-dialog.ui.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/ui/prefs-dialog.ui.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Pouces"
 
-#: ../data/ui/prefs-dialog.ui.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "ParamÃ¨tres rÃ©gionaux"
 
-#: ../data/ui/prefs-dialog.ui.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "MillimÃ¨tres"
 
-#: ../data/ui/prefs-dialog.ui.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "ParamÃ¨tres par dÃ©faut pour les objets"
 
-#: ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Points"
 
-#: ../data/ui/prefs-dialog.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "DÃ©finir des propriÃ©tÃ©s par dÃ©faut pour les nouveaux objets."
 
-#: ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "SÃ©lectionnez les paramÃ¨tres correspondants Ã  votre rÃ©gion."
 
-#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "Letter US"
 
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Sans titre"
+
 #: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Gras"
@@ -2249,25 +2503,28 @@ msgstr ""
 "Cet assistant va vous aider Ã  crÃ©er un modÃ¨le personnalisÃ© pour gLabels."
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "<b>Copies</b>"
-msgstr "<b>Copies</b>"
+msgid "Collate"
+msgstr "Assembler"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-msgid "<b>Merge Control</b>"
-msgstr "<b>ContrÃ´le de la fusion</b>"
+#, fuzzy
+msgid "Copies"
+msgstr "CopiesÂ :"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>Options</b>"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-msgid "Collate"
-msgstr "Assembler"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
 msgid "Copies:"
 msgstr "CopiesÂ :"
 
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "<b>ContrÃ´le de la fusion</b>"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>Options</b>"
+
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
 msgstr "FeuillesÂ :"
@@ -3035,3 +3292,25 @@ msgstr "Ã?tiquettes rectangulaires pour copieur"
 #: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "Ã?tiquettes vidÃ©o (dos)"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">PropriÃ©tÃ©s de l'objet Xxx</span>"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Taille de page par dÃ©faut</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Remplissage</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Ligne</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Texte</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">UnitÃ©s</span>"
+
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>Copies</b>"
diff --git a/po/it.po b/po/it.po
index 09e23b7..6fe4f28 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,1840 +4,2410 @@
 # This file is distributed under the same license as the glabels package.
 # Andrea <mancio_and yahoo it>, 2003.
 # Daniele Medri <daniele medri libero it>, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-19 20:43-0400\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2005-06-27 09:34+0200\n"
 "Last-Translator: Daniele Medri <daniele medri libero it>\n"
 "Language-Team: Italian <it li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: src/glabels.c:116
-msgid "Could not initialize Bonobo!\n"
-msgstr "Non Ã¨ possibile inizializzare Bonobo!\n"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (qualsiasi)"
 
-#: src/glabels-batch.c:52
-msgid "print this message"
-msgstr "stampa questo messaggio"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (solo ZIP/CAP)"
 
-#: src/glabels-batch.c:54
-msgid "print the version of glabels-batch being used"
-msgstr "stampa la versione di glabels batch utilizzata"
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP/CAP+4)"
 
-#: src/glabels-batch.c:56
-msgid "set output filename (default=\"output.ps\")"
-msgstr "imposta il nome del file di output (default=\"output.ps\")"
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
 
-#: src/glabels-batch.c:56 src/glabels-batch.c:70
-msgid "filename"
-msgstr "nome file"
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr ""
 
-#: src/glabels-batch.c:58
-msgid "number of sheets (default=1)"
-msgstr "numero di fogli (default=1)"
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (qualsiasi)"
 
-#: src/glabels-batch.c:58
-msgid "sheets"
-msgstr "fogli"
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
 
-#: src/glabels-batch.c:60
-msgid "number of copies (default=1)"
-msgstr "numero di copie (default=1)"
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
 
-#: src/glabels-batch.c:60
-msgid "copies"
-msgstr "copie"
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
 
-#: src/glabels-batch.c:62
-msgid "first label on first sheet (default=1)"
-msgstr "prima etichetta del primo foglio (default=1)"
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
 
-#: src/glabels-batch.c:62
-msgid "first"
-msgstr "primo"
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
 
-#: src/glabels-batch.c:64 src/print-dialog.c:336
-msgid "print outlines (to test printer alignment)"
-msgstr "stampa bordi (per provare l'allineamento della stampante)"
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
 
-#: src/glabels-batch.c:66 src/print-dialog.c:344
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "stampa al contrario (es. un'immagine riflessa)"
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A o UPC-E)"
 
-#: src/glabels-batch.c:68 src/print-dialog.c:351
-msgid "print crop marks"
-msgstr "stampa segni di taglio"
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
 
-#: src/glabels-batch.c:70
-msgid "input file for merging"
-msgstr "file per la stampa unione"
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
 
-#: src/glabels-batch.c:107
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr "[OPTION...] GLABELS_FILE..."
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
 
-#: src/glabels-batch.c:127
-#, c-format
-msgid "missing glabels file\n"
-msgstr "file di glabels mancante\n"
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
 
-#: src/glabels-batch.c:158
-#, c-format
-msgid "cannot perform document merge with glabels file %s\n"
-msgstr "non Ã¨ possibile unire i documenti con il file glabels %s\n"
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
 
-#: src/glabels-batch.c:182
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "non Ã¨ possibile aprire il file glabels %s\n"
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
 
-#: src/window.c:244
-msgid "(none) - gLabels"
-msgstr "(niente) - gLabels"
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
 
-#: src/window.c:414
-msgid "(modified)"
-msgstr "(modificato)"
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
 
-#: src/stock.c:65 data/ui/glabels-ui.xml.h:162
-msgid "_Select Mode"
-msgstr "ModalitÃ  di _selezione"
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Code 39"
 
-#: src/stock.c:66 data/ui/glabels-ui.xml.h:163
-msgid "_Text"
-msgstr "_Testo"
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Code 128"
 
-#: src/stock.c:67 data/ui/glabels-ui.xml.h:148
-msgid "_Line"
-msgstr "_Linea"
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Code 128C"
 
-#: src/stock.c:68 data/ui/glabels-ui.xml.h:130
-msgid "_Box"
-msgstr "_Area"
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Code 128B"
 
-#: src/stock.c:69 data/ui/glabels-ui.xml.h:141
-msgid "_Ellipse"
-msgstr "_Ellisse"
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr ""
 
-#: src/stock.c:70 data/ui/glabels-ui.xml.h:146
-msgid "_Image"
-msgstr "_Immagine"
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
 
-#: src/stock.c:71 data/ui/glabels-ui.xml.h:11
-msgid "Bar_code"
-msgstr "_Codice a barre"
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
 
-#: src/stock.c:72
-msgid "_Merge Properties"
-msgstr "ProprietÃ  di _unione"
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
 
-#: src/stock.c:73
-msgid "Object _Properties"
-msgstr "_ProprietÃ Â·Oggetto"
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
 
-#: src/stock.c:74 data/ui/glabels-ui.xml.h:13
-msgid "Bring to _Front"
-msgstr "Porta in _primo piano"
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:109
-msgid "Send to _Back"
-msgstr "Porta in _secondo piano"
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:96
-msgid "Rotate _Left"
-msgstr "Ruota a sinistra"
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:97
-msgid "Rotate _Right"
-msgstr "Ruota a destra"
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
-msgstr "Capovolgi _orizzontalmente"
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
-msgstr "Capovolgi _verticalmente"
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:147
-msgid "_Lefts"
-msgstr "_Sinistra"
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:159
-msgid "_Rights"
-msgstr "_Destra"
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:131
-msgid "_Centers"
-msgstr "_Centro"
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:164
-msgid "_Tops"
-msgstr "_In alto"
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
 
-#: src/stock.c:84
-msgid "Bottoms"
-msgstr "In basso"
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr "Centrato"
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
-msgstr "Etichetta ce_ntrata"
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
-msgstr "Colore di riempimento"
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
 
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
-msgstr "Colore Linea"
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
 
-#: src/stock.c:90 src/stock.c:92
-msgid "Linked"
-msgstr "Collegato"
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
 
-#: src/stock.c:91 src/stock.c:93
-msgid "Not Linked"
-msgstr "Nessun collegamento"
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
 
-#: src/ui-property-bar.c:345 src/object-editor.c:499
-msgid "Default"
+#: ../src/bc.c:225
+msgid "Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+msgid "HIBC Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+msgid "PLANET"
+msgstr ""
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Incolla"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "_Codice a barre"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Cancella"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
 msgstr "Predefinito"
 
-#: src/ui-property-bar.c:360 src/object-editor.c:512
-msgid "No fill"
-msgstr "Nessun riempimento"
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "rosso scuro"
 
-#: src/ui-property-bar.c:375 src/object-editor.c:505
-msgid "No line"
-msgstr "Nessuna linea"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/ui-sidebar.c:180
-msgid "Object properties"
-msgstr "ProprietÃ  oggetto"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/commands.c:385
-msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-
-#: src/commands.c:399
-msgid "See the file AUTHORS for additional credits,"
-msgstr "Visualizza il file AUTHORS per informazioni aggiuntive."
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "verde scuro"
 
-#: src/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
-msgstr "oppure visita http://glabels.sourceforge.net/";
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
 
-#: src/commands.c:409
-msgid " "
-msgstr " "
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/commands.c:424
-msgid "glabels"
-msgstr "glabels"
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "blu scuro"
 
-#: src/file.c:100
-msgid "New Label or Card"
-msgstr "Nuova etichetta o scheda"
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "Ripeti"
 
-#: src/file.c:132 src/file.c:304
-msgid "Media Type"
-msgstr "Tipo media"
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "arancione"
 
-#: src/file.c:138 src/file.c:310
-msgid "Label orientation"
-msgstr "Orientazione etichetta"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
+
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "verde scuro"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
+
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "blu"
+
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "viola"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
+
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "oro"
+
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "giallo"
+
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "verde"
+
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr ""
+
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "Stile"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
+
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "rosa"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
+
+#: ../src/color-combo-menu.c:109
+#, fuzzy
+msgid "Light Yellow"
+msgstr "Marrone chiaro"
+
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "Marrone chiaro"
+
+#: ../src/color-combo-menu.c:111
+#, fuzzy
+msgid "Light Cyan"
+msgstr "Allineamento a destra"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:113
+#, fuzzy
+msgid "Thistle"
+msgstr "bianco"
+
+#: ../src/color-combo-menu.c:115
+#, fuzzy
+msgid "White"
+msgstr "bianco"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:126
+#, fuzzy
+msgid "Black"
+msgstr "nero"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+#, fuzzy
+msgid "Custom Color"
+msgstr "Colore personalizzato:"
+
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "Colore personalizzato:"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr ""
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "Nuova etichetta o scheda"
 
-#: src/file.c:269
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "ProprietÃ  etichetta"
 
-#: src/file.c:452 src/file.c:870
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr "Tutti i file"
 
-#: src/file.c:457 src/file.c:875
+#: ../src/file.c:272 ../src/file.c:562
 msgid "gLabels documents"
 msgstr "Documenti di gLabels"
 
-#: src/file.c:505 src/file.c:617 src/file.c:934 src/file.c:1130
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
 msgstr "Selezione di un nome file vuoto"
 
-#: src/file.c:506 src/file.c:520 src/file.c:618 src/file.c:632
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
 msgstr "Per piacere, indica un file o un nome valido"
 
-#: src/file.c:519 src/file.c:631
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
-#: src/file.c:563 data/ui/glabels-ui.xml.h:74
-msgid "Open"
-msgstr "Apri"
-
-#: src/file.c:565
-msgid "Open label"
-msgstr "Apri etichetta"
-
-#: src/file.c:707
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Non riesco ad aprire il file \"%s\""
 
-#: src/file.c:715
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr "Non Ã¨ un formato file supportato"
 
-#: src/file.c:797 src/file.c:979 src/file.c:1174
+#: ../src/file.c:491 ../src/file.c:670
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "Non riesco a salvare il file \"%s\""
 
-#: src/file.c:805 src/file.c:987 src/file.c:1182
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: src/file.c:848 src/file.c:1048
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Salva \"%s\" come"
 
-#: src/file.c:935 src/file.c:1131
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr "Per piacere, indica un nome file valido"
 
-#: src/file.c:952 src/file.c:1147
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Sovrascrivi il file \"%s\"?"
 
-#: src/file.c:960 src/file.c:1155
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr "File giÃ  esistente."
 
-#: src/file.c:1271
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Salva i cambiamenti al documento \"%s\" prima di chiudere?"
 
-#: src/file.c:1279
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr "I tuoi cambiamenti andranno persi se non salvi."
 
-#: src/file.c:1282
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "Chiudi senza salvare"
 
-#. Should not happen
-#: src/prefs.c:156 src/prefs.c:163 data/glade/prefs-dialog.glade.h:23
-#: data/glade/object-editor.glade.h:37
-msgid "points"
-msgstr "punti"
-
-#: src/prefs.c:158 data/glade/object-editor.glade.h:36
-#: data/glade/template-designer.glade.h:74
-msgid "inches"
-msgstr "pollici"
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "_File Recenti"
 
-#: src/prefs.c:160
-msgid "mm"
-msgstr "mm"
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
 
-#: src/prefs-dialog.c:248 data/glade/prefs-dialog.glade.h:22
-msgid "gLabels Preferences"
-msgstr "Preferenze gLabels"
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
 
-#.
-#. * Submenu: Order
-#.
-#: src/view.c:3574 data/ui/glabels-ui.xml.h:154
-msgid "_Order"
-msgstr "_Ordine"
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "Tutti i file"
 
 #.
-#. * Submenu: Rotate/Flip
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
 #.
-#: src/view.c:3595 data/ui/glabels-ui.xml.h:160
-msgid "_Rotate/Flip"
-msgstr "_Ruota/capovolgi"
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
 
-#.
-#. * Submenu: Align Horizontally
-#.
-#: src/view.c:3628
-msgid "Align _Horizontally"
-msgstr "Allineamento _orizzontale"
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
 
-#.
-#. * Submenu: Align Vertically
-#.
-#: src/view.c:3667
-msgid "Align _Vertically"
-msgstr "Allineamento _verticale"
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
 
-#: src/view.c:3728 data/ui/glabels-ui.xml.h:137
-msgid "_Delete"
-msgstr "Cancella"
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
 
-#. Build editor.
-#: src/view-box.c:224
-msgid "Box object properties"
-msgstr "ProprietÃ  dell'oggetto area"
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
 
-#. Build editor.
-#: src/view-ellipse.c:224
-msgid "Ellipse object properties"
-msgstr "ProprietÃ  dell'oggetto Ellisse"
+#: ../src/glabels-batch.c:53
+#, fuzzy
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "imposta il nome del file di output (default=\"output.ps\")"
 
-#. Build editor.
-#: src/view-line.c:224
-msgid "Line object properties"
-msgstr "ProprietÃ  dell'oggetto Linea"
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
+msgid "filename"
+msgstr "nome file"
 
-#. Build editor.
-#: src/view-image.c:223
-msgid "Image object properties"
-msgstr "ProprietÃ  dell'oggetto Immagine"
+#: ../src/glabels-batch.c:55
+msgid "number of sheets (default=1)"
+msgstr "numero di fogli (default=1)"
 
-#. Build editor.
-#: src/view-text.c:251
-msgid "Text object properties"
-msgstr "ProprietÃ  dell'oggetto Testo"
+#: ../src/glabels-batch.c:55
+msgid "sheets"
+msgstr "fogli"
 
-#: src/view-text.c:563 data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "Testo"
+#: ../src/glabels-batch.c:57
+msgid "number of copies (default=1)"
+msgstr "numero di copie (default=1)"
 
-#. Build editor.
-#: src/view-barcode.c:210
-msgid "Barcode object properties"
-msgstr "ProprietÃ  dell'oggetto Codice a barre"
+#: ../src/glabels-batch.c:57
+msgid "copies"
+msgstr "copie"
 
-#: src/view-barcode.c:580 src/print.c:1089
-msgid "Invalid barcode data"
-msgstr "Codice a barre non valido"
+#: ../src/glabels-batch.c:59
+msgid "first label on first sheet (default=1)"
+msgstr "prima etichetta del primo foglio (default=1)"
 
-#: src/merge-properties-dialog.c:231
-msgid "Merge Properties"
-msgstr "ProprietÃ  di unione"
+#: ../src/glabels-batch.c:59
+msgid "first"
+msgstr "primo"
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "Sorgente"
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "stampa bordi (per provare l'allineamento della stampante)"
 
-#: src/merge-properties-dialog.c:245
-msgid "Format:"
-msgstr "Formato:"
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "stampa al contrario (es. un'immagine riflessa)"
 
-#. Location line
-#: src/merge-properties-dialog.c:273
-msgid "Location:"
-msgstr "Posizione:"
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
+msgstr "stampa segni di taglio"
 
-#: src/merge-properties-dialog.c:282 src/merge-properties-dialog.c:393
-msgid "Select merge-database source"
-msgstr "Seleziona sorgente unione-database"
+#: ../src/glabels-batch.c:67
+msgid "input file for merging"
+msgstr "file per la stampa unione"
 
-#: src/merge-properties-dialog.c:289 src/merge-properties-dialog.c:404
-msgid "N/A"
-msgstr "N/A"
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr ""
 
-#. ---- Sample Fields section ----
-#: src/merge-properties-dialog.c:300
-msgid "Record selection/preview:"
-msgstr "Selezione/anteprima record:"
+#: ../src/glabels-batch.c:99
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "Seleziona"
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
-msgstr "Record/campo"
+#: ../src/glabels-batch.c:151
+#, c-format
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "non Ã¨ possibile unire i documenti con il file glabels %s\n"
 
-#: src/merge-properties-dialog.c:342 data/glade/object-editor.glade.h:9
-msgid "Data"
-msgstr "Dati"
+#: ../src/glabels-batch.c:186
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "non Ã¨ possibile aprire il file glabels %s\n"
 
-#: src/print-dialog.c:266 data/ui/glabels-ui.xml.h:81
-msgid "Print"
-msgstr "Stampa"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr ""
 
-#: src/print-dialog.c:281
-msgid "_Job"
-msgstr "Lavoro"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Crea oggetto codice a barre"
 
-#: src/print-dialog.c:286
-msgid "P_rinter"
-msgstr "Stampante"
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "_Codice a barre"
 
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:314
-msgid "Copies"
-msgstr "Copie"
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "ProprietÃ  dell'oggetto Codice a barre"
 
-#. ------- Add merge control widget ------------
-#: src/print-dialog.c:322
-msgid "Document merge control"
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
 msgstr ""
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "Opzioni"
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "Codice a barre non valido"
 
-#: src/print-dialog.c:553 src/print-dialog.c:592
-msgid "Print preview"
-msgstr "Anteprima di stampa"
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "Crea oggeto testo"
 
-#: src/template-designer.c:409 data/glade/template-designer.glade.h:73
-msgid "gLabels Template Designer"
-msgstr "Progettazione di modelli per gLabels"
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "Colore di riempimento"
 
-#: src/bc.c:60
-msgid "POSTNET (any)"
-msgstr "POSTNET (qualsiasi)"
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "Colore Linea"
 
-#: src/bc.c:63
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (solo ZIP/CAP)"
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "Larghezza linea"
 
-#: src/bc.c:66
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP/CAP+4)"
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "Senza nome"
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
+#: ../src/label.c:705 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "ProprietÃ  di unione"
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr "EAN (qualsiasi)"
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "Cancella"
 
-#: src/bc.c:75
-msgid "EAN-8"
-msgstr "EAN-8"
+#: ../src/label.c:1230 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "Porta in _primo piano"
 
-#: src/bc.c:78
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
+#: ../src/label.c:1266 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "Porta in _secondo piano"
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
+#: ../src/label.c:1307
+msgid "Rotate"
+msgstr "Girare"
 
-#: src/bc.c:84
-msgid "EAN-13"
-msgstr "EAN-13"
+#: ../src/label.c:1342 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "Ruota a sinistra"
 
-#: src/bc.c:87
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
+#: ../src/label.c:1375 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "Ruota a destra"
 
-#: src/bc.c:90
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
+#: ../src/label.c:1410 ../src/ui.c:352
+#, fuzzy
+msgid "Flip horizontally"
+msgstr "Capovolgi _orizzontalmente"
 
-#: src/bc.c:93
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A o UPC-E)"
+#: ../src/label.c:1445 ../src/ui.c:359
+#, fuzzy
+msgid "Flip vertically"
+msgstr "Capovolgi _verticalmente"
 
-#: src/bc.c:96
-msgid "UPC-A"
-msgstr "UPC-A"
+#: ../src/label.c:1485 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "Allineamento:"
 
-#: src/bc.c:99
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
+#: ../src/label.c:1542 ../src/ui.c:373
+#, fuzzy
+msgid "Align right"
+msgstr "Allineamento orizzontale"
 
-#: src/bc.c:102
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
+#: ../src/label.c:1603 ../src/ui.c:380
+#, fuzzy
+msgid "Align horizontal center"
+msgstr "Allinea gli oggetti nel centro orizzontale"
 
-#: src/bc.c:105
-msgid "UPC-E"
-msgstr "UPC-E"
+#: ../src/label.c:1679 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "Allineamento:"
 
-#: src/bc.c:108
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
+#: ../src/label.c:1736 ../src/ui.c:394
+#, fuzzy
+msgid "Align bottoms"
+msgstr "Allinea gli oggetti in basso"
 
-#: src/bc.c:111
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
+#: ../src/label.c:1797 ../src/ui.c:401
+#, fuzzy
+msgid "Align vertical center"
+msgstr "Allinea gli oggetti al centro verticale"
 
-#: src/bc.c:114
-msgid "ISBN"
-msgstr "ISBN"
+#: ../src/label.c:1875 ../src/ui.c:408
+#, fuzzy
+msgid "Center horizontally"
+msgstr "Capovolgi oggetto orizzontalmente"
 
-#: src/bc.c:117
-msgid "ISBN +5"
-msgstr "ISBN +5"
+#: ../src/label.c:1922 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "Capovolgi oggetto verticalmente"
 
-#: src/bc.c:120
-msgid "Code 39"
-msgstr "Code 39"
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "Incolla"
 
-#: src/bc.c:123
-msgid "Code 128"
-msgstr "Code 128"
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Crea oggetto linea"
 
-#: src/bc.c:126
-msgid "Code 128C"
-msgstr "Code 128C"
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Crea oggetto immagine"
 
-#: src/bc.c:129
-msgid "Code 128B"
-msgstr "Code 128B"
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "Ripristina dimensioni immagine"
 
-#: src/bc.c:132
-msgid "Interleaved 2 of 5"
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Crea oggetto linea"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
 msgstr ""
 
-#: src/bc.c:135
-msgid "Codabar"
-msgstr "Codabar"
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "DimensioniÂ·pagina:"
 
-#: src/bc.c:138
-msgid "MSI"
-msgstr "MSI"
+#: ../src/label-object.c:1185
+msgid "Shadow state"
+msgstr ""
 
-#: src/bc.c:141
-msgid "Plessey"
-msgstr "Plessey"
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
+msgstr ""
 
-#: src/label.c:569
-msgid "Untitled"
-msgstr "Senza nome"
+#: ../src/label-object.c:1276
+msgid "Shadow color"
+msgstr ""
 
-#: src/xml-label.c:176 src/xml-label.c:213
-msgid "xmlParseFile error"
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
 msgstr ""
 
-#: src/xml-label.c:250
-msgid "No document root"
-msgstr "Nessun documento radice"
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Crea oggeto testo"
 
-#: src/xml-label.c:264
-msgid "Importing from glabels 0.1 format"
-msgstr ""
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "rosa"
 
-#: src/xml-label.c:272
-msgid "Importing from glabels 0.4 format"
-msgstr ""
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "Nome font"
 
-#: src/xml-label.c:279
-msgid "Importing from glabels 1.91 format"
-msgstr ""
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "DimesioneÂ·font"
 
-#: src/xml-label.c:282
-msgid "bad document, unknown glabels Namespace"
-msgstr ""
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Nome font"
 
-#: src/xml-label.c:311 src/xml-label-04.c:75 src/xml-label-191.c:131
-#, c-format
-msgid "Bad root node = \"%s\""
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "Corsivo"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Allineamento:"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "Spaziatura:"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "Colore testo"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
 msgstr ""
 
-#: src/xml-label.c:348 src/xml-label-191.c:165
-#, c-format
-msgid "bad node in Document node =  \"%s\""
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+msgctxt "Brand"
+msgid "Any"
 msgstr ""
 
-#: src/xml-label.c:393 src/xml-label-04.c:123 src/xml-label-191.c:197
-#, c-format
-msgid "bad node =  \"%s\""
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
 msgstr ""
 
-#: src/xml-label.c:796 src/xml-label-191.c:605
-#, c-format
-msgid "bad node in Data node =  \"%s\""
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
 msgstr ""
 
-#: src/xml-label.c:962 libglabels/xml-template.c:535
-msgid "Utf8 conversion error."
-msgstr "Conversione di errore Utf8."
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "Nessun modello trovato!"
 
-#: src/xml-label.c:969 libglabels/xml-template.c:542
-msgid "Problem saving xml file."
-msgstr "Problema nel salvataggio del file xml"
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
 
-#. This should always be an id, but just in case a name
-#. slips by!
-#: src/xml-label-191.c:680 libglabels/xml-template.c:199
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
 msgstr ""
 
-#: src/xml-label-191.c:690 libglabels/xml-template.c:209
-#, c-format
-msgid "Unknown page size id or name \"%s\""
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Nessun modello trovato!"
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
 msgstr ""
 
-#: src/merge.c:172 src/merge.c:213 src/merge.c:399 src/merge.c:402
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
 msgstr "Nessuno"
 
-#: src/merge-init.c:53
-msgid "Text file with comma delimeters (CSV)"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
 msgstr ""
 
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
-msgstr ""
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+#, fuzzy
+msgid "Couldn't open addressbook."
+msgstr "Non riesco ad aprire il file \"%s\""
+
+#: ../src/merge-evolution.c:348
+#, fuzzy
+msgid "Couldn't list available fields."
+msgstr "Non riesco a salvare il file \"%s\""
 
-#: src/merge-init.c:67
-msgid "Text file with tab delimeters"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
 msgstr ""
 
-#: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11
-msgid "File:"
-msgstr "File:"
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
-#: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "Chiave:"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "Fogli:"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
 
-#: src/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "Etichette"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "da:"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "a:"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
 msgstr ""
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "nel 1Â° foglio"
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "Copie:"
+#: ../src/merge-init.c:119
+msgid "Evolution Addressbook"
+msgstr ""
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "Fascicoli"
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr ""
 
-#: src/wdgt-media-select.c:269 data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "Descrizione:"
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "ProprietÃ  di unione"
 
-#: src/wdgt-media-select.c:279 data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "DimensioniÂ·pagina:"
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Seleziona sorgente unione-database"
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "Dimensioni etichetta:"
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "Layout:"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Seleziona"
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d  (%d per foglio)"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Record/campo"
 
-#: src/wdgt-media-select.c:582
-#, c-format
-msgid "%d per sheet"
-msgstr "%d per foglio"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "Dati"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+#, fuzzy
+msgid "Fixed"
+msgstr "File:"
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
 
-#: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s diametro"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "ModalitÃ  di _selezione"
 
-#: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s diametro"
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "Orientazione etichetta"
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "Girare"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
-msgid "custom"
-msgstr "personalizzato"
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "Predefinito"
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
-msgid "Custom Color:"
-msgstr "Colore personalizzato:"
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "ProprietÃ  oggetto"
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr "Scegli colore personalizzato"
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "ProprietÃ  dell'oggetto area"
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-msgstr "nero"
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "ProprietÃ  dell'oggetto Ellisse"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr "Marrone chiaro"
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "ProprietÃ  dell'oggetto Linea"
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
-msgstr ""
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "ProprietÃ  dell'oggetto Immagine"
 
-#: src/mygal/color-palette.c:582
-msgid "dark green #2"
-msgstr "verde scuro #2"
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "ProprietÃ  dell'oggetto Testo"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
-msgstr ""
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "ProprietÃ  dell'oggetto Codice a barre"
 
-#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr "blu scuro"
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Inserisci campo unione"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr ""
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+#, fuzzy
+msgid "No Fill"
+msgstr "Nessun riempimento"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr ""
+#: ../src/object-editor-image-page.c:278
+#, fuzzy
+msgid "All Files"
+msgstr "Tutti i file"
 
-#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr "rosso scuro"
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "Immagine"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
 msgstr ""
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr "oro"
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+#, fuzzy
+msgid "No Line"
+msgstr "Nessuna linea"
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr "verde scuro"
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "Preferenze gLabels"
 
-#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr ""
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "Etichette"
 
-#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
-msgid "blue"
-msgstr "blu"
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "ModalitÃ  di _selezione"
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr ""
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "_Testo"
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-msgstr ""
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "_Linea"
 
-#: src/mygal/color-palette.c:599
-msgid "red"
-msgstr "rosso"
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "_Area"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr "arancione"
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "_Ellisse"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr "tiglio"
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "_Immagine"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr ""
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "_Codice a barre"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr ""
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "ProprietÃ  di _unione"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr ""
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "_ProprietÃ Â·Oggetto"
 
-#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
-msgid "purple"
-msgstr "viola"
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "Porta in _primo piano"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr "grigio"
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "Porta in _secondo piano"
 
-#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
-msgid "magenta"
-msgstr ""
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "Ruota a sinistra"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
-msgstr ""
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "Ruota a destra"
 
-#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
-msgid "yellow"
-msgstr "giallo"
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "Capovolgi _orizzontalmente"
 
-#: src/mygal/color-palette.c:612
-msgid "green"
-msgstr "verde"
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "Capovolgi _verticalmente"
 
-#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr ""
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "_Sinistra"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr ""
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "_Destra"
 
-#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
-msgid "red purple"
-msgstr ""
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "_Centro"
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
-msgstr ""
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "_In alto"
 
-#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
-msgid "pink"
-msgstr "rosa"
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "In basso"
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
-msgstr ""
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "Centrato"
 
-#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr ""
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "Etichetta ce_ntrata"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
-msgstr ""
+#: ../src/stock.c:95 ../src/stock.c:97
+msgid "Linked"
+msgstr "Collegato"
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
-msgstr ""
+#: ../src/stock.c:96 ../src/stock.c:98
+msgid "Not Linked"
+msgstr "Nessun collegamento"
 
-#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
-msgid "light blue"
-msgstr "blu chiaro"
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "Progettazione di modelli per gLabels"
 
-#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
-msgid "light purple"
+#: ../src/template-designer.c:461
+msgid "Welcome"
 msgstr ""
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr "bianco"
-
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
-msgstr ""
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "Nome e descrizione"
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr ""
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Dimensione pagina"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr ""
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Forma dell'etichetta o della scheda"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr ""
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "Forma dell'etichetta o della scheda"
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "Nessun modello trovato!"
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "Dimensioni etichetta"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr "Altro"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Dimensione etichetta (CD/DVD)"
 
-#: libglabels/paper.c:361
-msgid "No paper files found!"
-msgstr "Nessun file paper trovato!"
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "Numero di layout"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
-msgstr "Informazioni su glabels"
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "Layout"
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr "Informazioni..."
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "Progettazione completata"
 
-#: data/ui/glabels-ui.xml.h:3
-msgid "Align _Horizontal"
-msgstr "Allineamento orizzontale"
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Progettazione di modelli per gLabels"
 
-#: data/ui/glabels-ui.xml.h:4
-msgid "Align _Vertical"
-msgstr "Allineamento _verticale"
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr "Allinea gli oggetti in basso"
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "_File"
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr "Allinea gli oggetti nel centro orizzontale"
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "_File Recenti"
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr ""
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "_Modifica"
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr ""
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "_Visualizza"
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr ""
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
+msgstr "Personalizza la barra degli strumenti principale"
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr "Allinea gli oggetti al centro verticale"
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
+msgstr "Personalizza la barra degli strumenti di disegno"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr "Grassetto"
+#: ../src/ui.c:99
+#, fuzzy
+msgid "Customize Properties Toolbar"
+msgstr "Personalizza barra degli strumenti proprietÃ "
 
-#: data/ui/glabels-ui.xml.h:14
-msgid "Center align"
-msgstr "Allineamento centrato"
+#: ../src/ui.c:100
+msgid "_Objects"
+msgstr "_Oggetti"
 
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
-msgstr ""
+#: ../src/ui.c:101
+#, fuzzy
+msgid "_Create"
+msgstr "_Centro"
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr ""
+#: ../src/ui.c:102
+msgid "_Order"
+msgstr "_Ordine"
 
-#: data/ui/glabels-ui.xml.h:17
-msgid "Change the visibility of markup lines in the current window"
-msgstr ""
-"Cambia la visibilitÃ  delle linee di demarcazione nella finestra corrente"
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "_Ruota/capovolgi"
 
-#: data/ui/glabels-ui.xml.h:18
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr "Cambia la visibilitÃ  della barra degli strumenti di disegno nella finestra corrente"
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
+msgstr "Allineamento orizzontale"
 
-#: data/ui/glabels-ui.xml.h:19
-msgid "Change the visibility of the grid in the current window"
-msgstr "Cambia la visibilitÃ  della griglia nella finestra corrente"
+#: ../src/ui.c:105
+msgid "Align _Vertical"
+msgstr "Allineamento _verticale"
 
-#: data/ui/glabels-ui.xml.h:20
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr "Cambia la visibilitÃ  della barra degli strumenti principale nella finestra corrente"
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "_Aiuto"
 
-#: data/ui/glabels-ui.xml.h:21
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr ""
-"Cambia la visibilitÃ  della barra degli strumenti principale nella finestra "
-"corrente"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+#, fuzzy
+msgid "Context Menu"
+msgstr "Contenuti"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr "Chiudi"
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "_Nuovo"
 
-#: data/ui/glabels-ui.xml.h:23
-msgid "Close the current file"
-msgstr "Chiudi il file corrente"
+#: ../src/ui.c:117
+#, fuzzy
+msgid "Create a new file"
+msgstr "Crea un nuovo documento"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr "Configura l'applicazione"
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "_Apri..."
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
-msgstr "Contenuti"
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "Apri un file"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr "Copia"
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "_Salva"
 
-#: data/ui/glabels-ui.xml.h:27
-msgid "Copy the selection"
-msgstr "Copia la selezione"
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "Salva il file corrente"
 
-#: data/ui/glabels-ui.xml.h:28
-msgid "Create a custom template"
-msgstr "Crea un modello personalizzato"
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "Salva _con nome..."
 
-#: data/ui/glabels-ui.xml.h:29
-msgid "Create a new document"
-msgstr "Crea un nuovo documento"
+#: ../src/ui.c:138
+#, fuzzy
+msgid "Save the current file to a different name"
+msgstr "Salva il file corrente con un nome differente"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "Crea oggetto codice a barre"
+#: ../src/ui.c:143
+msgid "_Print..."
+msgstr "Stampa..."
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "Crea oggetto area/rettangolo"
+#: ../src/ui.c:145
+msgid "Print the current file"
+msgstr "Stampa il file corrente"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "Crea oggetto ellisse/cerchio"
+#: ../src/ui.c:150
+#, fuzzy
+msgid "Properties..."
+msgstr "Proprie_tÃ ..."
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "Crea oggetto immagine"
+#: ../src/ui.c:152
+msgid "Modify document properties"
+msgstr "Modifica le proprietÃ  del documento"
 
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
-msgstr "Crea oggetto linea"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "Crea oggeto testo"
+#: ../src/ui.c:159
+msgid "Create a custom template"
+msgstr "Crea un modello personalizzato"
 
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
-msgstr "_Taglia"
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "_Chiudi"
 
-#: data/ui/glabels-ui.xml.h:37
-msgid "Customize"
-msgstr "Personalizza"
+#: ../src/ui.c:166
+msgid "Close the current file"
+msgstr "Chiudi il file corrente"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
-msgstr "Personalizza la barra degli strumenti di disegno"
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "_Esci"
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
-msgstr "Personalizza la barra degli strumenti principale"
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "Esci dal programma"
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
-msgstr "Personalizza barra degli strumenti proprietÃ "
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "Annulla"
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
-msgstr "PersonalizzaÂ·leÂ·barre degli strumenti"
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr "Ripeti"
 
-#: data/ui/glabels-ui.xml.h:42
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Taglia"
 
-#: data/ui/glabels-ui.xml.h:43
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Taglia la selezione"
 
-#: data/ui/glabels-ui.xml.h:44
-msgid "Decrease magnification"
-msgstr "Decrementa ingrandimento"
+#: ../src/ui.c:201
+msgid "Copy"
+msgstr "Copia"
 
-#: data/ui/glabels-ui.xml.h:45
-msgid "Delete"
-msgstr "Cancella"
+#: ../src/ui.c:203
+msgid "Copy the selection"
+msgstr "Copia la selezione"
+
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
+msgstr "Incolla gli appunti"
 
-#: data/ui/glabels-ui.xml.h:46
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Cancella gli oggetti selezionati"
 
-#: data/ui/glabels-ui.xml.h:47
-msgid "Drawing toolbar"
-msgstr "Barra degli strumenti di disegno"
-
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
-msgstr "Scarica XML"
-
-#: data/ui/glabels-ui.xml.h:49
-msgid "Dump the UI Xml description"
-msgstr ""
-
-#: data/ui/glabels-ui.xml.h:50
-msgid "Edit merge properties"
-msgstr "Modifica proprietÃ  di unione"
+#: ../src/ui.c:222
+msgid "Select All"
+msgstr "Seleziona tutto"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
-msgstr "Capovolgi oggetto orizzontalmente"
+#: ../src/ui.c:224
+msgid "Select all objects"
+msgstr "Seleziona tutti gli oggetti"
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
-msgstr "Capovolgi oggetto verticalmente"
+#: ../src/ui.c:229
+msgid "Un-select All"
+msgstr "DeselezionaÂ·tutto"
 
-#: data/ui/glabels-ui.xml.h:56
-msgid "Font name"
-msgstr "Nome font"
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "Rimuovi tutte le selezioni"
 
-#: data/ui/glabels-ui.xml.h:57
-msgid "Font selector"
-msgstr "Selettore font"
+#: ../src/ui.c:236
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: data/ui/glabels-ui.xml.h:58
-msgid "Font size"
-msgstr "DimesioneÂ·font"
+#: ../src/ui.c:238
+msgid "Configure the application"
+msgstr "Configura l'applicazione"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
-msgstr "Icone e _Testo"
+#: ../src/ui.c:245
+#, fuzzy
+msgid "Zoom in"
+msgstr "Zoom _in avanti"
 
-#: data/ui/glabels-ui.xml.h:60
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "Incrementa ingradimento"
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
-msgstr "Corsivo"
+#: ../src/ui.c:252
+#, fuzzy
+msgid "Zoom out"
+msgstr "Zo_om indietro"
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
-msgstr "AllineaÂ·aÂ·sinistra"
+#: ../src/ui.c:254
+msgid "Decrease magnification"
+msgstr "Decrementa ingrandimento"
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
-msgstr "Larghezza linea"
+#: ../src/ui.c:259
+#, fuzzy
+msgid "Zoom 1 to 1"
+msgstr "Zoom _1:1"
 
-#: data/ui/glabels-ui.xml.h:66
-msgid "Lower object to bottom"
-msgstr ""
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
+msgstr "Ripristina la scala al 100%"
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
-msgstr ""
+#: ../src/ui.c:266
+#, fuzzy
+msgid "Zoom to fit"
+msgstr "Adatta"
 
-#: data/ui/glabels-ui.xml.h:68
-msgid "Main toolbar"
-msgstr "Barra degli strumenti principale"
+#: ../src/ui.c:268
+#, fuzzy
+msgid "Set scale to fit window"
+msgstr "Adatta alla finestra"
 
-#: data/ui/glabels-ui.xml.h:69
-msgid "Markup"
-msgstr "Marcatori"
+#: ../src/ui.c:275
+#, fuzzy
+msgid "Select Mode"
+msgstr "ModalitÃ  di _selezione"
 
-#: data/ui/glabels-ui.xml.h:70
-msgid "Modify document properties"
-msgstr "Modifica le proprietÃ  del documento"
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "Seleziona, muovi e modifica oggetti"
 
-#: data/ui/glabels-ui.xml.h:71
-msgid "New"
-msgstr "Nuovo"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Text"
+msgstr "Testo"
 
-#: data/ui/glabels-ui.xml.h:72
-msgid "Object property editor"
-msgstr "Editor delle proprietÃ  per l'oggetto"
+#: ../src/ui.c:289
+#, fuzzy
+msgid "Box"
+msgstr "_Area"
 
-#: data/ui/glabels-ui.xml.h:73
-msgid "Only show icons in the main toolbar"
-msgstr "Visualizza solo le icone nella barra degli strumenti principale"
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "Crea oggetto area/rettangolo"
 
-#: data/ui/glabels-ui.xml.h:75
-msgid "Open a file"
-msgstr "Apri un file"
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Line"
+msgstr "Linea"
 
-#: data/ui/glabels-ui.xml.h:76
-msgid "Open the glabels manual"
-msgstr "Apri il manuale di glabels"
+#: ../src/ui.c:303
+#, fuzzy
+msgid "Ellipse"
+msgstr "_Ellisse"
 
-#: data/ui/glabels-ui.xml.h:77
-msgid "Paste"
-msgstr "Incolla"
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "Crea oggetto ellisse/cerchio"
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste the clipboard"
-msgstr "Incolla gli appunti"
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
+msgid "Image"
+msgstr "Immagine"
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Pr_eferences..."
-msgstr "Pr_eferenze..."
+#: ../src/ui.c:317
+#, fuzzy
+msgid "Barcode"
+msgstr "_Codice a barre"
 
-#: data/ui/glabels-ui.xml.h:80
-msgid "Preferences"
-msgstr "Preferenze"
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:82
-msgid "Print the current file"
-msgstr "Stampa il file corrente"
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:83
-msgid "Proper_ties..."
-msgstr "Proprie_tÃ ..."
+#: ../src/ui.c:340
+#, fuzzy
+msgid "Rotate object 90 degrees counter-clockwise"
+msgstr "Ruota l'oggetto di 90Â° in verso antiorario"
 
-#: data/ui/glabels-ui.xml.h:84
-msgid "Properties"
-msgstr "ProprietÃ "
+#: ../src/ui.c:347
+#, fuzzy
+msgid "Rotate object 90 degrees clockwise"
+msgstr "Ruota l'oggetto di 90Â° in verso orario"
 
-#: data/ui/glabels-ui.xml.h:85
-msgid "Property toolbar"
-msgstr "ProprietÃ  della barra degli strumenti"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
+msgstr "Capovolgi oggetto orizzontalmente"
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Quit"
-msgstr "Esci"
+#: ../src/ui.c:361
+msgid "Flip object vertically"
+msgstr "Capovolgi oggetto verticalmente"
 
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit the program"
-msgstr "Esci dal programma"
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:88
-msgid "Raise object to top"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:89
-msgid "Recent _Files"
-msgstr "_File Recenti"
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
+msgstr "Allinea gli oggetti nel centro orizzontale"
 
-#: data/ui/glabels-ui.xml.h:90
-msgid "Redo"
-msgstr "Ripeti"
+#: ../src/ui.c:389
+#, fuzzy
+msgid "Align objects to top edges"
+msgstr "Allinea gli oggetti in basso"
 
-#: data/ui/glabels-ui.xml.h:91
-msgid "Redo the undone action"
-msgstr ""
+#: ../src/ui.c:396
+#, fuzzy
+msgid "Align objects to bottom edges"
+msgstr "Allinea gli oggetti in basso"
 
-#: data/ui/glabels-ui.xml.h:92
-msgid "Remove all selections"
-msgstr "Rimuovi tutte le selezioni"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
+msgstr "Allinea gli oggetti al centro verticale"
 
-#: data/ui/glabels-ui.xml.h:94
-#, no-c-format
-msgid "Restore scale to 100%"
-msgstr "Ripristina la scala al 100%"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:95
-msgid "Right align"
-msgstr "Allineamento a destra"
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:98
-msgid "Rotate object 90 clockwise"
-msgstr "Ruota l'oggetto di 90Â° in verso orario"
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "Modifica proprietÃ  di unione"
 
-#: data/ui/glabels-ui.xml.h:99
-msgid "Rotate object 90 counter-clockwise"
-msgstr "Ruota l'oggetto di 90Â° in verso antiorario"
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr "Contenuti"
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Save"
-msgstr "Salva"
+#: ../src/ui.c:433
+#, fuzzy
+msgid "Open glabels manual"
+msgstr "Apri il manuale di glabels"
 
-#: data/ui/glabels-ui.xml.h:101
-msgid "Save As"
-msgstr "Salva con nome"
+#: ../src/ui.c:438
+msgid "About..."
+msgstr "Informazioni..."
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save _As..."
-msgstr "Salva _con nome..."
+#: ../src/ui.c:440
+msgid "About glabels"
+msgstr "Informazioni su glabels"
 
-#: data/ui/glabels-ui.xml.h:103
-msgid "Save the current file"
-msgstr "Salva il file corrente"
+#: ../src/ui.c:450
+msgid "Property toolbar"
+msgstr "ProprietÃ  della barra degli strumenti"
 
-#: data/ui/glabels-ui.xml.h:104
-msgid "Save the current file with a different name"
-msgstr "Salva il file corrente con un nome differente"
+#: ../src/ui.c:452
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr ""
+"Cambia la visibilitÃ  della barra degli strumenti principale nella finestra "
+"corrente"
 
-#: data/ui/glabels-ui.xml.h:105
-msgid "Select All"
-msgstr "Seleziona tutto"
+#: ../src/ui.c:458
+#, fuzzy
+msgid "Grid"
+msgstr "_Griglia"
 
-#: data/ui/glabels-ui.xml.h:106
-msgid "Select _All"
-msgstr "Seleziona tutto"
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr "Cambia la visibilitÃ  della griglia nella finestra corrente"
 
-#: data/ui/glabels-ui.xml.h:107
-msgid "Select all objects"
-msgstr "Seleziona tutti gli oggetti"
+#: ../src/ui.c:466
+msgid "Markup"
+msgstr "Marcatori"
 
-#: data/ui/glabels-ui.xml.h:108
-msgid "Select, move and modify objects"
-msgstr "Seleziona, muovi e modifica oggetti"
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
+msgstr ""
+"Cambia la visibilitÃ  delle linee di demarcazione nella finestra corrente"
 
-#: data/ui/glabels-ui.xml.h:110
-msgid "Set main toolbar button style according to desktop default"
+#: ../src/ui.c:479
+msgid "Main toolbar"
+msgstr "Barra degli strumenti principale"
+
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
+"Cambia la visibilitÃ  della barra degli strumenti principale nella finestra "
+"corrente"
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Show _Tooltips"
-msgstr "Mostra suggerimenti"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
+msgstr "Barra degli strumenti di disegno"
 
-#: data/ui/glabels-ui.xml.h:112
-msgid "Show both icons and texts in the main toolbar"
-msgstr "Mostra icone e testo nella barra degli strumenti principale"
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
+msgstr ""
+"Cambia la visibilitÃ  della barra degli strumenti di disegno nella finestra "
+"corrente"
 
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show tooltips in the drawing toolbar"
-msgstr "Mostra suggerimenti nella barra degli strumenti di disegno"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:114
-msgid "Show tooltips in the main toolbar"
-msgstr "Mostra suggerimenti nella barra degli strumenti principale"
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
+msgstr "Visualizza il file AUTHORS per informazioni aggiuntive."
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show tooltips in the property toolbar"
-msgstr "Mostra suggerimenti nella barra degli strumenti principale"
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
+msgstr "oppure visita http://glabels.sourceforge.net/";
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Template Designer"
-msgstr "Progettazione modelli"
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Template _Designer..."
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Text color"
-msgstr "Colore testo"
+#: ../src/ui-commands.c:1161
+msgid ""
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "U_n-select All"
-msgstr "Deseleziona tutto"
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "glabels"
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Un-select All"
-msgstr "DeselezionaÂ·tutto"
+#: ../src/warning-handler.c:69
+#, fuzzy
+msgid "gLabels Error!"
+msgstr "Preferenze gLabels"
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Undo"
-msgstr "Annulla"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(niente) - gLabels"
 
-#: data/ui/glabels-ui.xml.h:122
-msgid "Undo the last action"
-msgstr "Annulla l'ultima azione"
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(modificato)"
 
-#: data/ui/glabels-ui.xml.h:123
-msgid "Zoom _1:1"
-msgstr "Zoom _1:1"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Zoom _In"
-msgstr "Zoom _in avanti"
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Zoom _Out"
-msgstr "Zo_om indietro"
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
+msgid "xmlParseFile error"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:126
-msgid "Zoom to _fit"
-msgstr "Adatta"
+#: ../src/xml-label.c:274
+msgid "No document root"
+msgstr "Nessun documento radice"
 
-#: data/ui/glabels-ui.xml.h:127
-msgid "Zoom to fit window"
-msgstr "Adatta alla finestra"
+#: ../src/xml-label.c:282
+msgid "Importing from glabels 0.1 format"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:128
-msgid "_About..."
-msgstr "Informazioni..."
+#: ../src/xml-label.c:291
+msgid "Importing from glabels 0.4 format"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:129
-msgid "_Bottoms"
-msgstr "In basso"
+#: ../src/xml-label.c:301
+#, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Close"
-msgstr "_Chiudi"
+#: ../src/xml-label.c:370
+#, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:133
-msgid "_Contents"
-msgstr "_Contenuti"
+#: ../src/xml-label.c:868
+#, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:134
-msgid "_Copy"
-msgstr "_Copia"
+#: ../src/xml-label.c:944
+#, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:135
-msgid "_Create Object"
-msgstr "_Crea Oggetto"
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr "Conversione di errore Utf8."
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Debug"
-msgstr "_Debug"
+#: ../src/xml-label.c:1157
+msgid "Problem saving xml file."
+msgstr "Problema nel salvataggio del file xml"
 
-#: data/ui/glabels-ui.xml.h:138
-msgid "_Desktop Default"
-msgstr "Predefinito del desktop"
+#. Create and append an "Other" entry.
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
+msgid "Other"
+msgstr "Altro"
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Drawing Toolbar"
-msgstr "Barra degli strumenti di disegno"
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
+#, fuzzy
+msgid "User defined"
+msgstr "Inserisci campo unione"
 
-#: data/ui/glabels-ui.xml.h:140
-msgid "_Edit"
-msgstr "_Modifica"
+#: ../libglabels/db.c:665
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_File"
-msgstr "_File"
+#: ../libglabels/db.c:1057
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Grid"
-msgstr "_Griglia"
+#: ../libglabels/db.c:2097
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:144
-msgid "_Help"
-msgstr "_Aiuto"
+#: ../libglabels/db.c:2164
+#, c-format
+msgid "%s full page label"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:145
-msgid "_Icon"
-msgstr "_Icone"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:149
-msgid "_Main Toolbar"
-msgstr "Barra degli stru_menti principale"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d  (%d per foglio)"
 
-#: data/ui/glabels-ui.xml.h:150
-msgid "_Merge Properties..."
-msgstr "ProprietÃ  di unione..."
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr "%d per foglio"
 
-#: data/ui/glabels-ui.xml.h:151
-msgid "_New"
-msgstr "_Nuovo"
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s diametro"
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Objects"
-msgstr "_Oggetti"
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "punti"
 
-#: data/ui/glabels-ui.xml.h:153
-msgid "_Open..."
-msgstr "_Apri..."
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "pollici"
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Paste"
-msgstr "Incolla"
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
 
-#: data/ui/glabels-ui.xml.h:156
-msgid "_Print..."
-msgstr "Stampa..."
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:157
-msgid "_Property Toolbar"
-msgstr "Barra degli strumenti _proprietÃ "
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Quit"
-msgstr "_Esci"
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Save"
-msgstr "_Salva"
+#. This should always be an id, but just in case a name
+#. slips by!
+#: ../libglabels/xml-template.c:244
+#, c-format
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:165
-msgid "_View"
-msgstr "_Visualizza"
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:2 data/glade/object-editor.glade.h:1
-#: data/glade/template-designer.glade.h:5
-msgid "*"
-msgstr "*"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Dimensione pagina predefinita</span>"
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Riempimento</span>"
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
+msgid "Format:"
+msgstr "Formato:"
 
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linea</span>"
+#: ../data/ui/merge-properties-dialog.ui.h:2
+msgid "Location:"
+msgstr "Posizione:"
 
-#: data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Testo</span>"
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "Selezione/anteprima record:"
 
-#: data/glade/prefs-dialog.glade.h:7
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">UnitÃ </span>"
+#: ../data/ui/merge-properties-dialog.ui.h:4
+#, fuzzy
+msgid "Select all"
+msgstr "Seleziona tutto"
 
-#: data/glade/prefs-dialog.glade.h:8 data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "Allineamento:"
+#: ../data/ui/merge-properties-dialog.ui.h:5
+msgid "Source"
+msgstr "Sorgente"
 
-#: data/glade/prefs-dialog.glade.h:9 data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "Colore:"
+#: ../data/ui/merge-properties-dialog.ui.h:6
+#, fuzzy
+msgid "Unselect all"
+msgstr "DeselezionaÂ·tutto"
 
-#: data/glade/prefs-dialog.glade.h:10
-msgid "Font:"
-msgstr "Carattere:"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "ISO A4"
-msgstr "ISO A4"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:12
-msgid "Inches"
-msgstr "Pollici"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "personalizzato"
 
-#: data/glade/prefs-dialog.glade.h:13 data/glade/object-editor.glade.h:19
-msgid "Line Spacing:"
-msgstr "Spaziatura:"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "DimensioniÂ·pagina:"
 
-#: data/glade/prefs-dialog.glade.h:14
-msgid "Locale"
-msgstr "Impostazioni nazionali"
+#: ../data/ui/media-select.ui.h:5
+#, fuzzy
+msgid "Recent"
+msgstr "_File Recenti"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "Millimetri"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Seleziona tutto"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
-msgstr "ProprietÃ  oggetto"
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "Punti"
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "Descrizione:"
 
-#: data/glade/prefs-dialog.glade.h:18
-msgid "Select default properties for new objects."
-msgstr "Seleziona le proprietÃ  predefinite per i nuovi oggetti."
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Dimensioni etichetta:"
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "Layout:"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "Formato:"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "Parte #:"
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
 msgstr ""
 
-#. Most popular (at top of list)
-#: data/glade/prefs-dialog.glade.h:20 data/templates/paper-sizes.xml.h:29
-msgid "US Letter"
-msgstr "USÂ·Letter"
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "Girare"
 
-#: data/glade/prefs-dialog.glade.h:21 data/glade/object-editor.glade.h:29
-#: data/glade/template-designer.glade.h:72
-msgid "Width:"
-msgstr "Larghezza:"
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
 
-#: data/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
+msgid "Alignment:"
+msgstr "Allineamento:"
+
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Angolo:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Checksum"
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
+msgid "Color:"
+msgstr "Colore:"
+
+#: ../data/ui/object-editor.ui.h:9
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Famiglia:"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
+msgid "File:"
+msgstr "File:"
+
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Riempimento"
 
-#: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Altezza:"
 
-#: data/glade/object-editor.glade.h:14
-msgid "Image"
-msgstr "Immagine"
-
-#: data/glade/object-editor.glade.h:15
-msgid "Insert merge field"
-msgstr "Inserisci campo unione"
+#: ../data/ui/object-editor.ui.h:15
+msgid "Key:"
+msgstr "Chiave:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Lunghezza:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "Linea"
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
+msgid "Line Spacing:"
+msgstr "Spaziatura:"
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Letterale:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
-msgstr "Carica immagine"
+#: ../data/ui/object-editor.ui.h:20
+msgid "Opacity:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Posizione"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Ripristina dimensioni immagine"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:23
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Dimensioni"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Stile"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Stile:"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "Larghezza:"
+
+#: ../data/ui/object-editor.ui.h:30
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:32
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "gradi"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "cifre:"
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "formato:"
 
-#: data/glade/template-designer.glade.h:1
-msgid "  "
+#: ../data/ui/prefs-dialog.ui.h:1
+msgid "   "
 msgstr ""
 
-#: data/glade/template-designer.glade.h:2
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "Ripristina dimensioni immagine"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "Font:"
+msgstr "Carattere:"
+
+#: ../data/ui/prefs-dialog.ui.h:7
+msgid "ISO A4"
+msgstr "ISO A4"
+
+#: ../data/ui/prefs-dialog.ui.h:8
+msgid "Inches"
+msgstr "Pollici"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Locale"
+msgstr "Impostazioni nazionali"
+
+#: ../data/ui/prefs-dialog.ui.h:12
+msgid "Millimeters"
+msgstr "Millimetri"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Object defaults"
+msgstr "ProprietÃ  oggetto"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Points"
+msgstr "Punti"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Select default properties for new objects."
+msgstr "Seleziona le proprietÃ  predefinite per i nuovi oggetti."
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Select locale specific behavior."
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr "USÂ·Letter"
+
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Senza nome"
+
+#: ../data/ui/property-bar.ui.h:1
+msgid "Bold"
+msgstr "Grassetto"
+
+#: ../data/ui/property-bar.ui.h:2
+msgid "Center align"
+msgstr "Allineamento centrato"
+
+#: ../data/ui/property-bar.ui.h:7
+msgid "Left align"
+msgstr "AllineaÂ·aÂ·sinistra"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Right align"
+msgstr "Allineamento a destra"
+
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(es., \"Etichette di spedizione,\" \"Biglietti da visita,\" ...)"
 
-#: data/glade/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(es. 8163A)"
 
-#: data/glade/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(es. Avery, Acme, ...)"
 
-#: data/glade/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. raggio esterno:"
 
-#: data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "Raggio:"
 
-#: data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Larghezza:"
 
-#: data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. Altezza:"
 
-#: data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. raggio interno:"
 
-#: data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Margine"
 
-#: data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Margine"
 
-#: data/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "Marca/Produttore:"
 
-#: data/glade/template-designer.glade.h:21
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD (inclusa copertina dei ringraziamenti)"
 
-#: data/glade/template-designer.glade.h:22
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1846,7 +2416,8 @@ msgid ""
 "\n"
 "Otherwise, you may click \"Cancel\" to abandon your design\n"
 "or \"Back\" to continue editing this design."
-msgstr "Congratulazioni!\n"
+msgstr ""
+"Congratulazioni!\n"
 "\n"
 "Hai completato il gLabels Template Designer.\n"
 "Se vuoi salvare il tuo progetto fai clic su \"Applica\".\n"
@@ -1854,23 +2425,19 @@ msgstr "Congratulazioni!\n"
 "In caso contrario, fai clic su \"Cancella\" per abbandonare\n"
 "il tuo progetto o \"Indietro\" per continuare la progettazione."
 
-#: data/glade/template-designer.glade.h:30
-msgid "Design Completed"
-msgstr "Progettazione completata"
-
-#: data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "Distanza dal bordo sinistro (x0):"
 
-#: data/glade/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "Distanza dal bordo in alto (y0):"
 
-#: data/glade/template-designer.glade.h:34
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:35
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1879,549 +2446,1119 @@ msgid ""
 "The second example illustrates when two layouts are needed."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:40
-msgid "Label Size (CD/DVD)"
-msgstr "Dimensione etichetta (CD/DVD)"
-
-#: data/glade/template-designer.glade.h:41
-msgid "Label Size (Round)"
-msgstr "Dimensioni etichetta"
-
-#: data/glade/template-designer.glade.h:42
-msgid "Label or Card Shape"
-msgstr "Forma dell'etichetta o della scheda"
-
-#: data/glade/template-designer.glade.h:43
-msgid "Label or Card Size (Rectangular)"
-msgstr ""
-
-#: data/glade/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "Layout #1"
 
-#: data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "Layout #2"
 
-#: data/glade/template-designer.glade.h:46
-msgid "Layout(s)"
-msgstr "Layout"
-
-#: data/glade/template-designer.glade.h:47
-msgid "Name and Description"
-msgstr "Nome e descrizione"
-
-#: data/glade/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:50
-msgid "Number of Layouts"
-msgstr "Numero di layout"
-
-#: data/glade/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "Numero di layout:"
 
-#: data/glade/template-designer.glade.h:52
-msgid "Page Size"
-msgstr "Dimensione pagina"
-
-#: data/glade/template-designer.glade.h:54
-msgid "Part #:"
-msgstr "Parte #:"
-
-#: data/glade/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:56
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "Per piacere, inserisci le seguenti informazioni."
 
-#: data/glade/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:59
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:60
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:61
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Stampa foglio di prova"
 
-#: data/glade/template-designer.glade.h:62
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:63
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "Rotonda"
 
-#: data/glade/template-designer.glade.h:64
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:66
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:68
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:69
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
 "This dialog will assist you in the creation of a custom gLabels template."
 msgstr ""
 
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "Fascicoli"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "Copies"
+msgstr "Copie"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "Copie:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Merge Control"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+msgid "Options"
+msgstr "Opzioni"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "Fogli:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "da:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "nel 1Â° foglio"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "a:"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "Crea etichette, biglietti da visita e copertine"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "gLabels Designer di etichetta"
+
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "File di progetto di gLabels"
+
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
+
 #. Other ISO A series sizes
-#: data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0"
 
-#: data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1"
 
-#: data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10"
 
-#: data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2"
 
-#: data/templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3"
 
-#: data/templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4"
 
-#: data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5"
 
-#: data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6"
 
-#: data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7"
 
-#: data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8"
 
-#: data/templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9"
 
 #. ISO B series sizes
-#: data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0"
 
-#: data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1"
 
-#: data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10"
 
-#: data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2"
 
-#: data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3"
 
-#: data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4"
 
-#: data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5"
 
-#: data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6"
 
-#: data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7"
 
-#: data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8"
 
-#: data/templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9"
 
-#: data/templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "US Executive"
 
 #. Other US paper sizes
-#: data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "US Legale"
 
+#: ../templates/categories.xml.h:1
+msgid "Any card"
+msgstr ""
+
+#: ../templates/categories.xml.h:2
+#, fuzzy
+msgid "Any label"
+msgstr "Apri etichetta"
+
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:2
-#: data/templates/zweckform-iso-templates.xml.h:2
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
+#, fuzzy
+msgid "Business cards"
+msgstr "Biglietti da visita"
+
+#: ../templates/categories.xml.h:4
+msgid "CD/DVD or other media"
+msgstr ""
+
+#: ../templates/categories.xml.h:5
+msgid "Mailing/shipping products"
+msgstr ""
+
+#: ../templates/categories.xml.h:6
+msgid "Rectangular labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
+#, fuzzy
+msgid "Round labels"
+msgstr "Etichetta con bordi arrotondati"
+
+#: ../templates/categories.xml.h:8
+#, fuzzy
+msgid "Square labels"
+msgstr "Etichette quadrate"
+
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "Etichette di indirizzo"
 
 #. ===================================================================
 #. ============================================================
 #. ===================================================================
-#. ======================================================
-#: data/templates/avery-us-templates.xml.h:4
-#: data/templates/avery-iso-templates.xml.h:4
-#: data/templates/zweckform-iso-templates.xml.h:6
-#: data/templates/misc-us-templates.xml.h:3
-#: data/templates/misc-iso-templates.xml.h:17
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "Biglietti da visita"
 
-#: data/templates/avery-us-templates.xml.h:5
+#. ===================================================================
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
+msgid "CD/DVD Labels"
+msgstr "Etichette CD/DVD"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "Etichette CD/DVD (Etichette Dischi)"
 
-#: data/templates/avery-us-templates.xml.h:6
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:10
 msgid "CD/DVD Labels (Spine Labels)"
 msgstr "Etichette CD/DVD (Etichette dischi)"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr "Etichette per floppy"
 
+#. the LSK labels can be torn in half down the center
+#: ../templates/avery-us-templates.xml.h:14
+#, fuzzy
+msgid "Divider Labels"
+msgstr "Etichette CD"
+
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:10
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+#, fuzzy
+msgid "File Folder Labels"
+msgstr "Pagina piena di etichette"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:12
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "Pagina piena di etichette"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:22
+#, fuzzy
+msgid "ID Labels"
+msgstr "Etichette CD"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:24
+#, fuzzy
+msgid "Index Cards"
+msgstr "Biglietti da visita"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "Etichetta con bordi arrotondati"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:18
+#: ../templates/avery-us-templates.xml.h:30
+msgid "Post cards"
+msgstr ""
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "Etichette con indirizzo del mittente"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
+#, fuzzy
+msgid "Round Labels"
+msgstr "Etichetta con bordi arrotondati"
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "Etichette di spedizione"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "Etichette piccole con bordi arrotondati"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "Etichette quadrate"
 
-#: data/templates/avery-us-templates.xml.h:25
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:42
+msgid "Tent Cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:26
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:4
 msgid "Address labels"
 msgstr "Etichette per indirizzo"
 
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Allround labels"
+msgstr "Etichette piccole con bordi arrotondati"
+
 #. ===============================================================
-#: data/templates/avery-iso-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "CD Booklet"
 msgstr "CD Booklet"
 
 #. ===============================================================
-#: data/templates/avery-iso-templates.xml.h:8
+#: ../templates/avery-iso-templates.xml.h:12
 msgid "CD Inlet"
 msgstr "CD Inlet"
 
-#. ===============================================================
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:10
-#: data/templates/zweckform-iso-templates.xml.h:8
-#: data/templates/misc-us-templates.xml.h:5
-#: data/templates/misc-iso-templates.xml.h:21
-msgid "CD/DVD Labels"
-msgstr "Etichette CD/DVD"
-
-#. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:18
 msgid "Diskette labels"
 msgstr ""
 
 #. ===============================================================
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:14
-#: data/templates/zweckform-iso-templates.xml.h:14
-#: data/templates/misc-iso-templates.xml.h:35
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
 msgstr "Etichette di spedizione"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-iso-templates.xml.h:22
 msgid "Mailing labels"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:18
+#: ../templates/avery-iso-templates.xml.h:24
 msgid "Mini Address Labels"
 msgstr "Etichette Mini-indirizzo"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:20
-msgid "Shipping labels"
-msgstr ""
+#: ../templates/avery-iso-templates.xml.h:26
+#, fuzzy
+msgid "Mini Labels"
+msgstr "Etichette Mini-CD"
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:4
-msgid "Allround Labels"
+#: ../templates/avery-iso-templates.xml.h:28
+msgid "Shipping labels"
 msgstr ""
 
-#. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:10
-msgid "Correction and Cover-up Labels"
+#: ../templates/brother-other-templates.xml.h:1
+msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr ""
 
+#: ../templates/brother-other-templates.xml.h:2
+#, fuzzy
+msgid "Shipping Labels 62mm x 100mm"
+msgstr "Etichette di spedizione"
+
+#.
+#. *********************************************************************
+#. *********************************************************************
+#. 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.
+#.
+#. One difference from typical templates is that the template size is
+#. not the actual media size - it is the size of the printable area,
+#. which is smaller than the media size.  This is because (at least with
+#. the Brother driver) coordinates are relative the corner of this area.
+#.
+#. *********************************************************************
+#. *********************************************************************
+#.
+#: ../templates/brother-other-templates.xml.h:20
+#, fuzzy
+msgid "Standard Address Labels 29mm x 90mm"
+msgstr "Etichette con indirizzo del mittente"
+
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:12
-msgid "Lever Arch File Labels"
+#: ../templates/dymo-other-templates.xml.h:2
+msgid "3.5in Diskette"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:16
-msgid "QSL-Karten Etiketten 70mm x 50,8mm"
-msgstr ""
+#: ../templates/dymo-other-templates.xml.h:6
+#, fuzzy
+msgid "File Folder"
+msgstr "Colore di riempimento"
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:18
-msgid "Rectangular Copier Labels"
+#: ../templates/dymo-other-templates.xml.h:8
+msgid "Hanging Folder"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:20
-#: data/templates/misc-iso-templates.xml.h:44
-msgid "Rectangular Labels"
-msgstr ""
+#: ../templates/dymo-other-templates.xml.h:10
+#, fuzzy
+msgid "Large Address Labels"
+msgstr "Etichette di indirizzo"
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:22
-msgid "Video Labels (back)"
-msgstr ""
+#: ../templates/dymo-other-templates.xml.h:14
+#, fuzzy
+msgid "Shipping Address Labels"
+msgstr "Etichette Mini-indirizzo"
 
-#: data/templates/misc-us-templates.xml.h:1
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:2
 msgid "Business Card CD"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:4
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
 msgid "CD Template Rectangles"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:6
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
 msgid "CD/DVD Labels (Face Only)"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:7
-#: data/templates/misc-iso-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "CD/DVD Labels (face only)"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:9
+#: ../templates/misc-us-templates.xml.h:14
 msgid "Cassette Labels"
 msgstr "Etichette per cassette"
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:11
+#: ../templates/misc-us-templates.xml.h:16
 msgid "DLT Labels"
 msgstr "Etichette DLT"
 
 #. ===================================================================
-#: data/templates/misc-us-templates.xml.h:13
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "CD Booklet"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:14
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr "Etichette Mini-CD"
 
-#: data/templates/misc-us-templates.xml.h:15
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:16
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:17
-#: data/templates/misc-iso-templates.xml.h:42
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:18
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:19
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:1
-msgid "Agipa 119488: Business Cards"
-msgstr "Agipa 119488: biglietti da visita"
-
-#. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:3
-msgid "Allround Labels --24"
-msgstr ""
-
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:5
-msgid "Allround Labels --44"
-msgstr ""
-
-#. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:7
-msgid "Allround Labels --64"
-msgstr ""
-
-#. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:9
-msgid "Allround Labels --65"
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
+msgid "Allround Labels"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:11
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:13
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:15
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:19
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "Etichette CD"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:25
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:27
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:29
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "EPSON Photo Stickers 16"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:31
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:33
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:37
-msgid "Mailing Labels --14"
+#: ../templates/misc-iso-templates.xml.h:30
+#, fuzzy
+msgid "General Labels"
+msgstr "Etichette di spedizione"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:32
+msgid "Inkjet/Laser Labels 70x37mm"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:39
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:41
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
+msgid "Rectangular Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "Etichette Mini-indirizzo"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "Etichette video (solo frontespizio)"
 
-#: data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "Crea etichette, biglietti da visita e copertine"
+#. ===================================================================
+#: ../templates/misc-other-templates.xml.h:2
+#, fuzzy
+msgid "Multi-Purpose Labels"
+msgstr "Etichette quadrate"
 
-#: data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "gLabels Designer di etichetta"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Etichette di indirizzo"
 
-#: data/mime/glabels.keys.in.h:1 data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "File di progetto di gLabels"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Informazioni su glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Biglietti da visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Biglietti da visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Biglietti da visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Biglietti da visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+msgid "Floppy disk labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Biglietti da visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Etichette"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Etichette"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Etichette"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Informazioni su glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "Etichette quadrate"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Self-adhesive labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:12
+#, fuzzy
+msgid "File Back Labels"
+msgstr "Pagina piena di etichette"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:14
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:18
+msgid "Multi-purpose Stick+Lift Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:20
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:22
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:26
+msgid "Video Labels (back)"
+msgstr ""
+
+#~ msgid "Could not initialize Bonobo!\n"
+#~ msgstr "Non Ã¨ possibile inizializzare Bonobo!\n"
+
+#~ msgid "print this message"
+#~ msgstr "stampa questo messaggio"
+
+#~ msgid "print the version of glabels-batch being used"
+#~ msgstr "stampa la versione di glabels batch utilizzata"
+
+#~ msgid "[OPTION...] GLABELS_FILE..."
+#~ msgstr "[OPTION...] GLABELS_FILE..."
+
+#~ msgid "missing glabels file\n"
+#~ msgstr "file di glabels mancante\n"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Media Type"
+#~ msgstr "Tipo media"
+
+#~ msgid "Open"
+#~ msgstr "Apri"
+
+#~ msgid "Align _Horizontally"
+#~ msgstr "Allineamento _orizzontale"
+
+#~ msgid "Align _Vertically"
+#~ msgstr "Allineamento _verticale"
+
+#~ msgid "_Delete"
+#~ msgstr "Cancella"
+
+#~ msgid "Print"
+#~ msgstr "Stampa"
+
+#~ msgid "_Job"
+#~ msgstr "Lavoro"
+
+#~ msgid "P_rinter"
+#~ msgstr "Stampante"
+
+#~ msgid "Print preview"
+#~ msgstr "Anteprima di stampa"
+
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s diametro"
+
+#~ msgid "Choose Custom Color"
+#~ msgstr "Scegli colore personalizzato"
+
+#~ msgid "dark green #2"
+#~ msgstr "verde scuro #2"
+
+#~ msgid "red"
+#~ msgstr "rosso"
+
+#~ msgid "lime"
+#~ msgstr "tiglio"
+
+#~ msgid "gray"
+#~ msgstr "grigio"
+
+#~ msgid "light blue"
+#~ msgstr "blu chiaro"
+
+#~ msgid "No paper files found!"
+#~ msgstr "Nessun file paper trovato!"
+
+#~ msgid "Close"
+#~ msgstr "Chiudi"
+
+#~ msgid "Cu_t"
+#~ msgstr "_Taglia"
+
+#~ msgid "Customize"
+#~ msgstr "Personalizza"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "PersonalizzaÂ·leÂ·barre degli strumenti"
+
+#~ msgid "Dump XML"
+#~ msgstr "Scarica XML"
+
+#~ msgid "Font selector"
+#~ msgstr "Selettore font"
+
+#~ msgid "Icon and _Text"
+#~ msgstr "Icone e _Testo"
+
+#~ msgid "New"
+#~ msgstr "Nuovo"
+
+#~ msgid "Object property editor"
+#~ msgstr "Editor delle proprietÃ  per l'oggetto"
+
+#~ msgid "Only show icons in the main toolbar"
+#~ msgstr "Visualizza solo le icone nella barra degli strumenti principale"
+
+#~ msgid "Pr_eferences..."
+#~ msgstr "Pr_eferenze..."
+
+#~ msgid "Properties"
+#~ msgstr "ProprietÃ "
+
+#~ msgid "Quit"
+#~ msgstr "Esci"
+
+#~ msgid "Save"
+#~ msgstr "Salva"
+
+#~ msgid "Save As"
+#~ msgstr "Salva con nome"
+
+#~ msgid "Select _All"
+#~ msgstr "Seleziona tutto"
+
+#~ msgid "Show _Tooltips"
+#~ msgstr "Mostra suggerimenti"
+
+#~ msgid "Show both icons and texts in the main toolbar"
+#~ msgstr "Mostra icone e testo nella barra degli strumenti principale"
+
+#~ msgid "Show tooltips in the drawing toolbar"
+#~ msgstr "Mostra suggerimenti nella barra degli strumenti di disegno"
+
+#~ msgid "Show tooltips in the main toolbar"
+#~ msgstr "Mostra suggerimenti nella barra degli strumenti principale"
+
+#~ msgid "Show tooltips in the property toolbar"
+#~ msgstr "Mostra suggerimenti nella barra degli strumenti principale"
+
+#~ msgid "Template Designer"
+#~ msgstr "Progettazione modelli"
+
+#~ msgid "U_n-select All"
+#~ msgstr "Deseleziona tutto"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Annulla l'ultima azione"
+
+#~ msgid "_About..."
+#~ msgstr "Informazioni..."
+
+#~ msgid "_Bottoms"
+#~ msgstr "In basso"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contenuti"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copia"
+
+#~ msgid "_Create Object"
+#~ msgstr "_Crea Oggetto"
+
+#~ msgid "_Debug"
+#~ msgstr "_Debug"
+
+#~ msgid "_Desktop Default"
+#~ msgstr "Predefinito del desktop"
+
+#~ msgid "_Drawing Toolbar"
+#~ msgstr "Barra degli strumenti di disegno"
+
+#~ msgid "_Icon"
+#~ msgstr "_Icone"
+
+#~ msgid "_Main Toolbar"
+#~ msgstr "Barra degli stru_menti principale"
+
+#~ msgid "_Merge Properties..."
+#~ msgstr "ProprietÃ  di unione..."
+
+#~ msgid "_Paste"
+#~ msgstr "Incolla"
+
+#~ msgid "_Property Toolbar"
+#~ msgstr "Barra degli strumenti _proprietÃ "
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Dimensione pagina predefinita</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Riempimento</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Linea</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Testo</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">UnitÃ </span>"
+
+#~ msgid "Load image"
+#~ msgstr "Carica immagine"
 
+#~ msgid "Agipa 119488: Business Cards"
+#~ msgstr "Agipa 119488: biglietti da visita"
diff --git a/po/ja.po b/po/ja.po
index 4eef5f1..3591f48 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels glabels_2_2\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2010-05-21 02:24+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-05-11 23:01+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi aihana gmail com>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -14,188 +14,1364 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/glabels.c:75 ../src/glabels-batch.c:71
-msgid "[FILE...]"
-msgstr "[FILE...]"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (ä½?ã?§ã??)"
 
-#: ../src/glabels.c:91
-msgid "- gLabels label designer"
-msgstr "- gLabels ã?©ã??ã?«ã?»ã??ã?¶ã?¤ã??"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (ZIP ã?®ã?¿)"
 
-#: ../src/glabels-batch.c:55
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP+4)"
+
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
+
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (ä½?ã?§ã??)"
+
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
+
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
+
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
+
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
+
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
+
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
+
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A ã?¾ã??ã?¯ UPC-E)"
+
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
+
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
+
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
+
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
+
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
+
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
+
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
+
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
+
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Code 128C"
+
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Code 128B"
+
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "ç¶´ã??è¾¼ã?¿ 2/5"
+
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
+
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
+
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "è²¼ã??ä»?ã??"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "ã??ã?¼ã?³ã?¼ã??"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "å??é?¤"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
+msgstr "ã??ã??ã?©ã?«ã??"
+
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "æ??ã??èµ¤"
+
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
+
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
+
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "æ??ã??ç·?"
+
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
+
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
+
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "æ??ã??é??"
+
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "èµ¤"
+
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "æ©?"
+
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
+
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "ã??ã??ã??ã? ç·?"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
+
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "é??"
+
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "ç´«"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
+
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "é??"
+
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "é»?"
+
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "ç·?"
+
+#: ../src/color-combo-menu.c:103
+#, fuzzy
+msgid "Cyan"
+msgstr "ã?·ã?¢ã?³"
+
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "ã?¹ã?«ã?¤ã??ã?«ã?¼"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
+
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "ã??ã?³ã?¯"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
+
+#: ../src/color-combo-menu.c:109
+#, fuzzy
+msgid "Light Yellow"
+msgstr "æ·¡ã??é»?"
+
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "æ·¡ã??ç·?"
+
+#: ../src/color-combo-menu.c:111
+#, fuzzy
+msgid "Light Cyan"
+msgstr "æ·¡ã??ã?·ã?¢ã?³"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:113
+#, fuzzy
+msgid "Thistle"
+msgstr "ç?½"
+
+#: ../src/color-combo-menu.c:115
+#, fuzzy
+msgid "White"
+msgstr "ç?½"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:126
+#, fuzzy
+msgid "Black"
+msgstr "é»?"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+#, fuzzy
+msgid "Custom Color"
+msgstr "ã?«ã?¹ã?¿ã? è?²:"
+
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "ã?«ã?¹ã?¿ã? è?²:"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr "gLabels ã?§è?´å?½ç??ã?ªã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ï¼?"
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "æ?°è¦?ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+msgid "Label properties"
+msgstr "ã?©ã??ã?«ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
+msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
+
+#: ../src/file.c:272 ../src/file.c:562
+msgid "gLabels documents"
+msgstr "gLabels ã?®ã??ã?ã?¥ã?¡ã?³ã??"
+
+#: ../src/file.c:319 ../src/file.c:620
+msgid "Empty file name selection"
+msgstr "ã??ã?¡ã?¤ã?«å??ã?®å?¥å??æ¬?ã??ç©ºã?§ã??"
+
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
+msgstr "æ?¢å?ã?®ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã??ã??ã??ã?¾ã??ã?¯æ£ã??ã??ã??ã?¡ã?¤ã?«å??ã??æ??å®?ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../src/file.c:335
+msgid "File does not exist"
+msgstr "ã??ã?¡ã?¤ã?«ã??ã??ã??ã?¾ã??ã??ã??"
+
+#: ../src/file.c:410
+#, c-format
+msgid "Could not open file \"%s\""
+msgstr "ã??ã?¡ã?¤ã?« \"%s\" ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../src/file.c:413
+msgid "Not a supported file format"
+msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã??ã?¡ã?¤ã?«å½¢å¼?ã?§ã??ã??"
+
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
+msgid "Could not save file \"%s\""
+msgstr "ã??ã?¡ã?¤ã?« \"%s\" ã??ä¿?å?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
+msgstr "ã??ã?¼ã?¿ä¿?å?ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??ã??ã?¼ã?¿ã?¯ã?¾ã? ä¿?å?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
+
+#: ../src/file.c:535
+#, c-format
+msgid "Save \"%s\" as"
+msgstr "\"%s\" ã?«å??å??ã??ä»?ã??ã?¦ä¿?å?"
+
+#: ../src/file.c:623
+msgid "Please supply a valid file name"
+msgstr "æ£ã??ã??ã??ã?¡ã?¤ã?«å??ã??æ??å®?ã??ã?¦ä¸?ã??ã??"
+
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
+msgstr "ã??ã?¡ã?¤ã?« \"%s\" ã?«ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
+
+#: ../src/file.c:648
+msgid "File already exists."
+msgstr "ã??ã?¡ã?¤ã?«ã??æ?¢ã?«å?å?¨ã??ã?¾ã??ã??"
+
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
+msgstr "çµ?äº?ã??ã??å??ã?«ã??ã?ã?¥ã?¡ã?³ã?? \"%s\" ã?«å¯¾ã??ã??å¤?æ?´ç?¹ã??ä¿?å?ã??ã?¾ã??ã??ï¼?"
+
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
+msgstr "ä¿?å?ã??ã?ªã??ã?¨å¤?æ?´ã??ã??ã??ã?¼ã?¿ã??å¤±ã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??"
+
+#: ../src/file.c:751
+msgid "Close without saving"
+msgstr "ä¿?å?ã??ã??ã?«é??ã??ã??"
+
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??"
+
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
+
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
+
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "å?ºå??ã??ã??ã??ã?¡ã?¤ã?«å??ã??æ??å®?ã??ã?? (ã??ã??ã?©ã?«ã?? = \"output.pdf\")"
 
-#: ../src/glabels-batch.c:55 ../src/glabels-batch.c:69
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "ã??ã?¡ã?¤ã?«å??"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "ç?¨ç´?ã?®æ?° (ã??ã??ã?©ã?«ã?? = 1)"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "ç?¨ç´?ã?®æ?°"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "ã?³ã??ã?¼ã?®æ?° (ã??ã??ã?©ã?«ã?? = 1)"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "ã?³ã??ã?¼ã?®æ?°"
 
-#: ../src/glabels-batch.c:61
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "æ??å??ã?®ã?·ã?¼ã??ã?§æ??å??ã?®ã?©ã??ã?« (ã??ã??ã?©ã?«ã?? = 1)"
 
-#: ../src/glabels-batch.c:61
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "first"
 
-#: ../src/glabels-batch.c:63 ../data/glade/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "ã?¢ã?¦ã??ã?©ã?¤ã?³ã??å?°å?·ã??ã?? (å?°å?·æ??ã?®é??ç½®ã??ç¢ºèª?ã??ã??ã??ã??)"
 
-#: ../src/glabels-batch.c:65 ../data/glade/print-custom-widget.glade.h:5
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "(ç?»å??ã??ã??ã?©ã?¼ã??ã??ã??ã??ã?«) å??è»¢ã??ã?¦å?°å?·ã??ã??"
 
-#: ../src/glabels-batch.c:67 ../data/glade/print-custom-widget.glade.h:4
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "ç«¯ã?®ã??ã?¼ã?¯ã??æ??ã??ã?¦å?°å?·ã??ã??"
 
-#: ../src/glabels-batch.c:69
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "ã??ã?¡ã?¤ã?«ã??ã??ã?¼ã?¸ã??ã??"
 
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[FILE...]"
+
 #: ../src/glabels-batch.c:99
-msgid "- batch process gLabels label files"
-msgstr "- gLabels ã?®ã?©ã??ã?«ã?»ã??ã?¡ã?¤ã?«ã??ã??ã??ã??å?¦ç??ã??ã??"
+msgid "Print files created with gLabels."
+msgstr ""
+
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
 
-#: ../src/glabels-batch.c:145
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "gLabels ã??ã?¡ã?¤ã?« %s ã?¨ã??ã?ã?¥ã?¡ã?³ã??ã??çµ?å??ã?§ã??ã?¾ã??ã??\n"
 
-#: ../src/glabels-batch.c:167
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "gLabels ã?®ã??ã?¡ã?¤ã?« %s ã??é??ã??ã?¾ã??ã??\n"
 
-#: ../src/window.c:259
-msgid "(none) - gLabels"
-msgstr "(ã?ªã??) - gLabels"
+#: ../src/glabels.c:81
+#, fuzzy
+msgid "Launch gLabels label and business card designer."
+msgstr "ã?©ã??ã?«ã?¨å??å?ºã??ã??ã?¶ã?¤ã?³ã??ã??ã??ã?ã?°ã?©ã? ã?§ã??ã??\n"
 
-#: ../src/window.c:432
-msgid "(modified)"
-msgstr "(å¤?æ?´æ¸?ã?¿)"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/stock.c:72
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??ç©ºã?§ã??"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??ç©ºã?§ã??"
+
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "æ??å?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "è?²ã?§å¡?ã??ã?¤ã?¶ã??ã?¾ã??"
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "ç·?ã?®è?²ã??é?¸æ??ã??ã?¾ã??"
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "ç·?å¹?"
+
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
+
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "ã??ã?ã??ã??ã?£ã?®çµ?å??"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "å??é?¤"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "å??é?¢ã?«æ??ã?£ã?¦ã??ã??"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr "å¾?ã??ã?«ã?¾ã??ã??(_B)"
+
+#: ../src/label.c:1307
+msgid "Rotate"
+msgstr "å??è»¢ã??ã??ã??"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "å·¦ã?«å??è»¢ã??ã??"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "å?³ã?«å??è»¢ã??ã??"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "æ°´å¹³æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "å·¦å¯?ã??"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "å?³å¯?ã??"
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "ä¸å¤®å¯?ã?? (æ°´å¹³æ?¹å??)"
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr "ä¸?å¯?ã??"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "ä¸?å¯?ã??"
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "ä¸å¤®å¯?ã?? (å??ç?´æ?¹å??)"
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "æ°´å¹³ç§»å??"
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "å??ç?´ç§»å??"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "è²¼ã??ä»?ã??"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "ç?¨ç´?ã?®å¤§ã??ã??:"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "å½±"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "å½±"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "å½±"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "å½±"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "æ??å?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
+
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "ã??ã?³ã?¯"
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "ã??ã?©ã?³ã??å??"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "ã??ã?©ã?³ã??ã?®å¤§ã??ã??"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "å?³ã?«å??è»¢ã??ã??"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "ã?¤ã?¿ã?ªã??ã?¯"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "å·¦å¯?ã??"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "è¡?é??:"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "æ??å?ã?®è?²"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "ã??ã??ã??ã??"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "ã??ã??ã??ã??"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "ã??ã??ã??ã??"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??"
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
+"\"å?¨ã?¦ã?®ã??ã?³ã??ã?¬ã?¼ã??ã??ã??æ¤?ç´¢ã??ã??\" ã?®ã??ã?¼ã?¸ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã??ä¸?ã?¤é?¸æ??ã??ã?¦ã?¿ã?¦"
+"ä¸?ã??ã??ã??"
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr "è¦?ã?¤ã??ã??ã?¾ã??ã??"
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr "å?¥ã?®ã??ã?©ã?³ã??ã??ç?¨ç´?ã?®å¤§ã??ã??ã??ã?¾ã??ã?¯ã?«ã??ã?´ã?ªã??æ??å®?ã??ã?¦ã?¿ã?¦ä¸?ã??ã??ã??"
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??"
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "ã?ªã??"
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr "ã?¯ã?¨ã?ªã??æ§?ç¯?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+msgid "Couldn't open addressbook."
+msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../src/merge-evolution.c:348
+msgid "Couldn't list available fields."
+msgstr "å?©ç?¨å?¯è?½ã?ªé ?å??ã?®ä¸?è¦§ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr "é?£çµ¡å??ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
+
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution ã?¢ã??ã?¬ã?¹å¸³ã?®ã??ã?¼ã?¿"
+
+#: ../src/merge-init.c:125
+#, fuzzy
+msgid "VCards"
+msgstr "ã??ã?³ã??ã?®ã?«ã?¼ã??"
+
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "çµ?å??ã??ã?ã??ã??ã?£"
+
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "çµ?å??ã??ã?¼ã?¿ã??ã?¼ã?¹ã?»ã?½ã?¼ã?¹ã?®é?¸æ??"
+
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "é?¸æ??"
+
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "ã?¬ã?³ã?¼ã??/ã??ã?£ã?¼ã?«ã??"
+
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "ã??ã?¼ã?¿"
+
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+msgid "Fixed"
+msgstr "å?ºå®?"
+
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "é?¸æ??ã?¢ã?¼ã??"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
+
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "ã??ã??ã?©ã?«ã??"
+
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "ç?©å½¢ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "æ¥?å??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "æ??å?ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "çµ?å??ã??ã?£ã?¼ã?«ã??ã?®æ?¿å?¥"
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+#, fuzzy
+msgid "No Fill"
+msgstr "å¡?ã??ã?¤ã?¶ã??ã?ªã??"
+
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
+msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
+
+#: ../src/object-editor-image-page.c:283
+msgid "All Images"
+msgstr "å?¨ã?¦ã?®ç?»å??"
+
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr "%s (*.%s)"
+
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+#, fuzzy
+msgid "No Line"
+msgstr "ç·?ã??æ¶?ã??"
+
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "gLabels ã?®è¨å®?"
+
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "ã?©ã??ã?«"
+
+#: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr "é?¸æ??ã?¢ã?¼ã??(_S)"
 
-#: ../src/stock.c:73
+#: ../src/stock.c:71
 msgid "_Text"
 msgstr "æ??å?(_T)"
 
-#: ../src/stock.c:74
+#: ../src/stock.c:72
 msgid "_Line"
 msgstr "ç?´ç·?(_L)"
 
-#: ../src/stock.c:75
+#: ../src/stock.c:73
 msgid "_Box"
 msgstr "ç?©å½¢(_B)"
 
-#: ../src/stock.c:76
+#: ../src/stock.c:74
 msgid "_Ellipse"
 msgstr "æ¥?å??(_E)"
 
-#: ../src/stock.c:77
+#: ../src/stock.c:75
 msgid "_Image"
 msgstr "ç?»å??(_I)"
 
-#: ../src/stock.c:78
+#: ../src/stock.c:76
 msgid "Bar_code"
 msgstr "ã??ã?¼ã?³ã?¼ã??(_C)"
 
-#: ../src/stock.c:79
+#: ../src/stock.c:77
 msgid "_Merge Properties"
 msgstr "çµ?å??ã??ã?ã??ã??ã?£(_M)"
 
-#: ../src/stock.c:80
+#: ../src/stock.c:78
 msgid "Object _Properties"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£(_P)"
 
-#: ../src/stock.c:81
+#: ../src/stock.c:79
 msgid "Bring to _Front"
 msgstr "å??ã?«æ??ã?£ã?¦ã??ã??(_F)"
 
-#: ../src/stock.c:82
+#: ../src/stock.c:80
 msgid "Send to _Back"
 msgstr "å¾?ã??ã?«ã?¾ã??ã??(_B)"
 
-#: ../src/stock.c:83
+#: ../src/stock.c:81
 msgid "Rotate _Left"
 msgstr "å·¦ã?«å??è»¢(_L)"
 
-#: ../src/stock.c:84
+#: ../src/stock.c:82
 msgid "Rotate _Right"
 msgstr "å?³ã?«å??è»¢(_R)"
 
-#: ../src/stock.c:85
+#: ../src/stock.c:83
 msgid "Flip _Horizontally"
 msgstr "æ°´å¹³æ?¹å??ã?«ã??ã?ªã??ã??(_H)"
 
-#: ../src/stock.c:86
+#: ../src/stock.c:84
 msgid "Flip _Vertically"
 msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??(_V)"
 
-#: ../src/stock.c:87
+#: ../src/stock.c:85
 msgid "_Lefts"
 msgstr "å·¦ç«¯(_L)"
 
-#: ../src/stock.c:88
+#: ../src/stock.c:86
 msgid "_Rights"
 msgstr "å?³ç«¯(_R)"
 
-#: ../src/stock.c:89
+#: ../src/stock.c:87
 msgid "_Centers"
 msgstr "ä¸å¤®(_C)"
 
-#: ../src/stock.c:90
+#: ../src/stock.c:88
 msgid "_Tops"
 msgstr "ä¸?ç«¯(_T)"
 
-#: ../src/stock.c:91
+#: ../src/stock.c:89
 msgid "Bottoms"
 msgstr "ä¸?é?¨"
 
-#: ../src/stock.c:92
+#: ../src/stock.c:90
 msgid "Centers"
 msgstr "ä¸å¤®"
 
-#: ../src/stock.c:93 ../src/stock.c:94
+#: ../src/stock.c:91 ../src/stock.c:92
 msgid "Label Ce_nter"
 msgstr "ã?©ã??ã?«ã?®ä¸å¿?(_N)"
 
-#: ../src/stock.c:95 ../data/glade/property-bar.glade.h:3
-msgid "Fill color"
-msgstr "è?²ã?§å¡?ã??ã?¤ã?¶ã??ã?¾ã??"
-
-#: ../src/stock.c:96 ../data/glade/property-bar.glade.h:8
-msgid "Line color"
-msgstr "ç·?ã?®è?²ã??é?¸æ??ã??ã?¾ã??"
-
-#: ../src/stock.c:97 ../src/stock.c:99
+#: ../src/stock.c:95 ../src/stock.c:97
 msgid "Linked"
 msgstr "çµ?å??æ¸?"
 
-#: ../src/stock.c:98 ../src/stock.c:100
+#: ../src/stock.c:96 ../src/stock.c:98
 msgid "Not Linked"
 msgstr "çµ?å??ã?ªã??"
 
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "gLabels ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¶ã?¤ã??"
+
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr "ã??ã??ã??ã??"
+
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "å??å??ã?¨èª¬æ??"
+
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "ç?¨ç´?ã?®å¤§ã??ã??"
+
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å½¢ç?¶"
+
+#: ../src/template-designer.c:661
+msgid "Label or Card Size"
+msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å¤§ã??ã??"
+
+#: ../src/template-designer.c:760
+msgid "Label Size (round)"
+msgstr "ã?©ã??ã?«ã?®å¤§ã??ã?? (å??)"
+
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "ã?©ã??ã?«ã?®å¤§ã??ã?? (CD/DVD)"
+
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "ã?¬ã?¤ã?¢ã?¦ã??ã?®æ?°"
+
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "ã?¬ã?¤ã?¢ã?¦ã??"
+
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "ã??ã?¶ã?¤ã?³ã??å®?äº?ã??ã?¾ã??ã??"
+
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "gLabels ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¶ã?¤ã??"
+
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
+msgstr ""
+"<span foreground='red' weight='bold'>ã??ã?©ã?³ã??/è£½é? å??ã?¨ã??ã?¼ã??ç?ªå?·ã??æ?¢å?ã?®ã??ã?³"
+"ã??ã?¬ã?¼ã??ã?¨å??ã??ã?§ã??ï¼?</span>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -330,393 +1506,287 @@ msgstr "çµ?äº?(_Q)"
 msgid "Quit the program"
 msgstr "gLabels ã??çµ?äº?ã??ã?¾ã??"
 
-#: ../src/ui.c:180
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr ""
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr ""
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "å??ã??å??ã??"
 
-#: ../src/ui.c:182
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "é?¸æ??ç¯?å?²ã??å??ã??å??ã??ã?¾ã??"
 
-#: ../src/ui.c:187
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr "ã?³ã??ã?¼"
 
-#: ../src/ui.c:189
+#: ../src/ui.c:203
 msgid "Copy the selection"
 msgstr "é?¸æ??ç¯?å?²ã??ã?³ã??ã?¼ã??ã?¾ã??"
 
-#: ../src/ui.c:194
-msgid "Paste"
-msgstr "è²¼ã??ä»?ã??"
-
-#: ../src/ui.c:196
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?®å??å®¹ã??è²¼ã??ä»?ã??ã?¾ã??"
 
-#: ../src/ui.c:201
-msgid "Delete"
-msgstr "å??é?¤"
-
-#: ../src/ui.c:203
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "é?¸æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å??é?¤ã??ã?¾ã??"
 
-#: ../src/ui.c:208
+#: ../src/ui.c:222
 msgid "Select All"
 msgstr "å?¨ã?¦é?¸æ??"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:224
 msgid "Select all objects"
 msgstr "å?¨ã?¦ã?®ã?ªã??ã?¸ã?§ã?¯ã??ã??é?¸æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:215
+#: ../src/ui.c:229
 msgid "Un-select All"
 msgstr "å?¨ã?¦é?¸æ??è§£é?¤"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "é?¸æ??ç¯?å?²ã??è§£é?¤ã??ã?¾ã??"
 
-#: ../src/ui.c:222
+#: ../src/ui.c:236
 msgid "Preferences"
 msgstr "gLabels ã?®è¨å®?"
 
-#: ../src/ui.c:224
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr "gLabels ã?®è¨å®?ã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:231
+#: ../src/ui.c:245
 msgid "Zoom in"
 msgstr "æ?¡å¤§"
 
-#: ../src/ui.c:233
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "æ?¡å¤§ç??ã??ä¸?ã??ã?¾ã??"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:252
 msgid "Zoom out"
 msgstr "ç¸®å°?"
 
-#: ../src/ui.c:240
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr "æ?¡å¤§ç??ã??ä¸?ã??ã?¾ã??"
 
-#: ../src/ui.c:245
+#: ../src/ui.c:259
 msgid "Zoom 1 to 1"
 msgstr "æ?¡å¤§ç?? 1:1"
 
-#: ../src/ui.c:247
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr "æ?¡å¤§ç??ã?? 100% ã?«æ?»ã??ã?¾ã??"
 
-#: ../src/ui.c:252
+#: ../src/ui.c:266
 msgid "Zoom to fit"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã??ã??ã??"
 
-#: ../src/ui.c:254
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã?®å¤§ã??ã??ã?«å??ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:261
+#: ../src/ui.c:275
 msgid "Select Mode"
 msgstr "é?¸æ??ã?¢ã?¼ã??"
 
-#: ../src/ui.c:263
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®é?¸æ??ã??ç§»å??ã??ç·¨é??ã??è¡?ã??ã?¾ã??"
 
-#: ../src/ui.c:268 ../src/view-text.c:495
-#: ../data/glade/object-editor.glade.h:32
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "æ??å?"
 
-#: ../src/ui.c:270
-msgid "Create text object"
-msgstr "æ??å?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
-
-#: ../src/ui.c:275
+#: ../src/ui.c:289
 msgid "Box"
 msgstr "ç?©å½¢"
 
-#: ../src/ui.c:277
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr "å??è§?/ä¸?è§?ã?®ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:282 ../data/glade/object-editor.glade.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "ç?´ç·?"
 
-#: ../src/ui.c:284
-msgid "Create line object"
-msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
-
-#: ../src/ui.c:289
+#: ../src/ui.c:303
 msgid "Ellipse"
 msgstr "æ¥?å??"
 
-#: ../src/ui.c:291
+#: ../src/ui.c:305
 msgid "Create ellipse/circle object"
 msgstr "æ¥?å??/å??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:296 ../data/glade/object-editor.glade.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "ç?»å??"
 
-#: ../src/ui.c:298
-msgid "Create image object"
-msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
-
-#: ../src/ui.c:303
+#: ../src/ui.c:317
 msgid "Barcode"
 msgstr "ã??ã?¼ã?³ã?¼ã??"
 
-#: ../src/ui.c:305
-msgid "Create barcode object"
-msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
-
-#: ../src/ui.c:310
-msgid "Bring to front"
-msgstr "å??é?¢ã?«æ??ã?£ã?¦ã??ã??"
-
-#: ../src/ui.c:312
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??é?¢ã?«æ??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../src/ui.c:317
-msgid "Send to back"
-msgstr "å¾?ã??ã?«ã?¾ã??ã??(_B)"
-
-#: ../src/ui.c:319
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å¾?ã??ã?«ã?¾ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:324
-msgid "Rotate left"
-msgstr "å·¦ã?«å??è»¢ã??ã??"
-
-#: ../src/ui.c:326
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??æ??è¨?å??ã??ã?« 90Â°å??è»¢ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:331
-msgid "Rotate right"
-msgstr "å?³ã?«å??è»¢ã??ã??"
-
-#: ../src/ui.c:333
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??æ??è¨?å??ã??ã?« 90Â°å??è»¢ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:338
-msgid "Flip horizontally"
-msgstr "æ°´å¹³æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
-
-#: ../src/ui.c:340
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??æ°´å¹³æ?¹å??ã?«ã?²ã?£ã??ã??è¿?ã??ã?¾ã??"
 
-#: ../src/ui.c:345
-msgid "Flip vertically"
-msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
-
-#: ../src/ui.c:347
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??ç?´æ?¹å??ã?«ã?²ã?£ã??ã??è¿?ã??ã?¾ã??"
 
-#: ../src/ui.c:352
-msgid "Align left"
-msgstr "å·¦å¯?ã??"
-
-#: ../src/ui.c:354
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å·¦ç«¯ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:359
-msgid "Align right"
-msgstr "å?³å¯?ã??"
-
-#: ../src/ui.c:361
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å?³ç«¯ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:366
-msgid "Align horizontal center"
-msgstr "ä¸å¤®å¯?ã?? (æ°´å¹³æ?¹å??)"
-
-#: ../src/ui.c:368
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??æ°´å¹³æ?¹å??ã?®ä¸å¿?ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:373
-msgid "Align tops"
-msgstr "ä¸?å¯?ã??"
-
-#: ../src/ui.c:375
+#: ../src/ui.c:389
 msgid "Align objects to top edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ä¸?ç«¯ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:380
-msgid "Align bottoms"
-msgstr "ä¸?å¯?ã??"
-
-#: ../src/ui.c:382
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ä¸?ç«¯ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:387
-msgid "Align vertical center"
-msgstr "ä¸å¤®å¯?ã?? (å??ç?´æ?¹å??)"
-
-#: ../src/ui.c:389
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??ç?´æ?¹å??ã?®ä¸å¿?ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:394
-msgid "Center horizontally"
-msgstr "æ°´å¹³ç§»å??"
-
-#: ../src/ui.c:396
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ã?©ã??ã?«ã?®ä¸å¿?ã?«æ°´å¹³ç§»å??ã??ã?¾ã??"
 
-#: ../src/ui.c:401
-msgid "Center vertically"
-msgstr "å??ç?´ç§»å??"
-
-#: ../src/ui.c:403
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ã?©ã??ã?«ã?®ä¸å¿?ã?«å??ç?´ç§»å??ã??ã?¾ã??"
 
-#: ../src/ui.c:408
-msgid "Merge properties"
-msgstr "ã??ã?ã??ã??ã?£ã?®çµ?å??"
-
-#: ../src/ui.c:410
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr "çµ?å??ã??ã??ã??ã?ã??ã??ã?£ã??ç·¨é??ã??ã?¾ã??"
 
-#: ../src/ui.c:417
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr "ç?®æ¬¡"
 
-#: ../src/ui.c:419
+#: ../src/ui.c:433
 msgid "Open glabels manual"
 msgstr "gLabels ã?®ã??ã??ã?¥ã?¢ã?«ã??é??ã??ã?¾ã??"
 
-#: ../src/ui.c:424
+#: ../src/ui.c:438
 msgid "About..."
 msgstr "æ??å ±..."
 
-#: ../src/ui.c:426
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr "gLabels ã?«ã?¤ã??ã?¦"
 
-#: ../src/ui.c:436
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr "ã??ã?ã??ã??ã?£ã?®ã??ã?¼ã?«ã??ã?¼"
 
-#: ../src/ui.c:438
+#: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr "ã??ã?ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:444 ../src/ui.c:489 ../src/ui.c:497
-msgid "Show tooltips"
-msgstr "ã??ã?¼ã?«ã??ã??ã??ã?®è¡¨ç¤º"
-
-#: ../src/ui.c:446
-msgid "Show tooltips for property toolbar"
-msgstr "ã??ã?ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??è¡¨ç¤ºã??ã?¾ã??"
-
-#: ../src/ui.c:452
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr "ã?°ã?ªã??ã??"
 
-#: ../src/ui.c:454
+#: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
 msgstr "ã?©ã??ã?«ã?®ã?°ã?ªã??ã?? (æ ¼å?ç·?) ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:460
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr "ã??ã?¼ã?¯ã?¢ã??ã??"
 
-#: ../src/ui.c:462
+#: ../src/ui.c:468
 msgid "Change the visibility of markup lines in the current window"
 msgstr "ã?©ã??ã?«ã?®å¤?æ? ç·?ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:473
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼"
 
-#: ../src/ui.c:475
+#: ../src/ui.c:481
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:481
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤ºæ?¹æ³?"
 
-#: ../src/ui.c:483
+#: ../src/ui.c:489
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤º/é??è¡¨ç¤ºã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:491
-msgid "Show tooltips for main toolbar"
-msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??è¡¨ç¤ºã??ã?¾ã??"
-
-#: ../src/ui.c:499
-msgid "Show tooltips for drawing toolbar"
-msgstr "ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??è¡¨ç¤ºã??ã?¾ã??"
-
-#: ../src/ui-property-bar.c:1232 ../src/object-editor.c:587
-#: ../src/object-editor.c:593
-msgid "Default"
-msgstr "ã??ã??ã?©ã?«ã??"
-
-#: ../src/ui-property-bar.c:1239 ../src/object-editor.c:599
-msgid "No line"
-msgstr "ç·?ã??æ¶?ã??"
-
-#: ../src/ui-property-bar.c:1247 ../src/object-editor.c:606
-msgid "No fill"
-msgstr "å¡?ã??ã?¤ã?¶ã??ã?ªã??"
-
-#: ../src/ui-sidebar.c:152
-msgid "Object properties"
-msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
-
-#: ../src/ui-commands.c:1084
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "gLabels ã?®é??ç?ºã?«è²¢ç?®ã??ã?¦ã??ã??ã??æ?¹ã??:"
 
-#: ../src/ui-commands.c:1090
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr "è£?è¶³ã?®ã?¯ã?¬ã?¸ã??ã??ã?«ã?¤ã??ã?¦ã?¯ AUTHORS ã??ã?¡ã?¤ã?«ã??ã??è¦§ã?«ã?ªã??ã??ã??"
 
-#: ../src/ui-commands.c:1091
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
 msgstr "ã?¾ã??ã?¯ http://glabels.sourceforge.net/ ã??è¨ªã??ã?¦ã?¿ã?¦ä¸?ã??ã??ã??"
 
-#: ../src/ui-commands.c:1103
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr "ã?©ã??ã?«ã?¨å??å?ºã??ã??ã?¶ã?¤ã?³ã??ã??ã??ã?ã?°ã?©ã? ã?§ã??ã??\n"
 
-#: ../src/ui-commands.c:1107
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr ""
 "ç?¸è?± æ¯? <takeshi aihana gmail com>\n"
 "æ?¥æ?¬GNOMEã?¦ã?¼ã?¶ã?¼ä¼? http://www.gnome.gr.jp";
 
-#: ../src/ui-commands.c:1110
+#: ../src/ui-commands.c:1161
+#, fuzzy
 msgid ""
-"Glabels is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
-"the GNU General Public License for more details.\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 msgstr ""
 "gLabels ã?¯ã??ã?ªã?¼ã?½ã??ã??ã?¦ã?§ã?¢ã?§ã??ã??ã??ã?ªã??ã?¡ã??ã??ã?ªã?¼ã?½ã??ã??ã?¦ã?§ã?¢è²¡å?£ã??å®?ã??ã??\n"
 "GNU ä¸?è?¬å?¬è¡?ä½¿ç?¨è¨±è«¾å¥?ç´?æ?¸ã?®ç¬¬2ç??ã??ã??ã??ã?¯ (ã?ªã??ã?·ã?§ã?³ã?§) ã??ã??ä»¥é??ã?®ã??ã?¼ã?¸ã?§ã?³"
@@ -727,744 +1797,90 @@ msgstr ""
 "è²©å£²ç?®ç??ã?¾ã??ã?¯å??ç?¨ç?®ç??ã?®ä¿?è¨¼ã?¯ã??ã??ã?¾ã??ã??ã??\n"
 "è©³ç´°ã?«ã?¤ã??ã?¦ã?¯ GNU ä¸?è?¬å?¬è¡?ä½¿ç?¨è¨±è«¾å¥?ç´?æ?¸ã??ã??è¦§ä¸?ã??ã??ã??\n"
 
-#: ../src/ui-commands.c:1136
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "gLabels"
 
-#: ../src/file.c:91
-msgid "New Label or Card"
-msgstr "æ?°è¦?ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??"
-
-#: ../src/file.c:191
-msgid "Label properties"
-msgstr "ã?©ã??ã?«ã?®ã??ã?ã??ã??ã?£"
-
-#: ../src/file.c:292 ../src/file.c:578
-msgid "All files"
-msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
-
-#: ../src/file.c:297 ../src/file.c:583
-msgid "gLabels documents"
-msgstr "gLabels ã?®ã??ã?ã?¥ã?¡ã?³ã??"
-
-#: ../src/file.c:343 ../src/file.c:640
-msgid "Empty file name selection"
-msgstr "ã??ã?¡ã?¤ã?«å??ã?®å?¥å??æ¬?ã??ç©ºã?§ã??"
-
-#: ../src/file.c:346 ../src/file.c:362
-msgid "Please select a file or supply a valid file name"
-msgstr "æ?¢å?ã?®ã??ã?¡ã?¤ã?«ã??é?¸æ??ã??ã??ã??ã??ã?¾ã??ã?¯æ£ã??ã??ã??ã?¡ã?¤ã?«å??ã??æ??å®?ã??ã?¦ä¸?ã??ã??ã??"
-
-#: ../src/file.c:359
-msgid "File does not exist"
-msgstr "ã??ã?¡ã?¤ã?«ã??ã??ã??ã?¾ã??ã??ã??"
-
-#: ../src/file.c:433
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "ã??ã?¡ã?¤ã?« \"%s\" ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/file.c:436
-msgid "Not a supported file format"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã??ã?¡ã?¤ã?«å½¢å¼?ã?§ã??ã??"
-
-#: ../src/file.c:513 ../src/file.c:690
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "ã??ã?¡ã?¤ã?« \"%s\" ã??ä¿?å?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/file.c:517 ../src/file.c:694
-msgid "Error encountered during save.  The file is still not saved."
-msgstr "ã??ã?¼ã?¿ä¿?å?ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??ã??ã?¼ã?¿ã?¯ã?¾ã? ä¿?å?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
-
-#: ../src/file.c:556
-#, c-format
-msgid "Save \"%s\" as"
-msgstr "\"%s\" ã?«å??å??ã??ä»?ã??ã?¦ä¿?å?"
-
-#: ../src/file.c:643
-msgid "Please supply a valid file name"
-msgstr "æ£ã??ã??ã??ã?¡ã?¤ã?«å??ã??æ??å®?ã??ã?¦ä¸?ã??ã??"
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "gLabels ã?®ã?¨ã?©ã?¼ã?§ã??ï¼?"
 
-#: ../src/file.c:664
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "ã??ã?¡ã?¤ã?« \"%s\" ã?«ä¸?æ?¸ã??ã??ã?¾ã??ã??ï¼?"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(ã?ªã??) - gLabels"
 
-#: ../src/file.c:668
-msgid "File already exists."
-msgstr "ã??ã?¡ã?¤ã?«ã??æ?¢ã?«å?å?¨ã??ã?¾ã??ã??"
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(å¤?æ?´æ¸?ã?¿)"
 
-#: ../src/file.c:764
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "çµ?äº?ã??ã??å??ã?«ã??ã?ã?¥ã?¡ã?³ã?? \"%s\" ã?«å¯¾ã??ã??å¤?æ?´ç?¹ã??ä¿?å?ã??ã?¾ã??ã??ï¼?"
-
-#: ../src/file.c:768
-msgid "Your changes will be lost if you don't save them."
-msgstr "ä¿?å?ã??ã?ªã??ã?¨å¤?æ?´ã??ã??ã??ã?¼ã?¿ã??å¤±ã??ã??ã?¨ã?«ã?ªã??ã?¾ã??ã??"
-
-#: ../src/file.c:771
-msgid "Close without saving"
-msgstr "ä¿?å?ã??ã??ã?«é??ã??ã??"
-
-#. Should not happen
-#: ../src/prefs.c:159 ../src/prefs.c:166
-#: ../data/glade/object-editor.glade.h:43
-#: ../data/glade/prefs-dialog.glade.h:22
-msgid "points"
-msgstr "ã??ã?¤ã?³ã??"
-
-#: ../src/prefs.c:161 ../data/glade/object-editor.glade.h:42
-#: ../data/glade/template-designer.glade.h:64
-msgid "inches"
-msgstr "[ã?¤ã?³ã??]"
-
-#: ../src/prefs.c:163
-msgid "mm"
-msgstr "[ã??ã?ª]"
-
-#: ../src/prefs-dialog.c:162 ../data/glade/prefs-dialog.glade.h:21
-msgid "gLabels Preferences"
-msgstr "gLabels ã?®è¨å®?"
-
-#. Build editor.
-#: ../src/view-box.c:176
-msgid "Box object properties"
-msgstr "ç?©å½¢ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
-
-#. Build editor.
-#: ../src/view-ellipse.c:176
-msgid "Ellipse object properties"
-msgstr "æ¥?å??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
-
-#. Build editor.
-#: ../src/view-line.c:175
-msgid "Line object properties"
-msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
-
-#. Build editor.
-#: ../src/view-image.c:175
-msgid "Image object properties"
-msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
-
-#. Build editor.
-#: ../src/view-text.c:179
-msgid "Text object properties"
-msgstr "æ??å?ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
-
-#. Build editor.
-#: ../src/view-barcode.c:175
-msgid "Barcode object properties"
-msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£"
-
-#: ../src/object-editor-image-page.c:270
-msgid "All Files"
-msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
-
-#: ../src/object-editor-image-page.c:275
-msgid "All Images"
-msgstr "å?¨ã?¦ã?®ç?»å??"
+msgid "Bad root node = \"%s\""
+msgstr "ã??ã??ã??ã?ª root ã?®ã??ã?¼ã?? = \"%s\""
 
-#: ../src/object-editor-image-page.c:290
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/merge-properties-dialog.c:263
-msgid "Merge Properties"
-msgstr "çµ?å??ã??ã?ã??ã??ã?£"
-
-#: ../src/merge-properties-dialog.c:289 ../src/merge-properties-dialog.c:397
-msgid "Select merge-database source"
-msgstr "çµ?å??ã??ã?¼ã?¿ã??ã?¼ã?¹ã?»ã?½ã?¼ã?¹ã?®é?¸æ??"
-
-#: ../src/merge-properties-dialog.c:298 ../src/merge-properties-dialog.c:417
-msgid "N/A"
-msgstr "N/A"
-
-#: ../src/merge-properties-dialog.c:324
-msgid "Select"
-msgstr "é?¸æ??"
-
-#: ../src/merge-properties-dialog.c:332
-msgid "Record/Field"
-msgstr "ã?¬ã?³ã?¼ã??/ã??ã?£ã?¼ã?«ã??"
-
-#: ../src/merge-properties-dialog.c:340 ../data/glade/object-editor.glade.h:10
-msgid "Data"
-msgstr "ã??ã?¼ã?¿"
-
-#: ../src/merge-properties-dialog.c:410
-msgid "Fixed"
-msgstr "å?ºå®?"
-
-#. ===================================================================
-#: ../src/print-op.c:237 ../src/wdgt-print-copies.c:171
-#: ../data/templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "ã?©ã??ã?«"
-
-#: ../src/template-designer.c:358
-msgid "gLabels Template Designer"
-msgstr "gLabels ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¶ã?¤ã??"
-
-#: ../src/template-designer.c:419
-msgid "Welcome"
-msgstr "ã??ã??ã??ã??"
-
-#: ../src/template-designer.c:463
-msgid "Name and Description"
-msgstr "å??å??ã?¨èª¬æ??"
-
-#: ../src/template-designer.c:516
-msgid "Page Size"
-msgstr "ç?¨ç´?ã?®å¤§ã??ã??"
-
-#: ../src/template-designer.c:587
-msgid "Label or Card Shape"
-msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å½¢ç?¶"
-
-#: ../src/template-designer.c:637
-msgid "Label or Card Size"
-msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å¤§ã??ã??"
-
-#: ../src/template-designer.c:737
-msgid "Label Size (round)"
-msgstr "ã?©ã??ã?«ã?®å¤§ã??ã?? (å??)"
-
-#: ../src/template-designer.c:820
-msgid "Label Size (CD/DVD)"
-msgstr "ã?©ã??ã?«ã?®å¤§ã??ã?? (CD/DVD)"
-
-#: ../src/template-designer.c:913
-msgid "Number of Layouts"
-msgstr "ã?¬ã?¤ã?¢ã?¦ã??ã?®æ?°"
-
-#: ../src/template-designer.c:976
-msgid "Layout(s)"
-msgstr "ã?¬ã?¤ã?¢ã?¦ã??"
-
-#: ../src/template-designer.c:1087
-msgid "Design Completed"
-msgstr "ã??ã?¶ã?¤ã?³ã??å®?äº?ã??ã?¾ã??ã??"
-
-#: ../src/template-designer.c:1253
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
-msgstr ""
-"<span foreground='red' weight='bold'>ã??ã?©ã?³ã??/è£½é? å??ã?¨ã??ã?¼ã??ç?ªå?·ã??æ?¢å?ã?®ã??ã?³"
-"ã??ã?¬ã?¼ã??ã?¨å??ã??ã?§ã??ï¼?</span>"
-
-#: ../src/bc.c:67
-msgid "POSTNET (any)"
-msgstr "POSTNET (ä½?ã?§ã??)"
-
-#: ../src/bc.c:70
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (ZIP ã?®ã?¿)"
-
-#: ../src/bc.c:73
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP+4)"
-
-#: ../src/bc.c:76
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
-
-#: ../src/bc.c:79
-msgid "CEPNET"
-msgstr "CEPNET"
-
-#: ../src/bc.c:82
-msgid "EAN (any)"
-msgstr "EAN (ä½?ã?§ã??)"
-
-#: ../src/bc.c:85
-msgid "EAN-8"
-msgstr "EAN-8"
-
-#: ../src/bc.c:88
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
-
-#: ../src/bc.c:91
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
-
-#: ../src/bc.c:94
-msgid "EAN-13"
-msgstr "EAN-13"
-
-#: ../src/bc.c:97
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
-
-#: ../src/bc.c:100
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
-
-#: ../src/bc.c:103
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A ã?¾ã??ã?¯ UPC-E)"
-
-#: ../src/bc.c:106
-msgid "UPC-A"
-msgstr "UPC-A"
-
-#: ../src/bc.c:109
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
-
-#: ../src/bc.c:112
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
-
-#: ../src/bc.c:115
-msgid "UPC-E"
-msgstr "UPC-E"
-
-#: ../src/bc.c:118
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
-
-#: ../src/bc.c:121
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
-
-#: ../src/bc.c:124
-msgid "ISBN"
-msgstr "ISBN"
-
-#: ../src/bc.c:127
-msgid "ISBN +5"
-msgstr "ISBN +5"
-
-#: ../src/bc.c:130
-msgid "Code 39"
-msgstr "Code 39"
-
-#: ../src/bc.c:133
-msgid "Code 128"
-msgstr "Code 128"
-
-#: ../src/bc.c:136
-msgid "Code 128C"
-msgstr "Code 128C"
-
-#: ../src/bc.c:139
-msgid "Code 128B"
-msgstr "Code 128B"
-
-#: ../src/bc.c:142
-msgid "Interleaved 2 of 5"
-msgstr "ç¶´ã??è¾¼ã?¿ 2/5"
-
-#: ../src/bc.c:145
-msgid "Codabar"
-msgstr "Codabar"
-
-#: ../src/bc.c:148
-msgid "MSI"
-msgstr "MSI"
-
-#: ../src/bc.c:151
-msgid "Plessey"
-msgstr "Plessey"
-
-#: ../src/bc.c:154
-msgid "IEC16022 (DataMatrix)"
-msgstr "IEC16022 (DataMatrix)"
-
-#: ../src/label.c:531
-msgid "Untitled"
-msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
-
-#: ../src/label-barcode.c:426
-msgid "Barcode data empty"
-msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??ç©ºã?§ã??"
-
-#: ../src/label-barcode.c:430
-msgid "Invalid barcode data"
-msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+msgid "bad node =  \"%s\""
+msgstr "ã??ã??ã??ã?ªã??ã?¼ã?? = \"%s\""
 
-#: ../src/xml-label.c:193
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "xmlParseFile ã?¨ã?©ã?¼"
 
-#: ../src/xml-label.c:234
-msgid "xmlParseDoc error"
-msgstr "xmlParseDoc ã?¨ã?©ã?¼"
-
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "root ã??ã?ã?¥ã?¡ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../src/xml-label.c:278
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "gLabels 0.1 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
 
-#: ../src/xml-label.c:287
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "gLabels 0.4 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
 
-#: ../src/xml-label.c:296
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "glabels ã?®å??å??ç©ºé??ã??ä¸?æ??ã?§ã?? -- %s ã??å?©ç?¨ã??ã?¦ä¸?ã??ã??"
 
-#: ../src/xml-label.c:327 ../src/xml-label-04.c:79
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "ã??ã??ã??ã?ª root ã?®ã??ã?¼ã?? = \"%s\""
-
-#: ../src/xml-label.c:364
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Document ã??ã?¼ã??ã?«ã??ã??ã??ã?ª root ã?®ã??ã?¼ã?? = \"%s\""
 
-#: ../src/xml-label.c:409 ../src/xml-label-04.c:127
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "ã??ã??ã??ã?ªã??ã?¼ã?? = \"%s\""
-
-#: ../src/xml-label.c:851
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "Data ã??ã?¼ã??ã?«ã??ã??ã??ã?ªã??ã?¼ã?? = \"%s\""
 
-#: ../src/xml-label.c:1088 ../libglabels/xml-template.c:682
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID ã?¾ã??ã?¯å??å?? \"%s\" ã??ä¸?æ??ã?§ã??ã??"
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Utf8 å¤?æ??ã?¨ã?©ã?¼ã?§ã??ã??"
 
-#: ../src/xml-label.c:1095
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "XML ã??ã?¡ã?¤ã?«ã?®ä¿?å?ã?§å??é¡?ã??ã??ã??ã?¾ã??"
 
-#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378
-msgid "None"
-msgstr "ã?ªã??"
-
-#: ../src/merge-init.c:59
-msgid "Text file with comma delimeters (CSV)"
-msgstr "ã?³ã?³ã??ã?§å?ºå??ã?£ã??ã??ã?ã?¹ã??ã?»ã??ã?¡ã?¤ã?« (CSV)"
-
-#: ../src/merge-init.c:66
-msgid "Text file with colon delimeters"
-msgstr "ã?³ã?ã?³ã?§å?ºå??ã?£ã??ã??ã?ã?¹ã??ã?»ã??ã?¡ã?¤ã?«"
-
-#: ../src/merge-init.c:73
-msgid "Text file with tab delimeters"
-msgstr "ã?¿ã??ã?§å?ºå??ã?£ã??ã??ã?ã?¹ã??ã?»ã??ã?¡ã?¤ã?«"
-
-#: ../src/merge-init.c:82
-msgid "Data from default Evolution Addressbook"
-msgstr "Evolution ã?¢ã??ã?¬ã?¹å¸³ã?®ã??ã?¼ã?¿"
-
-#: ../src/merge-init.c:88
-msgid "Data from a file containing VCards"
-msgstr "VCards å½¢å¼?ã?®ã??ã?¼ã?¿ã??å?«ã??ã??ã?¡ã?¤ã?«"
-
-#: ../src/merge-evolution.c:309
-msgid "Couldn't construct query"
-msgstr "ã?¯ã?¨ã?ªã??æ§?ç¯?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326
-msgid "Couldn't open addressbook."
-msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/merge-evolution.c:341
-msgid "Couldn't list available fields."
-msgstr "å?©ç?¨å?¯è?½ã?ªé ?å??ã?®ä¸?è¦§ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/merge-evolution.c:377
-msgid "Couldn't get contacts."
-msgstr "é?£çµ¡å??ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/wdgt-print-copies.c:153
-msgid "Sheets:"
-msgstr "ç?¨ç´?:"
-
-#: ../src/wdgt-print-copies.c:173
-msgid "from:"
-msgstr "é??å§?:"
-
-#: ../src/wdgt-print-copies.c:178
-msgid "to:"
-msgstr "çµ?äº?:"
-
-#: ../src/wdgt-print-merge.c:154
-msgid "Start on label"
-msgstr "ã?©ã??ã?«ã?®é??å§?"
-
-#: ../src/wdgt-print-merge.c:159
-msgid "on 1st sheet"
-msgstr "(æ??å??ã?®ã?·ã?¼ã??)"
-
-#: ../src/wdgt-print-merge.c:168
-msgid "Copies:"
-msgstr "ã?³ã??ã?¼:"
-
-#: ../src/wdgt-print-merge.c:173
-msgid "Collate"
-msgstr "è£½æ?¬"
-
-#: ../src/wdgt-media-select.c:288 ../src/wdgt-media-select.c:292
-#: ../src/wdgt-media-select.c:297 ../src/wdgt-media-select.c:306
-#: ../src/wdgt-media-select.c:309 ../src/wdgt-media-select.c:402
-#: ../src/wdgt-media-select.c:609 ../src/wdgt-media-select.c:618
-msgid "Any"
-msgstr "ã??ã??ã??ã??"
-
-#: ../src/wdgt-media-select.c:643
-#, c-format
-msgid "%d per sheet"
-msgstr "%d /ã?·ã?¼ã??"
-
-#: ../src/wdgt-media-select.c:673
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-#: ../src/wdgt-media-select.c:678
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-#: ../src/wdgt-media-select.c:689 ../src/wdgt-media-select.c:703
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s å??ç??"
-
-#: ../src/wdgt-media-select.c:693 ../src/wdgt-media-select.c:707
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s å??ç??"
-
-#: ../src/wdgt-media-select.c:781
-msgid "No recent templates found."
-msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??"
-
-#: ../src/wdgt-media-select.c:782
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr ""
-"\"å?¨ã?¦ã?®ã??ã?³ã??ã?¬ã?¼ã??ã??ã??æ¤?ç´¢ã??ã??\" ã?®ã??ã?¼ã?¸ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã??ä¸?ã?¤é?¸æ??ã??ã?¦ã?¿ã?¦"
-"ä¸?ã??ã??ã??"
-
-#: ../src/wdgt-media-select.c:861
-msgid "No match."
-msgstr "è¦?ã?¤ã??ã??ã?¾ã??ã??"
-
-#: ../src/wdgt-media-select.c:862
-msgid "Try selecting a different brand, page size or category."
-msgstr "å?¥ã?®ã??ã?©ã?³ã??ã??ç?¨ç´?ã?®å¤§ã??ã??ã??ã?¾ã??ã?¯ã?«ã??ã?´ã?ªã??æ??å®?ã??ã?¦ã?¿ã?¦ä¸?ã??ã??ã??"
-
-#. This is the default custom color
-#: ../src/mygal/color-palette.c:389
-msgid "custom"
-msgstr "ã?«ã?¹ã?¿ã? "
-
-#. "Custom" color - we'll pop up a GtkColorButton
-#: ../src/mygal/color-palette.c:431
-msgid "Custom Color:"
-msgstr "ã?«ã?¹ã?¿ã? è?²:"
-
-#: ../src/mygal/color-palette.c:439
-msgid "Choose Custom Color"
-msgstr "ã?«ã?¹ã?¿ã? ã?»ã?«ã?©ã?¼ã?®é?¸æ??"
-
-#: ../src/mygal/color-palette.c:572
-msgid "black"
-msgstr "é»?"
-
-#: ../src/mygal/color-palette.c:573
-msgid "light brown"
-msgstr "æ·¡ã??è?¶"
-
-#: ../src/mygal/color-palette.c:574
-msgid "brown gold"
-msgstr "è?¶é??"
-
-#: ../src/mygal/color-palette.c:575
-msgid "dark green #2"
-msgstr "æ??ã??ç·? #2"
-
-#: ../src/mygal/color-palette.c:576
-msgid "navy"
-msgstr "ã??ã?¼ã??ã?¼"
-
-#: ../src/mygal/color-palette.c:577 ../src/mygal/color-palette.c:633
-msgid "dark blue"
-msgstr "æ??ã??é??"
-
-#: ../src/mygal/color-palette.c:578
-msgid "purple #2"
-msgstr "ç´« #2"
-
-#: ../src/mygal/color-palette.c:579
-msgid "very dark gray"
-msgstr "ã?¨ã?¦ã??æ??ã??ç?°"
-
-#: ../src/mygal/color-palette.c:582 ../src/mygal/color-palette.c:638
-msgid "dark red"
-msgstr "æ??ã??èµ¤"
-
-#: ../src/mygal/color-palette.c:583
-msgid "red-orange"
-msgstr "èµ¤ã?¿ã?®æ©?"
-
-#: ../src/mygal/color-palette.c:584
-msgid "gold"
-msgstr "é??"
-
-#: ../src/mygal/color-palette.c:585
-msgid "dark green"
-msgstr "æ??ã??ç·?"
-
-#: ../src/mygal/color-palette.c:586 ../src/mygal/color-palette.c:639
-msgid "dull blue"
-msgstr "ã??ã??ã??ã? é??"
-
-#: ../src/mygal/color-palette.c:587 ../src/mygal/color-palette.c:640
-msgid "blue"
-msgstr "é??"
-
-#: ../src/mygal/color-palette.c:588
-msgid "dull purple"
-msgstr "ã??ã??ã??ã? ç´«"
-
-#: ../src/mygal/color-palette.c:589
-msgid "dark grey"
-msgstr "æ??ã??ç?°"
-
-#: ../src/mygal/color-palette.c:592
-msgid "red"
-msgstr "èµ¤"
-
-#: ../src/mygal/color-palette.c:593
-msgid "orange"
-msgstr "æ©?"
-
-#: ../src/mygal/color-palette.c:594
-msgid "lime"
-msgstr "ã?©ã?¤ã? "
-
-#: ../src/mygal/color-palette.c:595
-msgid "dull green"
-msgstr "ã??ã??ã??ã? ç·?"
-
-#: ../src/mygal/color-palette.c:596
-msgid "dull blue #2"
-msgstr "ã??ã??ã??ã? é?? #2"
-
-#: ../src/mygal/color-palette.c:597
-msgid "sky blue #2"
-msgstr "ã?¹ã?«ã?¤ã??ã?«ã?¼ #2"
-
-#: ../src/mygal/color-palette.c:598 ../src/mygal/color-palette.c:637
-msgid "purple"
-msgstr "ç´«"
-
-#: ../src/mygal/color-palette.c:599
-msgid "gray"
-msgstr "ç?°"
-
-#: ../src/mygal/color-palette.c:602 ../src/mygal/color-palette.c:634
-msgid "magenta"
-msgstr "ã??ã?¼ã?³ã?¿"
-
-#: ../src/mygal/color-palette.c:603
-msgid "bright orange"
-msgstr "æ??ã??ã??æ©?"
-
-#: ../src/mygal/color-palette.c:604 ../src/mygal/color-palette.c:635
-msgid "yellow"
-msgstr "é»?"
-
-#: ../src/mygal/color-palette.c:605
-msgid "green"
-msgstr "ç·?"
-
-#: ../src/mygal/color-palette.c:606 ../src/mygal/color-palette.c:636
-msgid "cyan"
-msgstr "ã?·ã?¢ã?³"
-
-#: ../src/mygal/color-palette.c:607
-msgid "bright blue"
-msgstr "æ??ã??ã??é??"
-
-#: ../src/mygal/color-palette.c:608 ../src/mygal/color-palette.c:625
-msgid "red purple"
-msgstr "èµ¤ç´«"
-
-#: ../src/mygal/color-palette.c:609
-msgid "light grey"
-msgstr "æ·¡ã??ç?°"
-
-#: ../src/mygal/color-palette.c:612 ../src/mygal/color-palette.c:629
-msgid "pink"
-msgstr "ã??ã?³ã?¯"
-
-#: ../src/mygal/color-palette.c:613
-msgid "light orange"
-msgstr "æ·¡ã??æ©?"
-
-#: ../src/mygal/color-palette.c:614 ../src/mygal/color-palette.c:626
-msgid "light yellow"
-msgstr "æ·¡ã??é»?"
-
-#: ../src/mygal/color-palette.c:615
-msgid "light green"
-msgstr "æ·¡ã??ç·?"
-
-#: ../src/mygal/color-palette.c:616
-msgid "light cyan"
-msgstr "æ·¡ã??ã?·ã?¢ã?³"
-
-#: ../src/mygal/color-palette.c:617 ../src/mygal/color-palette.c:627
-msgid "light blue"
-msgstr "æ·¡ã??é??"
-
-#: ../src/mygal/color-palette.c:618 ../src/mygal/color-palette.c:631
-msgid "light purple"
-msgstr "æ·¡ã??ç´«"
-
-#: ../src/mygal/color-palette.c:619
-msgid "white"
-msgstr "ç?½"
-
-#: ../src/mygal/color-palette.c:624
-msgid "purplish blue"
-msgstr "ç´«ã?¿ã?®é??"
-
-#: ../src/mygal/color-palette.c:628
-msgid "dark purple"
-msgstr "æ??ã??ç´«"
-
-#: ../src/mygal/color-palette.c:630
-msgid "sky blue"
-msgstr "ã?¹ã?«ã?¤ã??ã?«ã?¼"
-
-#: ../src/critical-error-handler.c:73
-msgid "gLabels Fatal Error!"
-msgstr "gLabels ã?§è?´å?½ç??ã?ªã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ï¼?"
-
-#: ../src/warning-handler.c:73
-msgid "gLabels Error!"
-msgstr "gLabels ã?®ã?¨ã?©ã?¼ã?§ã??ï¼?"
-
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:118
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "ã??ã?®ä»?"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:131
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "æ??å®?ã??ã??"
 
-#: ../libglabels/db.c:482
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1472,7 +1888,7 @@ msgstr ""
 "ç?¨ç´?ã?®å¤§ã??ã??ã??å®?ç¾©ã??ã??ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ£ã??ã??ã?¤ã?³"
 "ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1480,7 +1896,7 @@ msgstr ""
 "ã?«ã??ã?´ã?ªã??å®?ç¾©ã??ã??ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ£ã??ã??ã?¤ã?³ã?¹"
 "ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1488,12 +1904,69 @@ msgstr ""
 "ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ£ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«"
 "ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:1538
-#, c-format
-msgid "Generic %s full page template"
+#: ../libglabels/db.c:2164
+#, fuzzy, c-format
+msgid "%s full page label"
 msgstr "ä¸?è?¬ç??ã?ª %s ã?®å?¨ã??ã?¼ã?¸ã?»ã??ã?³ã??ã?¬ã?¼ã??"
 
-#: ../libglabels/xml-template.c:227
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d /ã?·ã?¼ã??"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr "%d /ã?·ã?¼ã??"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s å??ç??"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "ã??ã?¤ã?³ã??"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "[ã?¤ã?³ã??]"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "[ã??ã?ª]"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
+
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr "å??å??ã?¾ã??ã?¯ã??ã?©ã?³ã??/ã??ã?¼ã??ç?ªå?·ã?¨ã??ã?£ã??å±?æ?§ã??ã??ã??ã?¾ã??ã??ã??"
 
@@ -1509,395 +1982,409 @@ msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID \"%s\" ã??ä¸?æ??ã?ªã?®ã?§å??å??ã?¨ã??ã?¦æ?±
 msgid "Unknown page size id or name \"%s\""
 msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID ã?¾ã??ã?¯å??å?? \"%s\" ã??ä¸?æ??ã?§ã??ã??"
 
-#: ../libglabels/xml-template.c:627
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
+
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 "å¿?é ?ã?¨ã?ªã?? \"ã??ã?©ã?³ã??å??\" ã?? \"ã??ã?¼ã??ç?ªå?·\" ã?¨ã??ã?£ã??å±?æ?§ã??è¦?ã?¤ã??ã??ã?¾ã??ã?? (å»?"
 "æ¢ã??ã??å??å??ã??è©¦ã??ã?¦ã?¿ã?¦ä¸?ã??ã??)"
 
-#: ../libglabels/xml-template.c:637
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr "å??å??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../data/glade/merge-properties-dialog.glade.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>ã?¬ã?³ã?¼ã??ã?®é?¸æ??/ã??ã?¬ã??ã?¥ã?¼</b>"
-
-#: ../data/glade/merge-properties-dialog.glade.h:2
-msgid "<b>Source</b>"
-msgstr "<b>ã?½ã?¼ã?¹</b>"
-
-#: ../data/glade/merge-properties-dialog.glade.h:3
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "æ?¸å¼?:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "å ´æ??:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>ã?¬ã?³ã?¼ã??ã?®é?¸æ??/ã??ã?¬ã??ã?¥ã?¼</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "å?¨ã?¦é?¸æ??"
 
-#: ../data/glade/merge-properties-dialog.glade.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>ã?½ã?¼ã?¹</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "å?¨ã?¦é?¸æ??è§£é?¤"
 
-#: ../data/glade/merge-properties-dialog.glade.h:7
-#: ../data/glade/object-editor.glade.h:39
-msgid "dialog1"
-msgstr "dialog1"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr "ã??ã?©ã?³ã??:"
 
-#: ../data/glade/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>ã?©ã??ã?«ã?®å??ã??</b>"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "ã?«ã??ã?´ã?ª:"
 
-#: ../data/glade/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>ã?¡ã??ã?£ã?¢ã?®ç¨®é¡?</b>"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "ã?«ã?¹ã?¿ã? "
 
-#: ../data/glade/object-editor.glade.h:2
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "ç?¨ç´?ã?®å¤§ã??ã??:"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
 
-#: ../data/glade/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "å?¨ã?¦é?¸æ??"
 
-#: ../data/glade/object-editor.glade.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Xxx ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£</span>"
 
-#: ../data/glade/object-editor.glade.h:5 ../data/glade/prefs-dialog.glade.h:7
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "èª¬æ??:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+#, fuzzy
+msgid "Label size:"
+msgstr "ç?¨ç´?ã?®å¤§ã??ã??:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+#, fuzzy
+msgid "Layout:"
+msgstr "ã?¬ã?¤ã?¢ã?¦ã??"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "æ?¸å¼?:"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "ã??ã?¼ã??ç?ªå?·"
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "å??è»¢ã??ã??ã??"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "ä½?ç½®:"
 
-#: ../data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "è?ªå??ç??ã?«æ??å?ã??å°?ã??ã??ã??ã?¦çµ?å??ã?§ã??ã??ã??ã??ã?«ã??ã??"
 
-#: ../data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "è§?åº¦:"
 
-#: ../data/glade/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "ã??ã?§ã??ã?¯ã?µã? "
 
-#: ../data/glade/object-editor.glade.h:9 ../data/glade/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "è?²:"
 
-#: ../data/glade/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "å½±ã??ä»?ã??ã??"
 
-#: ../data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "ã??ã?¡ã??ã?ª:"
 
-#: ../data/glade/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "ã??ã?¡ã?¤ã?«:"
 
-#: ../data/glade/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "å¡?ã??ã?¤ã?¶ã??"
 
-#: ../data/glade/object-editor.glade.h:15
-#: ../data/glade/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "é«?ã??:"
 
-#: ../data/glade/object-editor.glade.h:17
-msgid "Insert merge field"
-msgstr "çµ?å??ã??ã?£ã?¼ã?«ã??ã?®æ?¿å?¥"
-
-#: ../data/glade/object-editor.glade.h:18
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "ã?ã?¼:"
 
-#: ../data/glade/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "é?·ã??:"
 
-#: ../data/glade/object-editor.glade.h:21
-#: ../data/glade/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "è¡?é??:"
 
-#: ../data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "ã?ªã??ã?©ã?«:"
 
-#: ../data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "é??æ??åº¦:"
 
-#: ../data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
 
-#: ../data/glade/object-editor.glade.h:26
-msgid "Select A File"
-msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
-
-#: ../data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "å½±"
 
-#: ../data/glade/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "å¤§ã??ã??"
 
-#: ../data/glade/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "å¤§ã??ã??:"
 
-#: ../data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "ã?¹ã?¿ã?¤ã?«"
 
-#: ../data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "ã?¹ã?¿ã?¤ã?«:"
 
-#: ../data/glade/object-editor.glade.h:33
-#: ../data/glade/prefs-dialog.glade.h:20
-#: ../data/glade/template-designer.glade.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "å¹?:"
 
-#: ../data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "æ¨ªæ?¹å??ã?®ã?ºã?¬:"
 
-#: ../data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/glade/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "ç¸¦æ?¹å??ã?®ã?ºã?¬:"
 
-#: ../data/glade/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/glade/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "åº¦"
 
-#: ../data/glade/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:35
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "æ¡?æ?°:"
 
-#: ../data/glade/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "æ?¸å¼?:"
 
-#: ../data/glade/prefs-dialog.glade.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/glade/prefs-dialog.glade.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?®å??æ??å?¤</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">å¡?ã??ã?¤ã?¶ã??</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">ç·?</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">æ??å?</span>"
-
-#: ../data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">å??ä½?</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "ã??ã?©ã?³ã??:"
 
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4 ç??"
 
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "ã?¤ã?³ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "ã?ã?¼ã?±ã?«"
 
-#: ../data/glade/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "ã??ã?ª"
 
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "ã??ã?¤ã?³ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "å?©ç?¨ã??ã??è¨?èª? (ã?ã?±ã?¼ã?«) ã?«ä¾?å?ã??ã??ã??ã?©ã?¡ã?¼ã?¿ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#. Most popular (at top of list)
-#: ../data/glade/prefs-dialog.glade.h:19
-#: ../data/templates/paper-sizes.xml.h:29
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US ã?¬ã?¿ã?¼"
 
-#: ../data/glade/print-custom-widget.glade.h:1
-msgid "<b>Options</b>"
-msgstr "<b>ã?ªã??ã?·ã?§ã?³</b>"
-
-#: ../data/glade/print-custom-widget.glade.h:2
-msgid "<b>Print control (Merge)</b>"
-msgstr "<b>å?°å?·ã?®å?¶å¾¡ (çµ?å??)</b>"
-
-#: ../data/glade/print-custom-widget.glade.h:3
-msgid "<b>Print control (Simple)</b>"
-msgstr "<b>å?°å?·ã?®å?¶å¾¡ (ç°¡æ??)</b>"
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
 
-#: ../data/glade/property-bar.glade.h:1
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "å¤ªå?"
 
-#: ../data/glade/property-bar.glade.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "ä¸å¤®å¯?ã??"
 
-#: ../data/glade/property-bar.glade.h:4
-msgid "Font family"
-msgstr "ã??ã?©ã?³ã??å??"
-
-#: ../data/glade/property-bar.glade.h:5
-msgid "Font size"
-msgstr "ã??ã?©ã?³ã??ã?®å¤§ã??ã??"
-
-#: ../data/glade/property-bar.glade.h:6
-msgid "Italic"
-msgstr "ã?¤ã?¿ã?ªã??ã?¯"
-
-#: ../data/glade/property-bar.glade.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "å·¦å¯?ã??"
 
-#: ../data/glade/property-bar.glade.h:9
-msgid "Line width"
-msgstr "ç·?å¹?"
-
-#: ../data/glade/property-bar.glade.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "å?³å¯?ã??"
 
-#: ../data/glade/property-bar.glade.h:11
-msgid "Text Color"
-msgstr "æ??å?ã?®è?²"
-
-#: ../data/glade/property-bar.glade.h:12
-msgid "Text color"
-msgstr "æ??å?ã?®è?²"
-
-#: ../data/glade/template-designer.glade.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(ä¾?: \"å°?ç?ã?®ã?©ã??ã?«\", \"å??å?º\", ...)"
 
-#: ../data/glade/template-designer.glade.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(ä¾?: 8163A)"
 
-#: ../data/glade/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(ä¾?: Avery, Acme, ...)"
 
-#: ../data/glade/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. å¤?å¾?:"
 
-#: ../data/glade/template-designer.glade.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. å??å¾?:"
 
-#: ../data/glade/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. å¹?:"
 
-#: ../data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. é«?ã??:"
 
-#: ../data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. ã?¤ã?³ã??ã?¼ã?®å??å¾?:"
 
-#: ../data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. ä½?å??ã?ªé?¨å?? (é??ã?å?·ã??å?¯):"
 
-#: ../data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. ã?¯ã?ªã??ã??ã?³ã?°ã?®å¹?:"
 
-#: ../data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. ä½?ç?½"
 
-#: ../data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. ã?³ã?¼ã??ã?¼ (è§?åº¦):"
 
-#: ../data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. ã?¯ã?ªã??ã??ã?³ã?°ã?®é«?ã??:"
 
-#: ../data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. æ°´å¹³æ?¹å??ã?®ä½?å??ã?ªé?¨å?? (é??ã?å?·ã??å?¯):"
 
-#: ../data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. å??ç?´æ?¹å??ã?®ä½?å??ã?ªé?¨å?? (é??ã?å?·ã??å?¯):"
 
-#: ../data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. ä½?å??ã?ªé?¨å?? (é??ã?å?·ã??å?¯):"
 
-#: ../data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. ä½?ç?½"
 
-#: ../data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "ã??ã?©ã?³ã??/è£½é? å??:"
 
-#: ../data/glade/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD ã?®å½¢ (å?«ã??ã?¯ã?¬ã?¸ã??ã??ã?»ã?«ã?¼ã?? CD)"
 
-#: ../data/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1915,23 +2402,19 @@ msgstr ""
 "[ã?ã?£ã?³ã?»ã?«] ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??ã?¶ã?¤ã?³ã??ç ´æ£?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n"
 "ã?¾ã??ã?¯ [æ?»ã??] ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??ã??ç?´ã??ã??ã?¨ã??å?¯è?½ã?§ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:27
-msgid "Description:"
-msgstr "èª¬æ??:"
-
-#: ../data/glade/template-designer.glade.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "å·¦ä¸?é??ã??ã??ã?®è·?é?¢ (x0):"
 
-#: ../data/glade/template-designer.glade.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "å·¦ä¸?é??ã??ã??ã?®è·?é?¢ (y0):"
 
-#: ../data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "æ°´å¹³æ?¹å??ã?®ã??ã??ã?? (dx):"
 
-#: ../data/glade/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1947,78 +2430,69 @@ msgstr ""
 "ã??ã??\n"
 "äº?ç?ªç?®ã?®ã?µã?³ã??ã?«ã?§ã?¯ã??äº?ã?¤ã?®ã?¬ã?¤ã?¢ã?¦ã??ã??å¿?è¦?ã?ªå ´å??ã??å?³ã?«ã??ã??ã??ã?®ã?§ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã?? #1:"
 
-#: ../data/glade/template-designer.glade.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã?? #2:"
 
-#: ../data/glade/template-designer.glade.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "æ¨ªæ?¹å??ã?®æ?° (nx):"
 
-#: ../data/glade/template-designer.glade.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "ç¸¦æ?¹å??ã?®æ?° (ny):"
 
-#: ../data/glade/template-designer.glade.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã??ã?®æ?°:"
 
-#: ../data/glade/template-designer.glade.h:42
-#: ../data/glade/wdgt-media-select.glade.h:3
-msgid "Page size:"
-msgstr "ç?¨ç´?ã?®å¤§ã??ã??:"
-
-#: ../data/glade/template-designer.glade.h:43
-msgid "Part #:"
-msgstr "ã??ã?¼ã??ç?ªå?·"
-
-#: ../data/glade/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ã?®è?å?¥æ??å ±ã??å?¥å??ã??ã?¦ä¸?ã??ã??:"
 
-#: ../data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "ã?¬ã?¤ã?¢ã?¦ã??æ??å ±ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:46
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ã?®ã?©ã??ã?«å??ä½?ã?®å¤§ã??ã??ã??ã??ã??ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ã?®ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??å??ä½?ã?®å¤§ã??ã??ã??ã??ã??ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å?ºæ?¬ç??ã?ªå½¢ç?¶ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ç?¨ç´?ã?®å¤§ã??ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "ç?¨ç´?ã?®ã??ã?¹ã??å?°å?·"
 
-#: ../data/glade/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "é?·æ?¹å½¢ã?¾ã??ã?¯æ£æ?¹å½¢ (ã?³ã?¼ã??ã?¼ã??ä¸¸ã??ã??ã??ã??ã?¨ã??å?¯)"
 
-#: ../data/glade/template-designer.glade.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "å??"
 
-#: ../data/glade/template-designer.glade.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -2026,7 +2500,7 @@ msgstr ""
 "ã?¬ã?¤ã?¢ã?¦ã??ã??äº?ã?¤å¿?è¦?ã?ª\n"
 "ã??ã?³ã??ã?¬ã?¼ã??"
 
-#: ../data/glade/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2034,11 +2508,11 @@ msgstr ""
 "ã?¬ã?¤ã?¢ã?¦ã??ã??ä¸?ã?¤ã? ã??ã?§\n"
 "å??å??ã?ªã?¬ã?¤ã?¢ã?¦ã??"
 
-#: ../data/glade/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "å??ç?´æ?¹å??ã?®ã??ã??ã?? (dy):"
 
-#: ../data/glade/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2049,390 +2523,432 @@ msgstr ""
 "ã??ã?®ã??ã?¶ã?¤ã??ã?§ã?¯ gLabels ã?§å?©ç?¨ã??ã??\n"
 "ç?¬è?ªã??ã?³ã??ã?¬ã?¼ã??ã?®ä½?æ??ã??ã??æ??ä¼?ã??ã??ã?¾ã??ã??"
 
-#: ../data/glade/template-designer.glade.h:62
-msgid "cd_size_page"
-msgstr "cd_size_page"
-
-#: ../data/glade/template-designer.glade.h:63
-msgid "finish_page"
-msgstr "finish_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "è£½æ?¬"
 
-#: ../data/glade/template-designer.glade.h:65
-msgid "layout_page"
-msgstr "layout_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "Copies"
+msgstr "ã?³ã??ã?¼:"
 
-#: ../data/glade/template-designer.glade.h:66
-msgid "name_page"
-msgstr "name_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "ã?³ã??ã?¼:"
 
-#: ../data/glade/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "nlayouts_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Merge Control"
+msgstr ""
 
-#: ../data/glade/template-designer.glade.h:68
-msgid "pg_size_page"
-msgstr "pg_size_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>ã?ªã??ã?·ã?§ã?³</b>"
 
-#: ../data/glade/template-designer.glade.h:69
-msgid "rect_size_page"
-msgstr "rect_size_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "ç?¨ç´?:"
 
-#: ../data/glade/template-designer.glade.h:70
-msgid "round_size_page"
-msgstr "round_size_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "ã?©ã??ã?«ã?®é??å§?"
 
-#: ../data/glade/template-designer.glade.h:71
-msgid "shape_page"
-msgstr "shape_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "é??å§?:"
 
-#: ../data/glade/template-designer.glade.h:72
-msgid "start_page"
-msgstr "start_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "(æ??å??ã?®ã?·ã?¼ã??)"
 
-#: ../data/glade/wdgt-media-select.glade.h:1
-msgid "Brand:"
-msgstr "ã??ã?©ã?³ã??:"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "çµ?äº?:"
 
-#: ../data/glade/wdgt-media-select.glade.h:2
-msgid "Category:"
-msgstr "ã?«ã??ã?´ã?ª:"
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "ã?©ã??ã?«ã??å??å?ºã??ã?¡ã??ã?£ã?¢ã?®ã?¸ã?£ã?±ã??ã??ã??ã??ã?¶ã?¤ã?³ã??ã?¾ã??"
 
-#: ../data/glade/wdgt-media-select.glade.h:4
-msgid "Recent templates"
-msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "gLabels ã?©ã??ã?«ã?»ã??ã?¶ã?¤ã??"
 
-#: ../data/glade/wdgt-media-select.glade.h:5
-msgid "Search all templates"
-msgstr "å?¨ã?¦ã?®ã??ã?³ã??ã?¬ã?¼ã??ã??ã??æ¤?ç´¢ã??ã??"
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "gLabels ã?®ã??ã?ã?¸ã?§ã?¯ã??ã?»ã??ã?¡ã?¤ã?«"
 
-#: ../data/glade/wdgt-rotate-label.glade.h:1
-msgid "Rotate"
-msgstr "å??è»¢ã??ã??ã??"
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
 
 #. Other ISO A series sizes
-#: ../data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0ç??"
 
-#: ../data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1ç??"
 
-#: ../data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10ç??"
 
-#: ../data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2ç??"
 
-#: ../data/templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3ç??"
 
-#: ../data/templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4ç??"
 
-#: ../data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5ç??"
 
-#: ../data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6ç??"
 
-#: ../data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7ç??"
 
-#: ../data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8ç??"
 
-#: ../data/templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9ç??"
 
 #. ISO B series sizes
-#: ../data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0ç??"
 
-#: ../data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1ç??"
 
-#: ../data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10ç??"
 
-#: ../data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2ç??"
 
-#: ../data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3ç??"
 
-#: ../data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4ç??"
 
-#: ../data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5ç??"
 
-#: ../data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6ç??"
 
-#: ../data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7ç??"
 
-#: ../data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8ç??"
 
-#: ../data/templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9ç??"
 
-#: ../data/templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "US ã?¨ã?°ã?¼ã?¯ã??ã?£ã??"
 
 #. Other US paper sizes
-#: ../data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "US ã?ªã?¼ã?¬ã?«"
 
-#: ../data/templates/categories.xml.h:1
+#: ../templates/categories.xml.h:1
 msgid "Any card"
 msgstr "ã??ã??ã??ã?®ã?«ã?¼ã??"
 
-#: ../data/templates/categories.xml.h:2
+#: ../templates/categories.xml.h:2
 msgid "Any label"
 msgstr "ã??ã??ã??ã?®ã?©ã??ã?«"
 
-#: ../data/templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "å??å?º"
 
-#: ../data/templates/categories.xml.h:4
+#: ../templates/categories.xml.h:4
 msgid "CD/DVD or other media"
 msgstr "CD/DVD ã?¾ã??ã?¯ã??ã?®ä»?ã?®ã?¡ã??ã?£ã?¢"
 
-#: ../data/templates/categories.xml.h:5
+#: ../templates/categories.xml.h:5
 msgid "Mailing/shipping products"
 msgstr "é?µé??/å?ºè?·ã??ã??è£½å??"
 
-#: ../data/templates/categories.xml.h:6
+#: ../templates/categories.xml.h:6
 msgid "Rectangular labels"
 msgstr "é?·æ?¹å½¢ã?®ã?©ã??ã?«"
 
-#: ../data/templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "ä¸¸ã??ã?©ã??ã?«"
 
-#: ../data/templates/categories.xml.h:8
+#: ../templates/categories.xml.h:8
 msgid "Square labels"
 msgstr "æ£æ?¹å½¢ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:2
-#: ../data/templates/avery-us-templates.xml.h:2
-#: ../data/templates/dymo-other-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:2
-#: ../data/templates/zweckform-iso-templates.xml.h:2
-msgid "Address Labels"
-msgstr "å®?å??ã?®ã?©ã??ã?«"
-
+#. ********************************************************************
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:4
-msgid "Address labels"
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "å®?å??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:6
-msgid "Allround labels"
-msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
-
 #. ============================================================
 #. ===================================================================
 #. ********************************************************************
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:8
-#: ../data/templates/avery-us-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:12
-#: ../data/templates/misc-us-templates.xml.h:4
-#: ../data/templates/zweckform-iso-templates.xml.h:6
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "å??å?º"
 
-#. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:10
-msgid "CD Booklet"
-msgstr "CD ã?®å°?å??å?"
-
-#. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:12
-msgid "CD Inlet"
-msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
-
+#. ===================================================================
 #. ===============================================================
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:14
-#: ../data/templates/avery-us-templates.xml.h:6
-#: ../data/templates/misc-iso-templates.xml.h:16
-#: ../data/templates/misc-us-templates.xml.h:8
-#: ../data/templates/zweckform-iso-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
 msgstr "CD/DVD ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:16
-#: ../data/templates/avery-us-templates.xml.h:12
-msgid "Diskette Labels"
-msgstr "ã??ã?ã??ã??ã?¼ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:18
-msgid "Diskette labels"
-msgstr "ã??ã?ã??ã??ã?¼ã?®ã?©ã??ã?«"
-
-#. ===============================================================
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:20
-#: ../data/templates/misc-iso-templates.xml.h:36
-#: ../data/templates/misc-us-templates.xml.h:20
-#: ../data/templates/zweckform-iso-templates.xml.h:16
-msgid "Mailing Labels"
-msgstr "å°?ç?ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:22
-msgid "Mailing labels"
-msgstr "å°?ç?ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:24
-msgid "Mini Address Labels"
-msgstr "å°?ã??ã?ªå®?å??ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:26
-msgid "Mini Labels"
-msgstr "ã??ã??ã?»ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:28
-msgid "Shipping labels"
-msgstr "å?ºè?·ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../data/templates/avery-other-templates.xml.h:2
-msgid "File Folder Labels"
-msgstr "ã??ã?¡ã?¤ã?«ã?»ã??ã?©ã?«ã??ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "CD/DVD ã?®ã?©ã??ã?« (Disc ã?©ã??ã?«)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:10
+#: ../templates/avery-us-templates.xml.h:10
 msgid "CD/DVD Labels (Spine Labels)"
 msgstr "CD/DVD ã?®ã?©ã??ã?« (Spine ã?©ã??ã?«)"
 
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
+msgid "Diskette Labels"
+msgstr "ã??ã?ã??ã??ã?¼ã?®ã?©ã??ã?«"
+
 #. the LSK labels can be torn in half down the center
-#: ../data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:14
 msgid "Divider Labels"
 msgstr "ã??ã?©ã?¤ã??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+msgid "File Folder Labels"
+msgstr "ã??ã?¡ã?¤ã?«ã?»ã??ã?©ã?«ã??ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr "ã??ã?¡ã?¤ã?«ã?»ã??ã?¤ã?³ã??ã?¼ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:18
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "å?¨ç?¨ç´?ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 msgid "ID Labels"
 msgstr "ID ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 msgid "Index Cards"
 msgstr "ç?®é?²ã?®ã?«ã?¼ã??"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "å¤§ã??ã?ªä¸¸ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:26
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "å??å??ã?¤ã??ã??ã??ã?¸ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr "ã?¯ã??ã??"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:30
-#: ../data/templates/dymo-other-templates.xml.h:12
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "è¿?ä¿¡ç?¨å®?å??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:32
-#: ../data/templates/misc-us-templates.xml.h:30
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "è§?ã??ä¸¸ã??ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:34
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "å?ºè?·ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:36
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "å°?ã??ã?ªä¸¸ã??ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:38
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "æ£æ?¹å½¢ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr "ã??ã?³ã??ã?®ã?«ã?¼ã??"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:42
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "ã??ã??ã?ªã?»ã??ã?¼ã??ã?®è¡¨é?¢ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:44
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr "ã??ã??ã?ªã?»ã??ã?¼ã??ã?®è??é?¢ã?©ã??ã?«"
 
-#: ../data/templates/brother-other-templates.xml.h:1
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:4
+msgid "Address labels"
+msgstr "å®?å??ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:6
+msgid "Allround labels"
+msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:10
+msgid "CD Booklet"
+msgstr "CD ã?®å°?å??å?"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:12
+msgid "CD Inlet"
+msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:18
+msgid "Diskette labels"
+msgstr "ã??ã?ã??ã??ã?¼ã?®ã?©ã??ã?«"
+
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr "å°?ç?ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:22
+msgid "Mailing labels"
+msgstr "å°?ç?ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:24
+msgid "Mini Address Labels"
+msgstr "å°?ã??ã?ªå®?å??ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:26
+msgid "Mini Labels"
+msgstr "ã??ã??ã?»ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:28
+msgid "Shipping labels"
+msgstr "å?ºè?·ã?©ã??ã?«"
+
+#: ../templates/brother-other-templates.xml.h:1
 msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr "å¤?ç?®ç??ã?©ã??ã?« 17mm x 54mm"
 
-#: ../data/templates/brother-other-templates.xml.h:2
+#: ../templates/brother-other-templates.xml.h:2
 msgid "Shipping Labels 62mm x 100mm"
 msgstr "å?ºè?·ã?©ã??ã?« 62mm x 100mm"
 
@@ -2453,287 +2969,576 @@ msgstr "å?ºè?·ã?©ã??ã?« 62mm x 100mm"
 #. *********************************************************************
 #. *********************************************************************
 #.
-#: ../data/templates/brother-other-templates.xml.h:20
+#: ../templates/brother-other-templates.xml.h:20
 msgid "Standard Address Labels 29mm x 90mm"
 msgstr "æ¨?æº?ç??ã?ªå®?å??ã?®ã?©ã??ã?« 29mm x 90mm"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:2
 msgid "3.5in Diskette"
 msgstr "3.5ã?¤ã?³ã??ã?®ã??ã?ã??ã??ã?¼ã??ã?£ã?¹ã?¯"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:6
 msgid "File Folder"
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?©ã?«ã??"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:8
+#: ../templates/dymo-other-templates.xml.h:8
 msgid "Hanging Folder"
 msgstr "ã?¤ã??ä¸?ã??å¼?ã?®ã??ã?©ã?«ã??"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:10
+#: ../templates/dymo-other-templates.xml.h:10
 msgid "Large Address Labels"
 msgstr "å¤§ã??ã?ªå®?å??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:14
 msgid "Shipping Address Labels"
 msgstr "å?ºè?·ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:4
-#: ../data/templates/zweckform-iso-templates.xml.h:4
+#: ../templates/misc-us-templates.xml.h:2
+msgid "Business Card CD"
+msgstr "å??å?º CD"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
+msgid "CD Template Rectangles"
+msgstr "CD ã??ã?³ã??ã?¬ã?¼ã?? (é?·æ?¹å½¢)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
+msgid "CD/DVD Labels (Face Only)"
+msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
+msgid "CD/DVD Labels (face only)"
+msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:14
+msgid "Cassette Labels"
+msgstr "ã?«ã?»ã??ã??ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:16
+msgid "DLT Labels"
+msgstr "DLT ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:18
+msgid "Jewel Case Booklet"
+msgstr "CD ã?®å°?å??å?"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
+msgid "Microtube labels"
+msgstr "ã??ã?¤ã?¯ã?ã??ã?¥ã?¼ã??ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
+msgid "Mini-CD Labels"
+msgstr "ã??ã?? CD ã?®ã?©ã??ã?«"
+
+#: ../templates/misc-us-templates.xml.h:25
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr "PRO CD ã?®ã?©ã??ã?«äº?æ?? (CD æ ¼ç´?ã?±ã?¼ã?¹ã?®ã?¿)"
+
+#: ../templates/misc-us-templates.xml.h:26
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr "PRO CD ã?©ã??ã?«äº?æ?? (å¤?å?´ã?®ã?¿)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
+msgid "PRO CD Labels 2-up (face only)"
+msgstr "PRO CD ã?©ã??ã?«äº?æ?? (å¤?å?´ã?®ã?¿)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
+msgid "Slimline CD Case (rightside up)"
+msgstr "è??ã?? CD ã??ã?©ã?«ã?? (å?³å?´)"
+
+#: ../templates/misc-us-templates.xml.h:33
+msgid "Slimline CD Case (upside down)"
+msgstr "è??ã?? CD ã??ã?©ã?«ã?? (ä¸?å?´)"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Allround Labels"
 msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:6
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?« (å¤§)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:10
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?« (å°?)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:14
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "CD ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:18
-#: ../data/templates/misc-us-templates.xml.h:12
-msgid "CD/DVD Labels (face only)"
-msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
-
-#. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "CD/DVD ã?®ã?©ã??ã?«æ¨?æº?æ?¸å¼? (å¤?å?´ã?®ã?¿)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:22
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "ã??ã?ã??ã??ã?¼ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "EPSON ã??ã?©ã??ã?»ã?¹ã??ã??ã?«ã?¼ 16"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "Etiketten"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "å?·è?µåº«ã?«è²¼ã??ç£?æ°?ã?¹ã??ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:30
 msgid "General Labels"
 msgstr "ä¸?è?¬ç??ã?ªã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr "ã?¤ã?³ã?¯ã?¸ã?§ã??ã??/ã?¬ã?¼ã?¶å?°å?·ç?¨ã?®ã?©ã??ã?« 70x37mm"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:38
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr "å°?ç?ã?®ã?©ã??ã?« (äº?å??)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:40
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr "å°?ç?ã?®ã?©ã??ã?« (ä¸?å??)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:42
-#: ../data/templates/misc-us-templates.xml.h:28
-msgid "PRO CD Labels 2-up (face only)"
-msgstr "PRO CD ã?©ã??ã?«äº?æ?? (å¤?å?´ã?®ã?¿)"
-
-#. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:44
-#: ../data/templates/zweckform-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Rectangular Labels"
 msgstr "é?·æ?¹å½¢ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:46
 msgid "Universal Labels"
 msgstr "æ?®é??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:48
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "ã??ã??ã?ªã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
 
 #. ===================================================================
-#: ../data/templates/misc-other-templates.xml.h:2
+#: ../templates/misc-other-templates.xml.h:2
 msgid "Multi-Purpose Labels"
 msgstr "å¤?ç?®ç??ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:2
-msgid "Business Card CD"
-msgstr "å??å?º CD"
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "å®?å??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:6
-msgid "CD Template Rectangles"
-msgstr "CD ã??ã?³ã??ã?¬ã?¼ã?? (é?·æ?¹å½¢)"
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "ã??ã?ã??ã??ã?¼ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:10
-msgid "CD/DVD Labels (Face Only)"
-msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:14
-msgid "Cassette Labels"
-msgstr "ã?«ã?»ã??ã??ã?®ã?©ã??ã?«"
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "å??å?º"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:16
-msgid "DLT Labels"
-msgstr "DLT ã?®ã?©ã??ã?«"
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "å??å?º"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:18
-msgid "Jewel Case Booklet"
-msgstr "CD ã?®å°?å??å?"
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "å??å?º"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:22
-msgid "Microtube labels"
-msgstr "ã??ã?¤ã?¯ã?ã??ã?¥ã?¼ã??ã?®ã?©ã??ã?«"
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "å??å?º"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:24
-msgid "Mini-CD Labels"
-msgstr "ã??ã?? CD ã?®ã?©ã??ã?«"
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
 
-#: ../data/templates/misc-us-templates.xml.h:25
-msgid "PRO CD Labels 2-up (CD spine only)"
-msgstr "PRO CD ã?®ã?©ã??ã?«äº?æ?? (CD æ ¼ç´?ã?±ã?¼ã?¹ã?®ã?¿)"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "å??å?º"
 
-#: ../data/templates/misc-us-templates.xml.h:26
-msgid "PRO CD Labels 2-up (Face only)"
-msgstr "PRO CD ã?©ã??ã?«äº?æ?? (å¤?å?´ã?®ã?¿)"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:32
-msgid "Slimline CD Case (rightside up)"
-msgstr "è??ã?? CD ã??ã?©ã?«ã?? (å?³å?´)"
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "ã?©ã??ã?«"
 
-#: ../data/templates/misc-us-templates.xml.h:33
-msgid "Slimline CD Case (upside down)"
-msgstr "è??ã?? CD ã??ã?©ã?«ã?? (ä¸?å?´)"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+#, fuzzy
+msgid "Name plates"
+msgstr "name_page"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "gLabels ã?«ã?¤ã??ã?¦"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "æ£æ?¹å½¢ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "æ£æ?¹å½¢ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:10
+#: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr "ã?³ã?¬ã?¯ã?·ã?§ã?³ã?¨ã?«ã??ã?¼ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:12
 msgid "File Back Labels"
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:14
+#: ../templates/zweckform-iso-templates.xml.h:14
 msgid "Lever Arch File Labels"
 msgstr "ã?¬ã??ã?¼ã?»ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr "å¤?ç?®ç?? Stick+Lift ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:20
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr "QSL-Karten Etiketten (70mm x 50.8mm)"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:22
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
 msgstr "é?·æ?¹å½¢ã?®ã?³ã??ã?¼æ©?ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "ã??ã??ã?ªã?®ã?©ã??ã?« (è£?å?´)"
 
-#: ../data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "ã?©ã??ã?«ã??å??å?ºã??ã?¡ã??ã?£ã?¢ã?®ã?¸ã?£ã?±ã??ã??ã??ã??ã?¶ã?¤ã?³ã??ã?¾ã??"
+#~ msgid "- gLabels label designer"
+#~ msgstr "- gLabels ã?©ã??ã?«ã?»ã??ã?¶ã?¤ã??"
 
-#: ../data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "gLabels ã?©ã??ã?«ã?»ã??ã?¶ã?¤ã??"
+#~ msgid "- batch process gLabels label files"
+#~ msgstr "- gLabels ã?®ã?©ã??ã?«ã?»ã??ã?¡ã?¤ã?«ã??ã??ã??ã??å?¦ç??ã??ã??"
 
-#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "gLabels ã?®ã??ã?ã?¸ã?§ã?¯ã??ã?»ã??ã?¡ã?¤ã?«"
+#~ msgid "Show tooltips"
+#~ msgstr "ã??ã?¼ã?«ã??ã??ã??ã?®è¡¨ç¤º"
 
-#: ../barcode-0.98/compat/getopt.c:583
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `%s` ã?¯ã??ã??ã?¾ã??ã?§ã??\n"
+#~ msgid "Show tooltips for property toolbar"
+#~ msgstr "ã??ã?ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??è¡¨ç¤ºã??ã?¾ã??"
 
-#: ../barcode-0.98/compat/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `--%s` ã?¯å¼?æ?°ã??å??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??\n"
+#~ msgid "Show tooltips for main toolbar"
+#~ msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??è¡¨ç¤ºã??ã?¾ã??"
 
-#: ../barcode-0.98/compat/getopt.c:612
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `%c%s` ã?¯å¼?æ?°ã??å??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??\n"
+#~ msgid "Show tooltips for drawing toolbar"
+#~ msgstr "ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??è¡¨ç¤ºã??ã?¾ã??"
 
-#: ../barcode-0.98/compat/getopt.c:629
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `%s` ã?«ã?¯å¼?æ?°ã??å¿?è¦?ã?§ã??\n"
+#~ msgid "xmlParseDoc error"
+#~ msgstr "xmlParseDoc ã?¨ã?©ã?¼"
 
-#. --option
-#: ../barcode-0.98/compat/getopt.c:658
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: èª?è?ã?§ã??ã?ªã??ã?ªã??ã?·ã?§ã?³ `--%s`\n"
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "ã?³ã?³ã??ã?§å?ºå??ã?£ã??ã??ã?ã?¹ã??ã?»ã??ã?¡ã?¤ã?« (CSV)"
 
-#. +option or -option
-#: ../barcode-0.98/compat/getopt.c:662
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: èª?è?ã?§ã??ã?ªã??ã?ªã??ã?·ã?§ã?³ `%c%s`\n"
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "ã?³ã?ã?³ã?§å?ºå??ã?£ã??ã??ã?ã?¹ã??ã?»ã??ã?¡ã?¤ã?«"
 
-#. 1003.2 specifies the format of this message.
-#: ../barcode-0.98/compat/getopt.c:688
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ä¸?æ£ã?ªã?ªã??ã?·ã?§ã?³-- %c\n"
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "ã?¿ã??ã?§å?ºå??ã?£ã??ã??ã?ã?¹ã??ã?»ã??ã?¡ã?¤ã?«"
 
-#: ../barcode-0.98/compat/getopt.c:691
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ä¸?æ£ã?ªã?ªã??ã?·ã?§ã?³ -- %c\n"
+#~ msgid "Data from a file containing VCards"
+#~ msgstr "VCards å½¢å¼?ã?®ã??ã?¼ã?¿ã??å?«ã??ã??ã?¡ã?¤ã?«"
 
-#: ../barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?«ã?¯å¼?æ?°ã??å¿?è¦?ã?§ã?? -- %c\n"
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s å??ç??"
+
+#~ msgid "Choose Custom Color"
+#~ msgstr "ã?«ã?¹ã?¿ã? ã?»ã?«ã?©ã?¼ã?®é?¸æ??"
+
+#~ msgid "light brown"
+#~ msgstr "æ·¡ã??è?¶"
+
+#~ msgid "brown gold"
+#~ msgstr "è?¶é??"
+
+#~ msgid "dark green #2"
+#~ msgstr "æ??ã??ç·? #2"
+
+#~ msgid "navy"
+#~ msgstr "ã??ã?¼ã??ã?¼"
+
+#~ msgid "purple #2"
+#~ msgstr "ç´« #2"
+
+#~ msgid "very dark gray"
+#~ msgstr "ã?¨ã?¦ã??æ??ã??ç?°"
+
+#~ msgid "red-orange"
+#~ msgstr "èµ¤ã?¿ã?®æ©?"
+
+#~ msgid "dull blue"
+#~ msgstr "ã??ã??ã??ã? é??"
+
+#~ msgid "dull purple"
+#~ msgstr "ã??ã??ã??ã? ç´«"
+
+#~ msgid "dark grey"
+#~ msgstr "æ??ã??ç?°"
+
+#~ msgid "lime"
+#~ msgstr "ã?©ã?¤ã? "
+
+#~ msgid "dull blue #2"
+#~ msgstr "ã??ã??ã??ã? é?? #2"
+
+#~ msgid "sky blue #2"
+#~ msgstr "ã?¹ã?«ã?¤ã??ã?«ã?¼ #2"
+
+#~ msgid "gray"
+#~ msgstr "ç?°"
+
+#~ msgid "magenta"
+#~ msgstr "ã??ã?¼ã?³ã?¿"
+
+#~ msgid "bright orange"
+#~ msgstr "æ??ã??ã??æ©?"
+
+#~ msgid "bright blue"
+#~ msgstr "æ??ã??ã??é??"
+
+#~ msgid "red purple"
+#~ msgstr "èµ¤ç´«"
+
+#~ msgid "light grey"
+#~ msgstr "æ·¡ã??ç?°"
+
+#~ msgid "light orange"
+#~ msgstr "æ·¡ã??æ©?"
+
+#~ msgid "light blue"
+#~ msgstr "æ·¡ã??é??"
+
+#~ msgid "light purple"
+#~ msgstr "æ·¡ã??ç´«"
+
+#~ msgid "purplish blue"
+#~ msgstr "ç´«ã?¿ã?®é??"
+
+#~ msgid "dark purple"
+#~ msgstr "æ??ã??ç´«"
+
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>ã?©ã??ã?«ã?®å??ã??</b>"
+
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>ã?¡ã??ã?£ã?¢ã?®ç¨®é¡?</b>"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Xxx ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?ã??ã??ã?£</span>"
+
+#~ msgid "Select A File"
+#~ msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?®å??æ??å?¤</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">å¡?ã??ã?¤ã?¶ã??</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">ç·?</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">æ??å?</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">å??ä½?</span>"
+
+#~ msgid "<b>Print control (Merge)</b>"
+#~ msgstr "<b>å?°å?·ã?®å?¶å¾¡ (çµ?å??)</b>"
+
+#~ msgid "<b>Print control (Simple)</b>"
+#~ msgstr "<b>å?°å?·ã?®å?¶å¾¡ (ç°¡æ??)</b>"
+
+#~ msgid "Text Color"
+#~ msgstr "æ??å?ã?®è?²"
+
+#~ msgid "cd_size_page"
+#~ msgstr "cd_size_page"
+
+#~ msgid "finish_page"
+#~ msgstr "finish_page"
+
+#~ msgid "layout_page"
+#~ msgstr "layout_page"
+
+#~ msgid "nlayouts_page"
+#~ msgstr "nlayouts_page"
+
+#~ msgid "pg_size_page"
+#~ msgstr "pg_size_page"
+
+#~ msgid "rect_size_page"
+#~ msgstr "rect_size_page"
+
+#~ msgid "round_size_page"
+#~ msgstr "round_size_page"
+
+#~ msgid "shape_page"
+#~ msgstr "shape_page"
+
+#~ msgid "start_page"
+#~ msgstr "start_page"
+
+#~ msgid "Search all templates"
+#~ msgstr "å?¨ã?¦ã?®ã??ã?³ã??ã?¬ã?¼ã??ã??ã??æ¤?ç´¢ã??ã??"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `%s` ã?¯ã??ã??ã?¾ã??ã?§ã??\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `--%s` ã?¯å¼?æ?°ã??å??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `%c%s` ã?¯å¼?æ?°ã??å??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?® `%s` ã?«ã?¯å¼?æ?°ã??å¿?è¦?ã?§ã??\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: èª?è?ã?§ã??ã?ªã??ã?ªã??ã?·ã?§ã?³ `--%s`\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: èª?è?ã?§ã??ã?ªã??ã?ªã??ã?·ã?§ã?³ `%c%s`\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ä¸?æ£ã?ªã?ªã??ã?·ã?§ã?³-- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: ä¸?æ£ã?ªã?ªã??ã?·ã?§ã?³ -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: ã?ªã??ã?·ã?§ã?³ã?«ã?¯å¼?æ?°ã??å¿?è¦?ã?§ã?? -- %c\n"
diff --git a/po/ko.po b/po/ko.po
index f908f70..fb7feca 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels 2.3. pre0svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-15 18:13-0400\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2008-02-26 10:59+0900\n"
 "Last-Translator: YunSeok Choi <xein naver com>\n"
 "Language-Team: none\n"
@@ -13,2007 +13,2401 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/glabels.c:55
-msgid "Show view debugging messages."
-msgstr "ë³´ê¸°ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (ì??ì??)"
 
-#: src/glabels.c:58
-msgid "Show item debugging messages."
-msgstr "ì??ì?´í?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (ZIPë§?)"
 
-#: src/glabels.c:61
-msgid "Show printing debugging messages."
-msgstr "ì?¸ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP+4)"
 
-#: src/glabels.c:64
-msgid "Show prefs debugging messages."
-msgstr "Prefs ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
 
-#: src/glabels.c:67
-msgid "Show file debugging messages."
-msgstr "í??ì?¼ ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr ""
 
-#: src/glabels.c:70
-msgid "Show document debugging messages."
-msgstr "ë¬¸ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (ì??ì??)"
 
-#: src/glabels.c:73
-msgid "Show template debugging messages."
-msgstr "Template ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
 
-#: src/glabels.c:76
-msgid "Show paper debugging messages."
-msgstr "Paper ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
 
-#: src/glabels.c:79
-msgid "Show xml debugging messages."
-msgstr "XML ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
 
-#: src/glabels.c:82
-msgid "Show document merge debugging messages."
-msgstr "Document ì?¬ë°± ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
 
-#: src/glabels.c:85
-msgid "Show commands debugging messages."
-msgstr "Command ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
 
-#: src/glabels.c:88
-msgid "Show undo debugging messages."
-msgstr "Undo ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
 
-#: src/glabels.c:91
-msgid "Show recent debugging messages."
-msgstr "ìµ?ê·¼ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A ë??ë?? UPC-E)"
 
-#: src/glabels.c:94
-msgid "Show window debugging messages."
-msgstr "ì??ë??ì?° ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
 
-#: src/glabels.c:97
-msgid "Show ui debugging messages."
-msgstr "GUI ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
 
-#: src/glabels.c:100
-msgid "Show property_bar debugging messages."
-msgstr "ì??ì?±ë??êµ¬ ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
 
-#: src/glabels.c:103
-msgid "Show media select widget debugging messages."
-msgstr "ì? í?? ì ?í?? ë¯¸ë??ì?´ ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
 
-#: src/glabels.c:106
-msgid "Show mini preview widget debugging messages."
-msgstr "ì ?í?? ì??ê²? ë¯¸ë¦¬ë³´ê¸° ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
 
-#: src/glabels.c:109
-msgid "Show pixbuf cache debugging messages."
-msgstr "pixbuf cache ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
 
-#: src/glabels.c:112
-msgid "Show widget debugging messages."
-msgstr "ì ?í?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
 
-#: src/glabels.c:115
-msgid "Show object editor debugging messages."
-msgstr "ê°?ì±? í?¸ì§?ê¸° ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
 
-#: src/glabels.c:118
-msgid "Turn on all debugging messages."
-msgstr "ëª¨ë?  ë??ë²?ê¹? ë©?ì??ì§? ì¼?ê¸°"
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Code 39"
 
-#: src/glabels.c:187
-msgid "Could not initialize Bonobo!\n"
-msgstr "Bonobo ì´?ê¸°í?? í?  ì?? ì??ì??ï¼?\n"
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Code 128"
 
-#: src/glabels-batch.c:48
-msgid "print this message"
-msgstr "ì?´ ë©?ì??ì§?ë¥¼ ì?¸ì??"
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Code 128C"
 
-#: src/glabels-batch.c:50
-msgid "print the version of glabels-batch being used"
-msgstr "gLabel-batch ë²?ì ? ì?¸ì??"
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Code 128B"
 
-#: src/glabels-batch.c:52
-msgid "set output filename (default=\"output.ps\")"
-msgstr "ì¶?ë ¥ í??ì?¼ì?´ë¦? ì§?ì ? (ê¸°ë³¸ = \"output.ps\")"
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "Interleaved 2 of 5"
 
-#: src/glabels-batch.c:52
-msgid "filename"
-msgstr "í??ì?¼ì?´ë¦?"
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
 
-#: src/glabels-batch.c:54
-msgid "number of sheets (default=1)"
-msgstr "ì?©ì§? ì??(ê¸°ë³¸= 1)"
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
 
-#: src/glabels-batch.c:54
-msgid "sheets"
-msgstr "ì?©ì§?"
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
 
-#: src/glabels-batch.c:56
-msgid "number of copies (default=1)"
-msgstr "ë³µì?¬ ì??(ê¸°ë³¸= 1)"
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
 
-#: src/glabels-batch.c:56
-msgid "copies"
-msgstr "ë³µì?¬"
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
 
-#: src/glabels-batch.c:58
-#: src/print-dialog.c:336
-msgid "print outlines (to test printer alignment)"
-msgstr "ì?¸ê³½ì?  ì?¸ì?? (í??ë¦°í?° ì ?ë ¬ í??ì?¤í?¸)"
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
 
-#: src/glabels-batch.c:60
-#: src/print-dialog.c:344
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "ê±°ê¾¸ë¡? ì?¸ì?? (ê±°ì?¸ í?¨ê³¼)"
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
 
-#: src/glabels-batch.c:96
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr "[ì?µì??...] gLabels í??ì?¼..."
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
 
-#: src/glabels-batch.c:116
-#, c-format
-msgid "missing glabels file\n"
-msgstr "gLabel í??ì?¼ì?´ ë³´ì?´ì§? ì??ì??\n"
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
 
-#: src/glabels-batch.c:157
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "gLabel í??ì?¼  %s ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤.\n"
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
 
-#: src/window.c:244
-msgid "(none) - gLabels"
-msgstr "(ì??ì??) - gLabels"
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
 
-#: src/window.c:414
-msgid "(modified)"
-msgstr "(ì??ì ?ë?¨)"
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
 
-#: src/stock.c:65
-#: data/ui/glabels-ui.xml.h:165
-msgid "_Select Mode"
-msgstr "ëª¨ë?? ì? í??(_S)"
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
 
-#: src/stock.c:66
-#: data/ui/glabels-ui.xml.h:166
-msgid "_Text"
-msgstr "ê¸?ì??(_T)"
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
 
-#: src/stock.c:67
-#: data/ui/glabels-ui.xml.h:151
-msgid "_Line"
-msgstr "ì? (_L)"
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
 
-#: src/stock.c:68
-#: data/ui/glabels-ui.xml.h:133
-msgid "_Box"
-msgstr "ì?¬ê°?í??(_B)"
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
 
-#: src/stock.c:69
-#: data/ui/glabels-ui.xml.h:144
-msgid "_Ellipse"
-msgstr "í??ì??(_E)"
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
 
-#: src/stock.c:70
-#: data/ui/glabels-ui.xml.h:149
-msgid "_Image"
-msgstr "ê·¸ë¦¼(_I)"
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
 
-#: src/stock.c:71
-#: data/ui/glabels-ui.xml.h:11
-msgid "Bar_code"
-msgstr "ë°?ì½?ë??(_C)"
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
 
-#: src/stock.c:72
-msgid "_Merge Properties"
-msgstr "ì?¬ë°± ì??ì?±(_M)"
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
 
-#: src/stock.c:73
-msgid "Object _Properties"
-msgstr "í?ëª© ì??ì?±(_P)"
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
 
-#: src/stock.c:74
-#: data/ui/glabels-ui.xml.h:13
-msgid "Bring to _Front"
-msgstr "ì??ì?¼ë¡? ë?´ê¸°(_F)"
+#: ../src/bc.c:225
+msgid "Data Matrix"
+msgstr ""
 
-#: src/stock.c:75
-#: data/ui/glabels-ui.xml.h:110
-msgid "Send to _Back"
-msgstr "ë?¤ë¡? ë³´ë?´ê¸°(_B)"
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
 
-#: src/stock.c:76
-#: data/ui/glabels-ui.xml.h:97
-msgid "Rotate _Left"
-msgstr "ì?¼ìª½ì?¼ë¡? í??ì ?(_L)"
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
 
-#: src/stock.c:77
-#: data/ui/glabels-ui.xml.h:98
-msgid "Rotate _Right"
-msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? í??ì ?(_R)"
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
 
-#: src/stock.c:78
-#: data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
-msgstr "ì??ì§? ë?¤ì§?ê¸°(_H)"
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
 
-#: src/stock.c:79
-#: data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
-msgstr "ì??í?? ë?¤ì§?ê¸°(_V)"
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
 
-#: src/stock.c:80
-#: data/ui/glabels-ui.xml.h:150
-msgid "_Lefts"
-msgstr "ì¢?ì¸¡(_L)"
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
 
-#: src/stock.c:81
-#: data/ui/glabels-ui.xml.h:162
-msgid "_Rights"
-msgstr "ì?°ì¸¡(_R)"
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
 
-#: src/stock.c:82
-#: data/ui/glabels-ui.xml.h:134
-msgid "_Centers"
-msgstr "ì¤?ì??(_C)"
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
 
-#: src/stock.c:83
-#: data/ui/glabels-ui.xml.h:167
-msgid "_Tops"
-msgstr "ì??ì??(_T)"
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
 
-#: src/stock.c:84
-msgid "Bottoms"
-msgstr "í??ì??"
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr "ì¤?ì??"
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
 
-#: src/stock.c:86
-#: src/stock.c:87
-#: data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
-msgstr "ë?¼ë²¨ ì¤?ì??(_N)"
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
 
-#: src/stock.c:88
-#: data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
-msgstr "ì?? ì±?ì?°ê¸°"
+#: ../src/bc.c:270
+msgid "HIBC Data Matrix"
+msgstr ""
 
-#: src/stock.c:89
-#: data/ui/glabels-ui.xml.h:64
-msgid "Line color"
-msgstr "ì?  ì??ì??"
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
 
-#: src/stock.c:90
-#: src/stock.c:92
-msgid "Linked"
-msgstr "ì?°ê²°"
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
 
-#: src/stock.c:91
-#: src/stock.c:93
-msgid "Not Linked"
-msgstr "ì?°ê²°ë??ì§? ì??ì??"
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
 
-#: src/ui-property-bar.c:345
-#: src/object-editor.c:499
-msgid "Default"
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+msgid "PLANET"
+msgstr ""
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "ë¶?ì?´ê¸°"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "ë°?ì½?ë??(_C)"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "ì?ì ?"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
 msgstr "ê¸°ë³¸"
 
-#: src/ui-property-bar.c:360
-#: src/object-editor.c:512
-msgid "No fill"
-msgstr "ì±?ì?°ê¸° ì??ì??"
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "ì?´ë??ì?´ ë¹¨ê°?ì??"
 
-#: src/ui-property-bar.c:375
-#: src/object-editor.c:505
-msgid "No line"
-msgstr "ì?  ì??ì??"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/ui-sidebar.c:180
-msgid "Object properties"
-msgstr "í?ëª© ì??ì?±"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/commands.c:385
-msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "ì?´ë??ì?´ ë?¹ì??"
+
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
 msgstr ""
-"GNOME ì??ì?? Labelê³¼ ëª?í?¨ì?? ì ?ì??í??ë?? í??ë¡?ê·¸ë?¨ì??ë??ë?¤.\n"
-"\n"
-"Glabelsë?? ì??ì? ì??í??í?¸ì?¨ì?´ ì??ë??ë?¤; ì?¬ë?¬ë¶?ì?? ì?´ í??ë¡?ê·¸ë?¨ì?? GNU(General Public License)ì?? ë?°ë?¼ ì??ì? ë¡ê²? ì??ì ? ë°°í?¬ í?  ì?? ì??ì?µë??ë?¤. ì?´ í??ë¡?ê·¸ë?¨ì?? GNUì?? Ver.2 ë¥¼ ë?°ë¥´ê³  ì??ì?µë??ë?¤. \n"
-"\n"
-"ì?´ í??ë¡?ê·¸ë?¨ì?? ì?´ë? í?? ì ?ì??ê¶?ë£? ì??ì?´ ì?¬ì?©ë??ì?´ ì§? ì?? ì??ì?µë??ë?¤.(ë²?ì?ì£¼ : ë²?ì?ì??ë?? GNUë¥¼ ê¹?ì?´ ì??ì§? ëª»í?©ë??ë?¤. ì?´ ë¶?ë¶?ì?? ë²?ì?ì?? ì§?ì ?í??ê³ í?? ë¶?ë¶?ì?´ ì??ë?¤ë©´ ë²?ì? ì??ë£?ì?? í?¨ê»? ì?°ë?½ì£¼ì?ì??ì?¤. xein naver com)\n"
 
-#: src/commands.c:399
-msgid "See the file AUTHORS for additional credits,"
-msgstr "ì°¸ì?¬ ì ?ì??ì?? AUTHORS í??ì?¼ì?? ë³´ì?¸ì??."
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
-msgstr "ë??ë?? ì?´ê³³ì?? ë°©ë¬¸ í??ì?¸ì??. http://glabels.sourceforge.net/";
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "ì?´ë??ì?´ í??ë??ì??"
 
-#: src/commands.c:409
-msgid " "
-msgstr " "
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "ì?¬ì?¤í??"
 
-#: src/commands.c:424
-msgid "glabels"
-msgstr "gLabels"
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "ì?¤ë ?ì§?ì??"
 
-#: src/file.c:100
-msgid "New Label or Card"
-msgstr "ì?? ë?¼ë²¨ ë??ë?? ì¹´ë??"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
 
-#: src/file.c:132
-#: src/file.c:304
-msgid "Media Type"
-msgstr "ë§¤ì²´ í??ì??"
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "í??í?? ë?¹ì??"
 
-#: src/file.c:138
-#: src/file.c:310
-msgid "Label orientation"
-msgstr "ë?¼ë²¨ì?? ë°©í?¥"
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
+
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "í??ë??ì??"
+
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "ì??ì£¼ì??"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
+
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "ê¸?ì??"
+
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "ë?¸ë??ì??"
 
-#: src/file.c:269
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "ë?¹ì??"
+
+#: ../src/color-combo-menu.c:103
+#, fuzzy
+msgid "Cyan"
+msgstr "ì²ë¡?ì??"
+
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "í??ë??ì??"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
+
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "ë¶?í??ì??"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
+
+#: ../src/color-combo-menu.c:109
+#, fuzzy
+msgid "Light Yellow"
+msgstr "ê°?ë²¼ì?´ ë?¸ë??ì??"
+
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "ê°?ë²¼ì?´ ë?¹ì??"
+
+#: ../src/color-combo-menu.c:111
+#, fuzzy
+msgid "Light Cyan"
+msgstr "ê°?ë²¼ì?´ ì²ë¡?ì??"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:113
+#, fuzzy
+msgid "Thistle"
+msgstr "í?°ì??"
+
+#: ../src/color-combo-menu.c:115
+#, fuzzy
+msgid "White"
+msgstr "í?°ì??"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr ""
+
+#: ../src/color-combo-menu.c:126
+#, fuzzy
+msgid "Black"
+msgstr "ê²?ì??ì??"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+#, fuzzy
+msgid "Custom Color"
+msgstr "ì??ì??ì?? ì??ì??:"
+
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "ì??ì??ì?? ì??ì??:"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr ""
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "ì?? ë?¼ë²¨ ë??ë?? ì¹´ë??"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "ë?¼ë²¨ ì??ì?±"
 
-#: src/file.c:452
-#: src/file.c:870
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr "ëª¨ë?  í??ì?¼"
 
-#: src/file.c:457
-#: src/file.c:875
+#: ../src/file.c:272 ../src/file.c:562
 msgid "gLabels documents"
 msgstr "gLabels ë¬¸ì??"
 
-#: src/file.c:505
-#: src/file.c:617
-#: src/file.c:934
-#: src/file.c:1130
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
 msgstr "ë¹?ì?´ì??ë?? í??ì?¼ ì?´ë¦?"
 
-#: src/file.c:506
-#: src/file.c:520
-#: src/file.c:618
-#: src/file.c:632
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
 msgstr "ì§?ì??í??ë?? í??ì?¼ì?? ì? í??í??ì?¸ì??."
 
-#: src/file.c:519
-#: src/file.c:631
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "í??ì?¼ì?´ ì??ì?µë??ë?¤."
 
-#: src/file.c:563
-#: data/ui/glabels-ui.xml.h:75
-msgid "Open"
-msgstr "ì?´ê¸°"
-
-#: src/file.c:565
-msgid "Open label"
-msgstr "ë?¼ë²¨ ì?´ê¸°"
-
-#: src/file.c:707
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "\"%s\" í??ì?¼ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: src/file.c:715
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr "ì§?ì??ë??ì§? ì??ë?? í??ì?¼ í??ì??"
 
-#: src/file.c:797
-#: src/file.c:979
-#: src/file.c:1174
+#: ../src/file.c:491 ../src/file.c:670
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "\"%s\" í??ì?¼ì?? ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: src/file.c:805
-#: src/file.c:987
-#: src/file.c:1182
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "ì ?ì?¥í??ë??ë?° ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤. í??ì?¼ì?? ì ?ì?¥í??ì§? ëª»í??ì?µë??ë?¤."
 
-#: src/file.c:848
-#: src/file.c:1048
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "\"%s\" ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
 
-#: src/file.c:935
-#: src/file.c:1131
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr "ì? í?¨í?? í??ì?¼ì?´ë¦?ì?´ í??ì??í?©ë??ë?¤."
 
-#: src/file.c:952
-#: src/file.c:1147
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "\"%s\"í??ì?¼ì?´ë¦?ì?¼ë¡? ë?®ì?´ì?°ì??ê² ì?µë??ê¹??"
 
-#: src/file.c:960
-#: src/file.c:1155
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr "í??ì?¼ì?´ë¦?ì?´ ì¡´ì?¬í?©ë??ë?¤."
 
-#: src/file.c:1271
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "ë?«ê¸°ì ?ì?? ë°?ë??ë¶?ë¶?ì?? \"%s\"ì?´ë¦?ì?¼ë¡? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: src/file.c:1279
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr "ì ?ì?¥í??ì§? ì??ì?¼ë©´, ë°?ë??ë¶?ë¶?ì?? ì??ì?´ë²?ë¦¬ê²? ë?©ë??ë?¤."
 
-#: src/file.c:1282
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "ì ?ì?¥ì??ì?´ ë?«ê¸°"
 
-#. Should not happen
-#: src/prefs.c:156
-#: src/prefs.c:163
-#: data/glade/prefs-dialog.glade.h:23
-#: data/glade/object-editor.glade.h:37
-msgid "points"
-msgstr "í?¬ì?¸í?¸"
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
 
-#: src/prefs.c:158
-#: data/glade/object-editor.glade.h:36
-#: data/glade/template-designer.glade.h:74
-msgid "inches"
-msgstr "[ì?¸ì¹?]"
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
 
-#: src/prefs.c:160
-msgid "mm"
-msgstr "[ë°?ë¦¬ë¯¸í?°]"
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
 
-#: src/prefs-dialog.c:248
-#: data/glade/prefs-dialog.glade.h:22
-msgid "gLabels Preferences"
-msgstr "gLabels í??ê²½ì?¤ì ?"
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "ëª¨ë?  í??ì?¼"
 
 #.
-#. * Submenu: Order
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
 #.
-#: src/view.c:3570
-#: data/ui/glabels-ui.xml.h:157
-msgid "_Order"
-msgstr "ì??ì??(_O)"
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
 
-#.
-#. * Submenu: Rotate/Flip
-#.
-#: src/view.c:3591
-#: data/ui/glabels-ui.xml.h:163
-msgid "_Rotate/Flip"
-msgstr "í??ì ?/ë?¤ì§?ê¸°(_R)"
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
 
-#.
-#. * Submenu: Align Horizontally
-#.
-#: src/view.c:3624
-msgid "Align _Horizontally"
-msgstr "ê°?ë¡?ë¡? ì ?ë ¬(_H)"
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
 
-#.
-#. * Submenu: Align Vertically
-#.
-#: src/view.c:3663
-msgid "Align _Vertically"
-msgstr "ì?¸ë¡?ë¡? ì ?ë ¬(_V)"
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
 
-#: src/view.c:3724
-#: data/ui/glabels-ui.xml.h:140
-msgid "_Delete"
-msgstr "ì?ì ?(_D)"
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
 
-#. Build editor.
-#: src/view-box.c:223
-msgid "Box object properties"
-msgstr "ì?¬ê°?í?? ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:53
+#, fuzzy
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "ì¶?ë ¥ í??ì?¼ì?´ë¦? ì§?ì ? (ê¸°ë³¸ = \"output.ps\")"
 
-#. Build editor.
-#: src/view-ellipse.c:223
-msgid "Ellipse object properties"
-msgstr "í??ì?? ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
+msgid "filename"
+msgstr "í??ì?¼ì?´ë¦?"
 
-#. Build editor.
-#: src/view-line.c:223
-msgid "Line object properties"
-msgstr "ì?  ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:55
+msgid "number of sheets (default=1)"
+msgstr "ì?©ì§? ì??(ê¸°ë³¸= 1)"
 
-#. Build editor.
-#: src/view-image.c:222
-msgid "Image object properties"
-msgstr "ê·¸ë¦¼ ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:55
+msgid "sheets"
+msgstr "ì?©ì§?"
 
-#. Build editor.
-#: src/view-text.c:250
-msgid "Text object properties"
-msgstr "ê¸?ì?? ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:57
+msgid "number of copies (default=1)"
+msgstr "ë³µì?¬ ì??(ê¸°ë³¸= 1)"
 
-#: src/view-text.c:562
-#: data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "ê¸?ì??"
+#: ../src/glabels-batch.c:57
+msgid "copies"
+msgstr "ë³µì?¬"
 
-#. Build editor.
-#: src/view-barcode.c:209
-msgid "Barcode object properties"
-msgstr "ë°?ì½?ë?? ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:59
+#, fuzzy
+msgid "first label on first sheet (default=1)"
+msgstr "ì?©ì§? ì??(ê¸°ë³¸= 1)"
 
-#: src/view-barcode.c:579
-#: src/print.c:1088
-msgid "Invalid barcode data"
-msgstr "ì??ëª»ë?? ë°?ì½?ë?? ë?°ì?´í?°"
+#: ../src/glabels-batch.c:59
+msgid "first"
+msgstr ""
 
-#: src/merge-properties-dialog.c:231
-msgid "Merge Properties"
-msgstr "ì?¬ë°± ì??ì?±"
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "ì?¸ê³½ì?  ì?¸ì?? (í??ë¦°í?° ì ?ë ¬ í??ì?¤í?¸)"
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "ì??ì?¤"
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "ê±°ê¾¸ë¡? ì?¸ì?? (ê±°ì?¸ í?¨ê³¼)"
 
-#: src/merge-properties-dialog.c:245
-msgid "Format:"
-msgstr "ì??ì??:"
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
+msgstr "ì??ë¥´ê¸° í??ì?? ì?¸ì??"
 
-#. Location line
-#: src/merge-properties-dialog.c:273
-msgid "Location:"
-msgstr "ì?¥ì??:"
+#: ../src/glabels-batch.c:67
+msgid "input file for merging"
+msgstr ""
 
-#: src/merge-properties-dialog.c:282
-#: src/merge-properties-dialog.c:393
-msgid "Select merge-database source"
-msgstr "ë³?í?© ë?°ì?´í?°ë² ì?´ì?¤ ì??ì?¤ ì? í??"
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr ""
 
-#: src/merge-properties-dialog.c:289
-#: src/merge-properties-dialog.c:404
-msgid "N/A"
-msgstr "N/A"
+#: ../src/glabels-batch.c:99
+msgid "Print files created with gLabels."
+msgstr ""
 
-#. ---- Sample Fields section ----
-#: src/merge-properties-dialog.c:300
-msgid "Record selection/preview:"
-msgstr "ì? í?? ê¸°ë¡?/ë¯¸ë¦¬ë³´ê¸°:"
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "ì? í??"
+#: ../src/glabels-batch.c:151
+#, fuzzy, c-format
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "gLabel í??ì?¼  %s ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤.\n"
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
-msgstr "ê¸°ë¡?/ë²?ì??"
+#: ../src/glabels-batch.c:186
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "gLabel í??ì?¼  %s ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤.\n"
 
-#: src/merge-properties-dialog.c:342
-#: data/glade/object-editor.glade.h:9
-msgid "Data"
-msgstr "ë?°ì?´í?°"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr ""
 
-#: src/print-dialog.c:266
-#: data/ui/glabels-ui.xml.h:82
-msgid "Print"
-msgstr "ì?¸ì??"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "ë°?ì½?ë?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/print-dialog.c:281
-msgid "_Job"
-msgstr "ì??ì??(_J)"
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "ë°?ì½?ë??(_C)"
 
-#: src/print-dialog.c:286
-msgid "P_rinter"
-msgstr "í??ë¦°í?°(_R)"
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "ë°?ì½?ë?? ê°?ì²´ ì??ì?±"
 
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:314
-msgid "Copies"
-msgstr "ë§¤ì??"
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr ""
 
-#. ------- Add merge control widget ------------
-#: src/print-dialog.c:322
-msgid "Document merge control"
-msgstr "ë¬¸ì?? ì?¬ë°± ì ?ì?´"
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "ì??ëª»ë?? ë°?ì½?ë?? ë?°ì?´í?°"
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "ì?µì??"
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "ê¸?ì?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/print-dialog.c:351
-msgid "print crop marks"
-msgstr "ì??ë¥´ê¸° í??ì?? ì?¸ì??"
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "ì?? ì±?ì?°ê¸°"
 
-#: src/print-dialog.c:553
-#: src/print-dialog.c:592
-msgid "Print preview"
-msgstr "ì?¸ì?? ë¯¸ë¦¬ë³´ê¸°"
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "ì?  ì??ì??"
 
-#: src/template-designer.c:409
-#: data/glade/template-designer.glade.h:73
-msgid "gLabels Template Designer"
-msgstr "gLabels ì??ì?? ë??ì??ì?´ë??"
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "ì?  ë??ì?´"
 
-#: src/bc.c:60
-msgid "POSTNET (any)"
-msgstr "POSTNET (ì??ì??)"
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "ì ?ëª©ì??ì??"
 
-#: src/bc.c:63
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (ZIPë§?)"
+#: ../src/label.c:705 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "ì?¬ë°± ì??ì?±"
 
-#: src/bc.c:66
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP+4)"
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "ì?ì ?"
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
+#: ../src/label.c:1230 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "ì??ì?¼ë¡? ë?´ê¸°(_F)"
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr "EAN (ì??ì??)"
+#: ../src/label.c:1266 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "ë?¤ë¡? ë³´ë?´ê¸°(_B)"
 
-#: src/bc.c:75
-msgid "EAN-8"
-msgstr "EAN-8"
+#: ../src/label.c:1307
+msgid "Rotate"
+msgstr "í??ì ?"
 
-#: src/bc.c:78
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
+#: ../src/label.c:1342 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "ì?¼ìª½ì?¼ë¡? í??ì ?(_L)"
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
+#: ../src/label.c:1375 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? í??ì ?(_R)"
 
-#: src/bc.c:84
-msgid "EAN-13"
-msgstr "EAN-13"
+#: ../src/label.c:1410 ../src/ui.c:352
+#, fuzzy
+msgid "Flip horizontally"
+msgstr "ì??ì§? ë?¤ì§?ê¸°(_H)"
 
-#: src/bc.c:87
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
+#: ../src/label.c:1445 ../src/ui.c:359
+#, fuzzy
+msgid "Flip vertically"
+msgstr "ì??í?? ë?¤ì§?ê¸°(_V)"
 
-#: src/bc.c:90
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
+#: ../src/label.c:1485 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "ì??ì¹?:"
 
-#: src/bc.c:93
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A ë??ë?? UPC-E)"
+#: ../src/label.c:1542 ../src/ui.c:373
+#, fuzzy
+msgid "Align right"
+msgstr "ì?¸ë¡?ë¡? ì ?ë ¬(_H)"
 
-#: src/bc.c:96
-msgid "UPC-A"
-msgstr "UPC-A"
+#: ../src/label.c:1603 ../src/ui.c:380
+#, fuzzy
+msgid "Align horizontal center"
+msgstr "ê°?ì²´ ì?¸ë¡? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: src/bc.c:99
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
+#: ../src/label.c:1679 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "ê°?ì²´ ì??ì??ë¡? ì ?ë ¬"
 
-#: src/bc.c:102
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
+#: ../src/label.c:1736 ../src/ui.c:394
+#, fuzzy
+msgid "Align bottoms"
+msgstr "ê°?ì²´ ì??ë??ë¡? ì ?ë ¬"
 
-#: src/bc.c:105
-msgid "UPC-E"
-msgstr "UPC-E"
+#: ../src/label.c:1797 ../src/ui.c:401
+#, fuzzy
+msgid "Align vertical center"
+msgstr "ê°?ì²´ ì??í?? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: src/bc.c:108
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
+#: ../src/label.c:1875 ../src/ui.c:408
+#, fuzzy
+msgid "Center horizontally"
+msgstr "ì??ì§? ê°?ì²´ ë?¤ì§?ê¸°"
 
-#: src/bc.c:111
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
+#: ../src/label.c:1922 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "ì??í?? ê°?ì²´ ë?¤ì§?ê¸°"
 
-#: src/bc.c:114
-msgid "ISBN"
-msgstr "ISBN"
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "ë¶?ì?´ê¸°"
 
-#: src/bc.c:117
-msgid "ISBN +5"
-msgstr "ISBN +5"
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "ì?  ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/bc.c:120
-msgid "Code 39"
-msgstr "Code 39"
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "ê·¸ë¦¼ ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/bc.c:123
-msgid "Code 128"
-msgstr "Code 128"
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "ê·¸ë¦¼í?¬ê¸° ì?¬ì?¤ì ?"
 
-#: src/bc.c:126
-msgid "Code 128C"
-msgstr "Code 128C"
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "ì?  ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/bc.c:129
-msgid "Code 128B"
-msgstr "Code 128B"
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
 
-#: src/bc.c:132
-msgid "Interleaved 2 of 5"
-msgstr "Interleaved 2 of 5"
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "ì?©ì§? í?¬ê¸°:"
 
-#: src/bc.c:135
-msgid "Codabar"
-msgstr "Codabar"
+#: ../src/label-object.c:1185
+msgid "Shadow state"
+msgstr ""
 
-#: src/bc.c:138
-msgid "MSI"
-msgstr "MSI"
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
+msgstr ""
 
-#: src/bc.c:141
-msgid "Plessey"
-msgstr "Plessey"
+#: ../src/label-object.c:1276
+msgid "Shadow color"
+msgstr ""
 
-#: src/label.c:569
-msgid "Untitled"
-msgstr "ì ?ëª©ì??ì??"
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
+msgstr ""
 
-#: src/xml-label.c:176
-#: src/xml-label.c:213
-msgid "xmlParseFile error"
-msgstr "xmlParseí??ì?¼ ì?¤ë¥?"
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "ê¸?ì?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/xml-label.c:250
-msgid "No document root"
-msgstr "root ë¬¸ì??ê°? ì??ë??"
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "ë¶?í??ì??"
 
-#: src/xml-label.c:264
-msgid "Importing from glabels 0.1 format"
-msgstr "gLabels 0.1ë¡? ë¶?í?° ê°?ì ¸ì?¤ê¸°"
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "ê¸?ê¼´"
 
-#: src/xml-label.c:272
-msgid "Importing from glabels 0.4 format"
-msgstr "gLabels 0.4ë¡? ë¶?í?° ê°?ì ¸ì?¤ê¸°"
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "ê¸?ê¼´ í?¬ê¸°"
 
-#: src/xml-label.c:279
-msgid "Importing from glabels 1.91 format"
-msgstr "gLabels 1.91ë¡? ë¶?í?° ê°?ì ¸ì?¤ê¸°"
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "ê¸?ê¼´"
 
-#: src/xml-label.c:282
-msgid "bad document, unknown glabels Namespace"
-msgstr "ì??ëª»ë?? ë¬¸ì??, ì?? ì?? ì??ë?? Glabels ì?´ë¦?ê³µê°?"
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "ì?´í?¤ë¦"
 
-#: src/xml-label.c:311
-#: src/xml-label-04.c:75
-#: src/xml-label-191.c:131
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "ì??ëª»ë?? Root ë?¸ë?? = \"%s\""
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "ì??ì¹?:"
 
-#: src/xml-label.c:348
-#: src/xml-label-191.c:165
-#, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "ë¬¸ì?? ë?¸ë?? ë?´ì?? ì??ëª»ë?? ë?¸ë?? = \"%s\""
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "í??ê°?:"
 
-#: src/xml-label.c:393
-#: src/xml-label-04.c:123
-#: src/xml-label-191.c:197
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "ì??ëª»ë?? ë?¸ë?? = \"%s\""
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "ê¸?ì?? ì??ì??"
 
-#: src/xml-label.c:796
-#: src/xml-label-191.c:605
-#, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "ë?°ì?´í?° ë?¸ë?? ë?´ì?? ì??ëª»ë?? ë?¸ë?? = \"%s\""
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
 
-#: src/xml-label.c:962
-#: libglabels/xml-template.c:535
-msgid "Utf8 conversion error."
-msgstr "Utf8 ë³?í?? ì??ë?¬"
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+msgctxt "Brand"
+msgid "Any"
+msgstr ""
 
-#: src/xml-label.c:969
-#: libglabels/xml-template.c:542
-msgid "Problem saving xml file."
-msgstr "XML í??ì?¼ ì ?ì?¥ì?? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
+msgstr ""
 
-#. This should always be an id, but just in case a name
-#. slips by!
-#: src/xml-label-191.c:680
-#: libglabels/xml-template.c:199
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
-msgstr "ì?? ì?? ì??ë?? ì?©ì§? í?¬ê¸° ID \"%s\"ã??å??å??ã?¨ã??ã?¦æ?±ã??ã?¾ã??ã??"
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
+msgstr ""
 
-#: src/xml-label-191.c:690
-#: libglabels/xml-template.c:209
-#, c-format
-msgid "Unknown page size id or name \"%s\""
-msgstr "ì?? ì?? ì??ë?? ì?©ì§? í?¬ê¸° ID ë??ë?? ì?´ë¦? \"%s\""
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "ì??ì??í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr ""
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "ì??ì??í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
 
-#: src/merge.c:172
-#: src/merge.c:213
-#: src/merge.c:399
-#: src/merge.c:402
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
 msgstr "ì??ì??"
 
-#: src/merge-init.c:53
-msgid "Text file with comma delimeters (CSV)"
-msgstr "ì½¤ë§?ë¡? êµ¬ë¶?ë?? í??ì?¤í?¸í??ì?¼(CSV)"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr ""
 
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
-msgstr "ì½?ë¡ ì?¼ë¡? êµ¬ë¶?ë?? í??ì?¤í?¸ í??ì?¼"
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+#, fuzzy
+msgid "Couldn't open addressbook."
+msgstr "\"%s\" í??ì?¼ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: src/merge-init.c:67
-msgid "Text file with tab delimeters"
-msgstr "í??ì?¼ë¡? êµ¬ë¶?ë?? í??ì?¤í?¸ í??ì?¼"
+#: ../src/merge-evolution.c:348
+#, fuzzy
+msgid "Couldn't list available fields."
+msgstr "\"%s\" í??ì?¼ì?? ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: src/wdgt-image-select.c:201
-#: data/glade/object-editor.glade.h:11
-msgid "File:"
-msgstr "í??ì?¼:"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr ""
 
-#: src/wdgt-image-select.c:245
-#: data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "í?¤:"
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "ì?©ì§?:"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "ë?¼ë²¨"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "ë¶?í?°:"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "ì??ê²?:"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr "ë?¼ë²¨ì?? ì??ì??"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "ì²«ë²?ì§¸ ì?©ì§?ì??ì??"
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "ë§¤ì??:"
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "ì ?ë³¸"
+#: ../src/merge-init.c:119
+msgid "Evolution Addressbook"
+msgstr ""
 
-#: src/wdgt-media-select.c:269
-#: data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "ì?¤ëª?:"
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr ""
 
-#: src/wdgt-media-select.c:279
-#: data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "ì?©ì§? í?¬ê¸°:"
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "ì?¬ë°± ì??ì?±"
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "ë?¼ë²¨ í?¬ê¸°:"
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "ë³?í?© ë?°ì?´í?°ë² ì?´ì?¤ ì??ì?¤ ì? í??"
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "ë°°ì¹?:"
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d  (ì?©ì§?ì?? %d)"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "ì? í??"
 
-#: src/wdgt-media-select.c:582
-#, c-format
-msgid "%d per sheet"
-msgstr "ì?©ì§?ì?? %d"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "ê¸°ë¡?/ë²?ì??"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "ë?°ì?´í?°"
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+#, fuzzy
+msgid "Fixed"
+msgstr "í??ì?¼:"
 
-#: src/wdgt-media-select.c:630
-#: src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-msgstr "ì§?ë¦? %s %s"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
 
-#: src/wdgt-media-select.c:634
-#: src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "ì§?ë¦? %.5g %s"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "ëª¨ë?? ì? í??(_S)"
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "í??ì ?"
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "ë?¼ë²¨ì?? ë°©í?¥"
 
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
-msgid "custom"
-msgstr "ì??ì??ì??"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
-msgid "Custom Color:"
-msgstr "ì??ì??ì?? ì??ì??:"
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "ê¸°ë³¸"
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr "ì??ì??ì?? ì??ì?? ì? í??"
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "í?ëª© ì??ì?±"
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-msgstr "ê²?ì??ì??"
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "ì?¬ê°?í?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr "ë°?ì?? ê°?ì??"
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "í??ì?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
-msgstr "ê³ ë??ì??"
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "ì?  ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:582
-msgid "dark green #2"
-msgstr "ì?´ë??ì?´ ë?¹ì?? #2"
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "ê·¸ë¦¼ ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
-msgstr "ë?¨ì??"
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "ê¸?ì?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:584
-#: src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr "ì?´ë??ì?´ í??ë??ì??"
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "ë°?ì½?ë?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr "ì??ì£¼ì?? #2"
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "ë³?í?© í??ë?? ì?½ì??"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr "ë§¤ì?° ì?´ë??ì?´ í??ì??"
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+#, fuzzy
+msgid "No Fill"
+msgstr "ì±?ì?°ê¸° ì??ì??"
 
-#: src/mygal/color-palette.c:589
-#: src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr "ì?´ë??ì?´ ë¹¨ê°?ì??"
+#: ../src/object-editor-image-page.c:278
+#, fuzzy
+msgid "All Files"
+msgstr "ëª¨ë?  í??ì?¼"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
-msgstr "ì ?ì?¤ë ?ì§?ì??"
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "ê·¸ë¦¼"
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr "ê¸?ì??"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr ""
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr "ì?´ë??ì?´ ë?¹ì??"
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+#, fuzzy
+msgid "No Line"
+msgstr "ì?  ì??ì??"
 
-#: src/mygal/color-palette.c:593
-#: src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr "í??í?? í??ë??ì??"
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "gLabels í??ê²½ì?¤ì ?"
 
-#: src/mygal/color-palette.c:594
-#: src/mygal/color-palette.c:647
-msgid "blue"
-msgstr "í??ë??ì??"
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "ë?¼ë²¨"
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr "í??í?? ì??ì£¼ì??"
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "ëª¨ë?? ì? í??(_S)"
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-msgstr "ì?´ë??ì?´ í??ì??"
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "ê¸?ì??(_T)"
 
-#: src/mygal/color-palette.c:599
-msgid "red"
-msgstr "ë¹¨ê°?ì??"
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "ì? (_L)"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr "ì?¤ë ?ì§?ì??"
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "ì?¬ê°?í??(_B)"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr "ë?¼ì??ì??"
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "í??ì??(_E)"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr "í??í?? ë?¹ì??"
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "ê·¸ë¦¼(_I)"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr "í??í?? í??ë??ì??#2"
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "ë°?ì½?ë??(_C)"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr "í??ë??ì?? #2"
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "ì?¬ë°± ì??ì?±(_M)"
 
-#: src/mygal/color-palette.c:605
-#: src/mygal/color-palette.c:644
-msgid "purple"
-msgstr "ì??ì£¼ì??"
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "í?ëª© ì??ì?±(_P)"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr "í??ì??"
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "ì??ì?¼ë¡? ë?´ê¸°(_F)"
 
-#: src/mygal/color-palette.c:609
-#: src/mygal/color-palette.c:641
-msgid "magenta"
-msgstr "ë§?ì  í??ì??"
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "ë?¤ë¡? ë³´ë?´ê¸°(_B)"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
-msgstr "ë°?ì?? ì?¤ë ?ì§?ì??"
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "ì?¼ìª½ì?¼ë¡? í??ì ?(_L)"
 
-#: src/mygal/color-palette.c:611
-#: src/mygal/color-palette.c:642
-msgid "yellow"
-msgstr "ë?¸ë??ì??"
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? í??ì ?(_R)"
 
-#: src/mygal/color-palette.c:612
-msgid "green"
-msgstr "ë?¹ì??"
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "ì??ì§? ë?¤ì§?ê¸°(_H)"
 
-#: src/mygal/color-palette.c:613
-#: src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr "ì²ë¡?ì??"
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "ì??í?? ë?¤ì§?ê¸°(_V)"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr "ë°?ì?? í??ë??ì??"
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "ì¢?ì¸¡(_L)"
 
-#: src/mygal/color-palette.c:615
-#: src/mygal/color-palette.c:632
-msgid "red purple"
-msgstr "ë¹¨ê°? ì??ì£¼ì??"
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "ì?°ì¸¡(_R)"
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
-msgstr "ê°?ë²¼ì?´ í??ì??"
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "ì¤?ì??(_C)"
 
-#: src/mygal/color-palette.c:619
-#: src/mygal/color-palette.c:636
-msgid "pink"
-msgstr "ë¶?í??ì??"
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "ì??ì??(_T)"
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
-msgstr "ê°?ë²¼ì?´ ì?¤ë ?ì§?ì??"
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "í??ì??"
 
-#: src/mygal/color-palette.c:621
-#: src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr "ê°?ë²¼ì?´ ë?¸ë??ì??"
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "ì¤?ì??"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
-msgstr "ê°?ë²¼ì?´ ë?¹ì??"
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "ë?¼ë²¨ ì¤?ì??(_N)"
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
-msgstr "ê°?ë²¼ì?´ ì²ë¡?ì??"
+#: ../src/stock.c:95 ../src/stock.c:97
+msgid "Linked"
+msgstr "ì?°ê²°"
 
-#: src/mygal/color-palette.c:624
-#: src/mygal/color-palette.c:634
-msgid "light blue"
-msgstr "ê°?ë²¼ì?´ ë°?ë??ì??"
+#: ../src/stock.c:96 ../src/stock.c:98
+msgid "Not Linked"
+msgstr "ì?°ê²°ë??ì§? ì??ì??"
 
-#: src/mygal/color-palette.c:625
-#: src/mygal/color-palette.c:638
-msgid "light purple"
-msgstr "ê°?ë²¼ì?´ ì??ì£¼ì??"
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "gLabels ì??ì?? ë??ì??ì?´ë??"
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr "í?°ì??"
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr ""
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
-msgstr "ì??ì£¼ë¹? í??ë??ì??"
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "ì?´ë¦?ê³¼ ì?¤ëª?"
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr "ì?´ë??ì?´ ì??ì£¼ì??"
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "ì?©ì§? í?¬ê¸°"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr "í??ë??ì??"
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë?? ì?¸í??"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr "Generic %s ì ?ë©´ì?? ê±¸ì¹?"
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë?? ì?¸í??"
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "ì??ì??í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "ë?¼ë²¨ í?¬ê¸° (ë?¥ê¸?ê¸°)"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr "ì§?ì ?ì§?ì ?"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "ë?¼ë²¨ í?¬ê¸°(CD/DVD)"
 
-#: libglabels/paper.c:361
-msgid "No paper files found!"
-msgstr "ì?©ì§? í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "ë ?ì?´ì??ì?? ì? í??"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
-msgstr "gLabelsì?? ë??í?´"
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "ë ?ì?´ì??ì??"
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr "ì ?ë³´..."
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "ì??ì?? ë??ì??ì?¸ ì??ë£?ë?¨"
 
-#: data/ui/glabels-ui.xml.h:3
-msgid "Align _Horizontal"
-msgstr "ì?¸ë¡?ë¡? ì ?ë ¬(_H)"
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "gLabels ì??ì?? ë??ì??ì?´ë??"
 
-#: data/ui/glabels-ui.xml.h:4
-msgid "Align _Vertical"
-msgstr "ê°?ë¡?ë¡? ì ?ë ¬(_V)"
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr "ê°?ì²´ ì??ë??ë¡? ì ?ë ¬"
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "í??ì?¼(_F)"
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr "ê°?ì²´ ì?¸ë¡? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr "ê°?ì²´ ì¢?ì¸¡ ê°?ì?¥ì??ë¦¬ë¡? ì ?ë ¬"
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "í?¸ì§?(_E)"
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr "ê°?ì²´ ì?°ì¸¡ ê°?ì?¥ì??ë¦¬ë¡? ì ?ë ¬"
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "ë³´ê¸°(_V)"
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr "ê°?ì²´ ì??ì??ë¡? ì ?ë ¬"
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
+msgstr "ì£¼ ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr "ê°?ì²´ ì??í?? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
+msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr "êµµê²?"
+#: ../src/ui.c:99
+#, fuzzy
+msgid "Customize Properties Toolbar"
+msgstr "ì??ì?± ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
 
-#: data/ui/glabels-ui.xml.h:14
-msgid "Center align"
-msgstr "ì¤?ì?? ì ?ë ¬"
+#: ../src/ui.c:100
+msgid "_Objects"
+msgstr "í?ëª©(_O)"
 
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
-msgstr "ì¤?ì?? ê°?ì²´ë¥¼ ì??ì§?ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
+#: ../src/ui.c:101
+#, fuzzy
+msgid "_Create"
+msgstr "ì¤?ì??(_C)"
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr "ì¤?ì?? ê°?ì²´ë¥¼ ì??í??ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
+#: ../src/ui.c:102
+msgid "_Order"
+msgstr "ì??ì??(_O)"
 
-#: data/ui/glabels-ui.xml.h:17
-msgid "Change the visibility of markup lines in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ë§?í?¬ì?? ì?  ë³?ê²½"
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "í??ì ?/ë?¤ì§?ê¸°(_R)"
 
-#: data/ui/glabels-ui.xml.h:18
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ê·¸ë¦¬ê¸° ë??êµ¬ ë³?ê²½"
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
+msgstr "ì?¸ë¡?ë¡? ì ?ë ¬(_H)"
 
-#: data/ui/glabels-ui.xml.h:19
-msgid "Change the visibility of the grid in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ê·¸ë¦¬ë?? ë³?ê²½"
+#: ../src/ui.c:105
+msgid "Align _Vertical"
+msgstr "ê°?ë¡?ë¡? ì ?ë ¬(_V)"
 
-#: data/ui/glabels-ui.xml.h:20
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ì£¼ ë??êµ¬ ë³?ê²½"
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "ë??ì??ë§?(_H)"
 
-#: data/ui/glabels-ui.xml.h:21
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ì??ì?± ë??êµ¬ ë³?ê²½"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+#, fuzzy
+msgid "Context Menu"
+msgstr "ëª©ì°¨"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr "ë?«ê¸°"
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "ì??ë¡? ë§?ë?¤ê¸°(_N)"
 
-#: data/ui/glabels-ui.xml.h:23
-msgid "Close the current file"
-msgstr "í??ì?¬ í??ì?¼ì?? ë?«ê¸°"
+#: ../src/ui.c:117
+#, fuzzy
+msgid "Create a new file"
+msgstr "ì??ë¡?ì?´ ë¬¸ì?? ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr "gLabel êµ¬ì?±"
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "ì?´ê¸°(_O)..."
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
-msgstr "ëª©ì°¨"
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "í??ì?¼ ì?´ê¸°"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr "ë³µì?¬"
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "ì ?ì?¥(_S)"
 
-#: data/ui/glabels-ui.xml.h:27
-msgid "Copy the selection"
-msgstr "ì? í?? ë³µì?¬"
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "í??ì?¬ í??ì?¼ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
 
-#: data/ui/glabels-ui.xml.h:28
-msgid "Create a custom template"
-msgstr "ì??ì??ì?? ì??ì?? ë§?ë?¤ê¸°"
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥(_A)..."
 
-#: data/ui/glabels-ui.xml.h:29
-msgid "Create a new document"
-msgstr "ì??ë¡?ì?´ ë¬¸ì?? ë§?ë?¤ê¸°"
+#: ../src/ui.c:138
+#, fuzzy
+msgid "Save the current file to a different name"
+msgstr "í??ì?¬í??ì?¼ì?? ë?¤ë¥¸ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "ë°?ì½?ë?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:143
+msgid "_Print..."
+msgstr "ì?¸ì??(_P)..."
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "ì?¬ê°?í??/ì§?ì?¬ê°?í?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:145
+msgid "Print the current file"
+msgstr "í??ì?¬ í??ì?¼ì?? ì?¸ì??"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "í??ì??/ì??í?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:150
+#, fuzzy
+msgid "Properties..."
+msgstr "ì??ì?±(_T)..."
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "ê·¸ë¦¼ ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:152
+msgid "Modify document properties"
+msgstr "ë¬¸ì?? ì??ì?± ê³ ì¹?ê¸°"
 
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
-msgstr "ì?  ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr "ì??ì?? ë??ì??ì?´ë??(_D)..."
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "ê¸?ì?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:159
+msgid "Create a custom template"
+msgstr "ì??ì??ì?? ì??ì?? ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
-msgstr "ì??ë¥´ê¸°(_T)"
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "ë?«ê¸°(_C)"
 
-#: data/ui/glabels-ui.xml.h:37
-msgid "Customize"
-msgstr "ì»¤ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:166
+msgid "Close the current file"
+msgstr "í??ì?¬ í??ì?¼ì?? ë?«ê¸°"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
-msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "ì¢?ë£?(_Q)"
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
-msgstr "ì£¼ ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "gLabelsì?? ì¢?ë£?"
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
-msgstr "ì??ì?± ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "ë??ë??ë¦¬ê¸°"
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
-msgstr "ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr "ì?¬ì?¤í??"
 
-#: data/ui/glabels-ui.xml.h:42
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "ì??ë?¼ë?´ê¸°"
 
-#: data/ui/glabels-ui.xml.h:43
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "ì? í??í??ê²? ì??ë?¼ë?´ê¸°"
 
-#: data/ui/glabels-ui.xml.h:44
-msgid "Decrease magnification"
-msgstr "í??ë?? ê°?ì??"
+#: ../src/ui.c:201
+msgid "Copy"
+msgstr "ë³µì?¬"
 
-#: data/ui/glabels-ui.xml.h:45
-msgid "Delete"
-msgstr "ì?ì ?"
+#: ../src/ui.c:203
+msgid "Copy the selection"
+msgstr "ì? í?? ë³µì?¬"
 
-#: data/ui/glabels-ui.xml.h:46
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
+msgstr "í?´ë¦½ë³´ë??ì?? ë¶?ì?´ê¸°"
+
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "ì? í??í?? ê°?ì²´ ì?ì ?"
 
-#: data/ui/glabels-ui.xml.h:47
-msgid "Drawing toolbar"
-msgstr "ê·¸ë¦¬ê¸° ë??êµ¬"
+#: ../src/ui.c:222
+msgid "Select All"
+msgstr "ëª¨ë?? ì? í??"
 
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
-msgstr "XML ë?¤í??"
+#: ../src/ui.c:224
+msgid "Select all objects"
+msgstr "ëª¨ë?  ê°?ì²´ ì? í??"
 
-#: data/ui/glabels-ui.xml.h:49
-msgid "Dump the GUI Xml description"
-msgstr "GUIì?? XMLì?¤ëª? ë?¤í??"
+#: ../src/ui.c:229
+msgid "Un-select All"
+msgstr "ëª¨ë?  ì? í?? í?´ì ?"
 
-#: data/ui/glabels-ui.xml.h:50
-msgid "Edit merge properties"
-msgstr "ì?¬ë°± ì??ì?± í?¸ì§?"
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "ëª¨ë?  ì? í??ì?¬í? ì?ì ?"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
-msgstr "ì??ì§? ê°?ì²´ ë?¤ì§?ê¸°"
+#: ../src/ui.c:236
+msgid "Preferences"
+msgstr "ì?¤ì ?"
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
-msgstr "ì??í?? ê°?ì²´ ë?¤ì§?ê¸°"
+#: ../src/ui.c:238
+msgid "Configure the application"
+msgstr "gLabel êµ¬ì?±"
 
-#: data/ui/glabels-ui.xml.h:56
-msgid "Font name"
-msgstr "ê¸?ê¼´"
+#: ../src/ui.c:245
+#, fuzzy
+msgid "Zoom in"
+msgstr "í??ë??(_I)"
 
-#: data/ui/glabels-ui.xml.h:57
-msgid "Font selector"
-msgstr "ê¸?ê¼´ ì? í??ê¸°"
+#: ../src/ui.c:247
+msgid "Increase magnification"
+msgstr "ì??ì?¹ í??ë??"
 
-#: data/ui/glabels-ui.xml.h:58
-msgid "Font size"
-msgstr "ê¸?ê¼´ í?¬ê¸°"
+#: ../src/ui.c:252
+#, fuzzy
+msgid "Zoom out"
+msgstr "ì¶?ì??(_O)"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
-msgstr "ì??ì?´ì½?ê³¼ ê¸?ì??(_T)"
+#: ../src/ui.c:254
+msgid "Decrease magnification"
+msgstr "í??ë?? ê°?ì??"
 
-#: data/ui/glabels-ui.xml.h:60
-msgid "Increase magnification"
-msgstr "ì??ì?¹ í??ë??"
+#: ../src/ui.c:259
+#, fuzzy
+msgid "Zoom 1 to 1"
+msgstr "1:1ë¡? í??ë??(_1)"
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
-msgstr "ì?´í?¤ë¦"
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
+msgstr "100%í?¬ê¸°ë¡? ë³µêµ¬"
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
-msgstr "ì?¼ìª½ ì ?ë ¬"
+#: ../src/ui.c:266
+#, fuzzy
+msgid "Zoom to fit"
+msgstr "ë§?ì¶°ì?? í??ë??(_F)"
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
-msgstr "ì?  ë??ì?´"
+#: ../src/ui.c:268
+#, fuzzy
+msgid "Set scale to fit window"
+msgstr "ì??ë??ì?°ì?? ë§?ì¶°ì?? í??ë??"
 
-#: data/ui/glabels-ui.xml.h:66
-msgid "Lower object to bottom"
-msgstr "ê°?ì²´ë¥¼ í??ë?¨ì?¼ë¡? ë?´ë¦¬ê¸°"
+#: ../src/ui.c:275
+#, fuzzy
+msgid "Select Mode"
+msgstr "ëª¨ë?? ì? í??(_S)"
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
-msgstr "ë§?í?¬ì??(_A)"
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "ì? í??, ê°?ì²´ ì?´ë??ê³¼ ì??ì ?"
 
-#: data/ui/glabels-ui.xml.h:68
-msgid "Main toolbar"
-msgstr "ì£¼ ë??êµ¬"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Text"
+msgstr "ê¸?ì??"
 
-#: data/ui/glabels-ui.xml.h:69
-msgid "Markup"
-msgstr "ë§?í?¬ì??"
+#: ../src/ui.c:289
+#, fuzzy
+msgid "Box"
+msgstr "ì?¬ê°?í??(_B)"
 
-#: data/ui/glabels-ui.xml.h:70
-msgid "Modify document properties"
-msgstr "ë¬¸ì?? ì??ì?± ê³ ì¹?ê¸°"
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "ì?¬ê°?í??/ì§?ì?¬ê°?í?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:71
-msgid "New"
-msgstr "ì??ë¡? ë§?ë?¤ê¸°"
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Line"
+msgstr "ì? "
 
-#: data/ui/glabels-ui.xml.h:72
-msgid "Object property editor"
-msgstr "í?ëª© ì??ì?± í?¸ì§?ê¸°"
+#: ../src/ui.c:303
+#, fuzzy
+msgid "Ellipse"
+msgstr "í??ì??(_E)"
 
-#: data/ui/glabels-ui.xml.h:73
-msgid "Only show icons in the drawing toolbar"
-msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ì??ì?? ì??ì?´ì½?ë§? ë³´ì?´ê¸°"
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "í??ì??/ì??í?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:74
-msgid "Only show icons in the main toolbar"
-msgstr "ì£¼ ë??êµ¬ì??ì?? ì??ì?´ì½?ë§? ë³´ì?´ê¸°"
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
+msgid "Image"
+msgstr "ê·¸ë¦¼"
 
-#: data/ui/glabels-ui.xml.h:76
-msgid "Open a file"
-msgstr "í??ì?¼ ì?´ê¸°"
+#: ../src/ui.c:317
+#, fuzzy
+msgid "Barcode"
+msgstr "ë°?ì½?ë??(_C)"
 
-#: data/ui/glabels-ui.xml.h:77
-msgid "Open the glabels manual"
-msgstr "gLabeles ë©?ë?´ì?¼ ì?´ê¸°"
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr "ê°?ì²´ë¥¼ ì??ì??ë¡? ì?¬ë¦¬ê¸°"
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste"
-msgstr "ë¶?ì?´ê¸°"
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
+msgstr "ê°?ì²´ë¥¼ í??ë?¨ì?¼ë¡? ë?´ë¦¬ê¸°"
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Paste the clipboard"
-msgstr "í?´ë¦½ë³´ë??ì?? ë¶?ì?´ê¸°"
+#: ../src/ui.c:340
+#, fuzzy
+msgid "Rotate object 90 degrees counter-clockwise"
+msgstr "90Â° ë°?ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
 
-#: data/ui/glabels-ui.xml.h:80
-msgid "Pr_eferences..."
-msgstr "ì??ì?±(_E)..."
+#: ../src/ui.c:347
+#, fuzzy
+msgid "Rotate object 90 degrees clockwise"
+msgstr "90Â° ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
 
-#: data/ui/glabels-ui.xml.h:81
-msgid "Preferences"
-msgstr "ì?¤ì ?"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
+msgstr "ì??ì§? ê°?ì²´ ë?¤ì§?ê¸°"
 
-#: data/ui/glabels-ui.xml.h:83
-msgid "Print the current file"
-msgstr "í??ì?¬ í??ì?¼ì?? ì?¸ì??"
+#: ../src/ui.c:361
+msgid "Flip object vertically"
+msgstr "ì??í?? ê°?ì²´ ë?¤ì§?ê¸°"
 
-#: data/ui/glabels-ui.xml.h:84
-msgid "Proper_ties..."
-msgstr "ì??ì?±(_T)..."
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
+msgstr "ê°?ì²´ ì¢?ì¸¡ ê°?ì?¥ì??ë¦¬ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:85
-msgid "Properties"
-msgstr "ì??ì?±"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
+msgstr "ê°?ì²´ ì?°ì¸¡ ê°?ì?¥ì??ë¦¬ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Property toolbar"
-msgstr "ì??ì?± ë??êµ¬"
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
+msgstr "ê°?ì²´ ì?¸ë¡? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit"
-msgstr "ì¢?ë£?"
+#: ../src/ui.c:389
+#, fuzzy
+msgid "Align objects to top edges"
+msgstr "ê°?ì²´ ì¢?ì¸¡ ê°?ì?¥ì??ë¦¬ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:88
-msgid "Quit the program"
-msgstr "gLabelsì?? ì¢?ë£?"
+#: ../src/ui.c:396
+#, fuzzy
+msgid "Align objects to bottom edges"
+msgstr "ê°?ì²´ ì??ë??ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:89
-msgid "Raise object to top"
-msgstr "ê°?ì²´ë¥¼ ì??ì??ë¡? ì?¬ë¦¬ê¸°"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
+msgstr "ê°?ì²´ ì??í?? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:90
-msgid "Recent _Files"
-msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr "ì¤?ì?? ê°?ì²´ë¥¼ ì??ì§?ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
 
-#: data/ui/glabels-ui.xml.h:91
-msgid "Redo"
-msgstr "ì?¬ì?¤í??"
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr "ì¤?ì?? ê°?ì²´ë¥¼ ì??í??ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
 
-#: data/ui/glabels-ui.xml.h:92
-msgid "Redo the undone action"
-msgstr "ì?¬ì?¤í?? í? ê²? ì??ì??"
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "ì?¬ë°± ì??ì?± í?¸ì§?"
 
-#: data/ui/glabels-ui.xml.h:93
-msgid "Remove all selections"
-msgstr "ëª¨ë?  ì? í??ì?¬í? ì?ì ?"
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr "ëª©ì°¨"
 
-#: data/ui/glabels-ui.xml.h:95
-#, no-c-format
-msgid "Restore scale to 100%"
-msgstr "100%í?¬ê¸°ë¡? ë³µêµ¬"
+#: ../src/ui.c:433
+#, fuzzy
+msgid "Open glabels manual"
+msgstr "gLabeles ë©?ë?´ì?¼ ì?´ê¸°"
 
-#: data/ui/glabels-ui.xml.h:96
-msgid "Right align"
-msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? ì ?ë ¬"
+#: ../src/ui.c:438
+msgid "About..."
+msgstr "ì ?ë³´..."
 
-#: data/ui/glabels-ui.xml.h:99
-msgid "Rotate object 90 clockwise"
-msgstr "90Â° ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
+#: ../src/ui.c:440
+msgid "About glabels"
+msgstr "gLabelsì?? ë??í?´"
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Rotate object 90 counter-clockwise"
-msgstr "90Â° ë°?ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
+#: ../src/ui.c:450
+msgid "Property toolbar"
+msgstr "ì??ì?± ë??êµ¬"
 
-#: data/ui/glabels-ui.xml.h:101
-msgid "Save"
-msgstr "ì ?ì?¥"
+#: ../src/ui.c:452
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ì??ì?± ë??êµ¬ ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save As"
-msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
+#: ../src/ui.c:458
+#, fuzzy
+msgid "Grid"
+msgstr "ê·¸ë¦¬ë??(_G)"
 
-#: data/ui/glabels-ui.xml.h:103
-msgid "Save _As..."
-msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥(_A)..."
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ê·¸ë¦¬ë?? ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:104
-msgid "Save the current file"
-msgstr "í??ì?¬ í??ì?¼ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
+#: ../src/ui.c:466
+msgid "Markup"
+msgstr "ë§?í?¬ì??"
 
-#: data/ui/glabels-ui.xml.h:105
-msgid "Save the current file with a different name"
-msgstr "í??ì?¬í??ì?¼ì?? ë?¤ë¥¸ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ë§?í?¬ì?? ì?  ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:106
-msgid "Select All"
-msgstr "ëª¨ë?? ì? í??"
+#: ../src/ui.c:479
+msgid "Main toolbar"
+msgstr "ì£¼ ë??êµ¬"
 
-#: data/ui/glabels-ui.xml.h:107
-msgid "Select _All"
-msgstr "ëª¨ë?? ì? í??(_A)"
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ì£¼ ë??êµ¬ ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:108
-msgid "Select all objects"
-msgstr "ëª¨ë?  ê°?ì²´ ì? í??"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
+msgstr "ê·¸ë¦¬ê¸° ë??êµ¬"
 
-#: data/ui/glabels-ui.xml.h:109
-msgid "Select, move and modify objects"
-msgstr "ì? í??, ê°?ì²´ ì?´ë??ê³¼ ì??ì ?"
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ê·¸ë¦¬ê¸° ë??êµ¬ ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Set drawing toolbar button style according to desktop default"
-msgstr "ê¸°ë³¸ ë?°ì?¤í?¬í?? ëª¨ì??ì?? ë?°ë?¼ ê·¸ë¦¬ê¸° ë??êµ¬ ë²?í?¼ ëª¨ì??ì?? ì§?ì ?"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:112
-msgid "Set main toolbar button style according to desktop default"
-msgstr "ê¸°ë³¸ ë?°ì?¤í?¬í?? ëª¨ì??ì?? ë?°ë?¼ ì£¼ ë??êµ¬ ë²?í?¼ ëª¨ì??ì?? ì§?ì ?"
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
+msgstr "ì°¸ì?¬ ì ?ì??ì?? AUTHORS í??ì?¼ì?? ë³´ì?¸ì??."
 
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show _Tooltips"
-msgstr "í?? ë³´ê¸°(_T)"
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
+msgstr "ë??ë?? ì?´ê³³ì?? ë°©ë¬¸ í??ì?¸ì??. http://glabels.sourceforge.net/";
 
-#: data/ui/glabels-ui.xml.h:114
-msgid "Show both icons and texts in the drawing toolbar"
-msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ì?? ì??ì?´ì½?ê³¼ ê¸?ì?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show both icons and texts in the main toolbar"
-msgstr "ì£¼ ë??êµ¬ì?? ì??ì?´ì½? ê³¼ ê¸?ì?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Show tooltips in the drawing toolbar"
-msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ì?? í?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1161
+#, fuzzy
+msgid ""
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+msgstr ""
+"GNOME ì??ì?? Labelê³¼ ëª?í?¨ì?? ì ?ì??í??ë?? í??ë¡?ê·¸ë?¨ì??ë??ë?¤.\n"
+"\n"
+"Glabelsë?? ì??ì? ì??í??í?¸ì?¨ì?´ ì??ë??ë?¤; ì?¬ë?¬ë¶?ì?? ì?´ í??ë¡?ê·¸ë?¨ì?? GNU(General Public "
+"License)ì?? ë?°ë?¼ ì??ì? ë¡ê²? ì??ì ? ë°°í?¬ í?  ì?? ì??ì?µë??ë?¤. ì?´ í??ë¡?ê·¸ë?¨ì?? GNUì?? Ver.2 "
+"ë¥¼ ë?°ë¥´ê³  ì??ì?µë??ë?¤. \n"
+"\n"
+"ì?´ í??ë¡?ê·¸ë?¨ì?? ì?´ë? í?? ì ?ì??ê¶?ë£? ì??ì?´ ì?¬ì?©ë??ì?´ ì§? ì?? ì??ì?µë??ë?¤.(ë²?ì?ì£¼ : ë²?ì?ì??"
+"ë?? GNUë¥¼ ê¹?ì?´ ì??ì§? ëª»í?©ë??ë?¤. ì?´ ë¶?ë¶?ì?? ë²?ì?ì?? ì§?ì ?í??ê³ í?? ë¶?ë¶?ì?´ ì??ë?¤ë©´ ë²?ì? "
+"ì??ë£?ì?? í?¨ê»? ì?°ë?½ì£¼ì?ì??ì?¤. xein naver com)\n"
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Show tooltips in the main toolbar"
-msgstr "ì£¼ ë??êµ¬ì?? í?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "gLabels"
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Show tooltips in the property toolbar"
-msgstr "ì??ì?± ë??êµ¬ì?? í?? ë³´ì?´ê¸°"
+#: ../src/warning-handler.c:69
+#, fuzzy
+msgid "gLabels Error!"
+msgstr "gLabels í??ê²½ì?¤ì ?"
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "Template Designer"
-msgstr "ì??ì?? ë??ì??ì?´ë??"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(ì??ì??) - gLabels"
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Template _Designer..."
-msgstr "ì??ì?? ë??ì??ì?´ë??(_D)..."
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(ì??ì ?ë?¨)"
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Text color"
-msgstr "ê¸?ì?? ì??ì??"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "ì??ëª»ë?? Root ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:122
-msgid "U_n-select All"
-msgstr "ëª¨ë?  ì? í?? í?´ì ?(_N)"
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "ì??ëª»ë?? ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:123
-msgid "Un-select All"
-msgstr "ëª¨ë?  ì? í?? í?´ì ?"
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
+msgid "xmlParseFile error"
+msgstr "xmlParseí??ì?¼ ì?¤ë¥?"
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Undo"
-msgstr "ë??ë??ë¦¬ê¸°"
+#: ../src/xml-label.c:274
+msgid "No document root"
+msgstr "root ë¬¸ì??ê°? ì??ë??"
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Undo the last action"
-msgstr "ë§?ì§?ë§? ë??ì??ì?¼ë¡? ë??ë??ë¦¬ê¸°"
+#: ../src/xml-label.c:282
+msgid "Importing from glabels 0.1 format"
+msgstr "gLabels 0.1ë¡? ë¶?í?° ê°?ì ¸ì?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:126
-msgid "Zoom _1:1"
-msgstr "1:1ë¡? í??ë??(_1)"
+#: ../src/xml-label.c:291
+msgid "Importing from glabels 0.4 format"
+msgstr "gLabels 0.4ë¡? ë¶?í?° ê°?ì ¸ì?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:127
-msgid "Zoom _In"
-msgstr "í??ë??(_I)"
+#: ../src/xml-label.c:301
+#, fuzzy, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "ì??ëª»ë?? ë¬¸ì??, ì?? ì?? ì??ë?? Glabels ì?´ë¦?ê³µê°?"
 
-#: data/ui/glabels-ui.xml.h:128
-msgid "Zoom _Out"
-msgstr "ì¶?ì??(_O)"
+#: ../src/xml-label.c:370
+#, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "ë¬¸ì?? ë?¸ë?? ë?´ì?? ì??ëª»ë?? ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:129
-msgid "Zoom to _fit"
-msgstr "ë§?ì¶°ì?? í??ë??(_F)"
+#: ../src/xml-label.c:868
+#, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "ë?°ì?´í?° ë?¸ë?? ë?´ì?? ì??ëª»ë?? ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:130
-msgid "Zoom to fit window"
-msgstr "ì??ë??ì?°ì?? ë§?ì¶°ì?? í??ë??"
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "ì?? ì?? ì??ë?? ì?©ì§? í?¬ê¸° ID ë??ë?? ì?´ë¦? \"%s\""
 
-#: data/ui/glabels-ui.xml.h:131
-msgid "_About..."
-msgstr "...ì?? ë??í?´(_A)"
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr "Utf8 ë³?í?? ì??ë?¬"
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Bottoms"
-msgstr "ì??ë??(_B)"
+#: ../src/xml-label.c:1157
+msgid "Problem saving xml file."
+msgstr "XML í??ì?¼ ì ?ì?¥ì?? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
 
-#: data/ui/glabels-ui.xml.h:135
-msgid "_Close"
-msgstr "ë?«ê¸°(_C)"
+#. Create and append an "Other" entry.
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
+msgid "Other"
+msgstr "ì§?ì ?ì§?ì ?"
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Contents"
-msgstr "ëª©ì°¨(_C)"
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
+#, fuzzy
+msgid "User defined"
+msgstr "ë³?í?© í??ë?? ì?½ì??"
 
-#: data/ui/glabels-ui.xml.h:137
-msgid "_Copy"
-msgstr "ë³µì?¬(_C)"
+#: ../libglabels/db.c:665
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:138
-msgid "_Create Object"
-msgstr "í?ëª© ë§?ë?¤ê¸°(_C)"
+#: ../libglabels/db.c:1057
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Debug"
-msgstr "ë??ë²?ê·¸(_D)"
+#: ../libglabels/db.c:2097
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:141
-msgid "_Desktop Default"
-msgstr "ê¸°ë³¸ ë?°ì?¤í?¬í??(_D)"
+#: ../libglabels/db.c:2164
+#, fuzzy, c-format
+msgid "%s full page label"
+msgstr "Generic %s ì ?ë©´ì?? ê±¸ì¹?"
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_Drawing Toolbar"
-msgstr "ê·¸ë¦¬ê¸° ë??êµ¬(_D)"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Edit"
-msgstr "í?¸ì§?(_E)"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d  (ì?©ì§?ì?? %d)"
 
-#: data/ui/glabels-ui.xml.h:145
-msgid "_File"
-msgstr "í??ì?¼(_F)"
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr "ì?©ì§?ì?? %d"
 
-#: data/ui/glabels-ui.xml.h:146
-msgid "_Grid"
-msgstr "ê·¸ë¦¬ë??(_G)"
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "ì§?ë¦? %s %s"
 
-#: data/ui/glabels-ui.xml.h:147
-msgid "_Help"
-msgstr "ë??ì??ë§?(_H)"
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "í?¬ì?¸í?¸"
 
-#: data/ui/glabels-ui.xml.h:148
-msgid "_Icon"
-msgstr "ì??ì?´ì½?(_I)"
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "[ì?¸ì¹?]"
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Main Toolbar"
-msgstr "ì£¼ ë??êµ¬(_M)"
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "[ë°?ë¦¬ë¯¸í?°]"
 
-#: data/ui/glabels-ui.xml.h:153
-msgid "_Merge Properties..."
-msgstr "ì?¬ë°± ì??ì?±(_M)..."
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:154
-msgid "_New"
-msgstr "ì??ë¡? ë§?ë?¤ê¸°(_N)"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Objects"
-msgstr "í?ëª©(_O)"
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:156
-msgid "_Open..."
-msgstr "ì?´ê¸°(_O)..."
+#. This should always be an id, but just in case a name
+#. slips by!
+#: ../libglabels/xml-template.c:244
+#, c-format
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr "ì?? ì?? ì??ë?? ì?©ì§? í?¬ê¸° ID \"%s\"ã??å??å??ã?¨ã??ã?¦æ?±ã??ã?¾ã??ã??"
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Paste"
-msgstr "ë¶?ì?´ê¸°(_P)"
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
+msgstr "ì?? ì?? ì??ë?? ì?©ì§? í?¬ê¸° ID ë??ë?? ì?´ë¦? \"%s\""
 
-#: data/ui/glabels-ui.xml.h:159
-msgid "_Print..."
-msgstr "ì?¸ì??(_P)..."
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:160
-msgid "_Property Toolbar"
-msgstr "ì??ì?± ë??êµ¬(_P)"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Quit"
-msgstr "ì¢?ë£?(_Q)"
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:164
-msgid "_Save"
-msgstr "ì ?ì?¥(_S)"
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
+msgid "Format:"
+msgstr "ì??ì??:"
 
-#: data/ui/glabels-ui.xml.h:168
-msgid "_View"
-msgstr "ë³´ê¸°(_V)"
+#: ../data/ui/merge-properties-dialog.ui.h:2
+msgid "Location:"
+msgstr "ì?¥ì??:"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
-msgstr "   "
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "ì? í?? ê¸°ë¡?/ë¯¸ë¦¬ë³´ê¸°:"
 
-#: data/glade/prefs-dialog.glade.h:2
-#: data/glade/object-editor.glade.h:1
-#: data/glade/template-designer.glade.h:5
-msgid "*"
-msgstr "*"
+#: ../data/ui/merge-properties-dialog.ui.h:4
+#, fuzzy
+msgid "Select all"
+msgstr "ëª¨ë?? ì? í??"
 
-#: data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">ê¸°ë³¸ ì?©ì§? í?¬ê¸°</span>"
+#: ../data/ui/merge-properties-dialog.ui.h:5
+msgid "Source"
+msgstr "ì??ì?¤"
 
-#: data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">ì±?ì?°ê¸°</span>"
+#: ../data/ui/merge-properties-dialog.ui.h:6
+#, fuzzy
+msgid "Unselect all"
+msgstr "ëª¨ë?  ì? í?? í?´ì ?"
 
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">ì? </span>"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">ê¸?ì??</span>"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:7
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">ì? ë??</span>"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "ì??ì??ì??"
 
-#: data/glade/prefs-dialog.glade.h:8
-#: data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "ì??ì¹?:"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "ì?©ì§? í?¬ê¸°:"
 
-#: data/glade/prefs-dialog.glade.h:9
-#: data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "ì??ì??:"
+#: ../data/ui/media-select.ui.h:5
+#, fuzzy
+msgid "Recent"
+msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
 
-#: data/glade/prefs-dialog.glade.h:10
-msgid "Font:"
-msgstr "ê¸?ê¼´:"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "ëª¨ë?? ì? í??"
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "ISO A4"
-msgstr "ISO A4 ì?©ì§?"
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:12
-msgid "Inches"
-msgstr "ì?¸ì¹?"
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "ì?¤ëª?:"
 
-#: data/glade/prefs-dialog.glade.h:13
-#: data/glade/object-editor.glade.h:19
-msgid "Line Spacing:"
-msgstr "í??ê°?:"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "ë?¼ë²¨ í?¬ê¸°:"
 
-#: data/glade/prefs-dialog.glade.h:14
-msgid "Locale"
-msgstr "ë¡?ì¼?ì?¼"
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "ë°°ì¹?:"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "ë°?ë¦¬ë¯¸í?°"
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "ì??ì??:"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
-msgstr "ê¸°ë³¸ í?ëª©"
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "ë?¼ë²¨ë¶?ë¥?:"
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "í?¬ì?¸í?¸"
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:18
-msgid "Select default properties for new objects."
-msgstr "ì?? ê°?ì²´ì?? ê¸°ë³¸ ì??ì?±ì?? ì? í??"
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "í??ì ?"
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
-msgstr "êµ¬ì²´ì ?ì?¸ ë¡?ì¼?ì?¼ì?? ì? í??"
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:20
-#: data/templates/paper-sizes.xml.h:25
-msgid "US Letter"
-msgstr "US Letter"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:21
-#: data/glade/object-editor.glade.h:29
-#: data/glade/template-designer.glade.h:72
-msgid "Width:"
-msgstr "ë??ì?´:"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Xxx ê°?ì²´ ì??ì?±</span>"
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
+msgid "Alignment:"
+msgstr "ì??ì¹?:"
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "ì??ë??ì?¼ë¡? ì¶?ì??í?? ê¸?ì??ì?? ë³?í?©"
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "ê°?ë??:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "ì²´í?¬ì?¬"
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
+msgid "Color:"
+msgstr "ì??ì??:"
+
+#: ../data/ui/object-editor.ui.h:9
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "í?¨ë°?ë¦¬:"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
+msgid "File:"
+msgstr "í??ì?¼:"
+
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "ì±?ì?°ê¸°"
 
-#: data/glade/object-editor.glade.h:13
-#: data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "ë??ì?´:"
 
-#: data/glade/object-editor.glade.h:14
-msgid "Image"
-msgstr "ê·¸ë¦¼"
-
-#: data/glade/object-editor.glade.h:15
-msgid "Insert merge field"
-msgstr "ë³?í?© í??ë?? ì?½ì??"
+#: ../data/ui/object-editor.ui.h:15
+msgid "Key:"
+msgstr "í?¤:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "ê¸¸ì?´:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "ì? "
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
+msgid "Line Spacing:"
+msgstr "í??ê°?:"
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Literal:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
-msgstr "ê·¸ë¦¼ ë¶?ë?¬ì?´"
+#: ../data/ui/object-editor.ui.h:20
+msgid "Opacity:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "ì??ì¹?"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "ê·¸ë¦¼í?¬ê¸° ì?¬ì?¤ì ?"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:23
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "í?¬ê¸°"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "í?¬ê¸°:"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "ëª¨ì??"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "ëª¨ì??:"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "ë??ì?´:"
+
+#: ../data/ui/object-editor.ui.h:30
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:32
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "degrees"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "dialog1"
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "digits:"
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "ì??ì??:"
 
-#: data/glade/template-designer.glade.h:1
-msgid "  "
-msgstr "  "
+#: ../data/ui/prefs-dialog.ui.h:1
+msgid "   "
+msgstr "   "
+
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "ê·¸ë¦¼í?¬ê¸° ì?¬ì?¤ì ?"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "Font:"
+msgstr "ê¸?ê¼´:"
+
+#: ../data/ui/prefs-dialog.ui.h:7
+msgid "ISO A4"
+msgstr "ISO A4 ì?©ì§?"
+
+#: ../data/ui/prefs-dialog.ui.h:8
+msgid "Inches"
+msgstr "ì?¸ì¹?"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Locale"
+msgstr "ë¡?ì¼?ì?¼"
+
+#: ../data/ui/prefs-dialog.ui.h:12
+msgid "Millimeters"
+msgstr "ë°?ë¦¬ë¯¸í?°"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Object defaults"
+msgstr "ê¸°ë³¸ í?ëª©"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Points"
+msgstr "í?¬ì?¸í?¸"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Select default properties for new objects."
+msgstr "ì?? ê°?ì²´ì?? ê¸°ë³¸ ì??ì?±ì?? ì? í??"
 
-#: data/glade/template-designer.glade.h:2
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Select locale specific behavior."
+msgstr "êµ¬ì²´ì ?ì?¸ ë¡?ì¼?ì?¼ì?? ì? í??"
+
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr "US Letter"
+
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "ì ?ëª©ì??ì??"
+
+#: ../data/ui/property-bar.ui.h:1
+msgid "Bold"
+msgstr "êµµê²?"
+
+#: ../data/ui/property-bar.ui.h:2
+msgid "Center align"
+msgstr "ì¤?ì?? ì ?ë ¬"
+
+#: ../data/ui/property-bar.ui.h:7
+msgid "Left align"
+msgstr "ì?¼ìª½ ì ?ë ¬"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Right align"
+msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? ì ?ë ¬"
+
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(ì??: \"ì£¼ì??ë?¼ë²¨\", \"ëª?í?¨\", ...)"
 
-#: data/glade/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(ì??: 8163A)"
 
-#: data/glade/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(ì??: Avery, Acme, ...)"
 
-#: data/glade/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. ë°?ê¹¥ ë°?ì§?ë¦?:"
 
-#: data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. ë°?ì§?ë¦?:"
 
-#: data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. ë??ì?´:"
 
-#: data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. ë??ì?´:"
 
-#: data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. ì??ìª½ ë°?ì§?ë¦?:"
 
-#: data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. ì?¬ë°± (ê²¹ì¹? ì?¸ì?? í??ì?©):"
 
-#: data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. ì?¤ë ¤ë?´ê¸° ë??ì?´:"
 
-#: data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. ì?¬ë°±"
 
-#: data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. ë?¥ê¸?ê¸° (ê·?í??ì?´ ê°?ë??):"
 
-#: data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. ì?¤ë ¤ë?´ê¸° ë??ì?´:"
 
-#: data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. ì¢?ì?° ì?¬ë°± (ê²¹ì¹? ì?¸ì?? í??ì?©):"
 
-#: data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. ì??ë??ì?? ì?¬ë°± (ê²¹ì¹? ì?¸ì?? í??ì?©):"
 
-#: data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. ì?¬ë°± (ê²¹ì¹? ì?¸ì?? í??ì?©):"
 
-#: data/glade/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. ë?¼ë²¨ ë?´ ì?¬ë°±"
 
-#: data/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "ì??í??/ì ?ì¡°ì??ì²´:"
 
-#: data/glade/template-designer.glade.h:21
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD (credit card CD í?¬í?¨)"
 
-#: data/glade/template-designer.glade.h:22
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -2031,23 +2425,19 @@ msgstr ""
 "\"ì·¨ì??\"ë¥¼ ë??ë¥´ë©´ ë§?ë? ê²?ì?? ë²?ë¦¬ê²? ë?©ë??ë?¤.\n"
 "ë??ë?? \"ë?¤ë¡?\"ë¥¼ ì? í??í??ì?¬ ë§?ë? ê²?ì?? í?¸ì§? í?  ì?? ì??ì?µë??ë?¤."
 
-#: data/glade/template-designer.glade.h:30
-msgid "Design Completed"
-msgstr "ì??ì?? ë??ì??ì?¸ ì??ë£?ë?¨"
-
-#: data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "ì?¼ìª½ ê°?ì?¥ì??ë¦¬ ë¶?í?°  (x0):"
 
-#: data/glade/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "ì??ìª½ ê°?ì?¥ì??ë¦¬ ë¶?í?° (y0):"
 
-#: data/glade/template-designer.glade.h:34
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "ì??í?? pitch (dx):"
 
-#: data/glade/template-designer.glade.h:35
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -2061,99 +2451,69 @@ msgstr ""
 "ë³´í?µì?? ì??ë?? ì²«ë²?ì§¸ ì??ì ?ì²?ë?¼ í??ê°?ì?? ë ?ì?´ì??ì??ì?? í??ì??ë¡? í??ì§?ë§?,\n"
 "ì?´ë?¤ê²?ì?? ë??ë²?ì§¸ ì??ì ?ì²?ë?¼ ë??ê°?ì?? ë ?ì?´ì??ì??ì?? í??ì??ë¡? í??ë??ê²?ë?? ì??ì?µë??ë?¤."
 
-#: data/glade/template-designer.glade.h:40
-msgid "Label Size (CD/DVD)"
-msgstr "ë?¼ë²¨ í?¬ê¸°(CD/DVD)"
-
-#: data/glade/template-designer.glade.h:41
-msgid "Label Size (Round)"
-msgstr "ë?¼ë²¨ í?¬ê¸° (ë?¥ê¸?ê¸°)"
-
-#: data/glade/template-designer.glade.h:42
-msgid "Label or Card Shape"
-msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë?? ì?¸í??"
-
-#: data/glade/template-designer.glade.h:43
-msgid "Label or Card Size (Rectangular)"
-msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë?? í?¬ê¸°(ì§?ì?¬ê°?í??)"
-
-#: data/glade/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "ë ?ì?´ì??ì?? #1:"
 
-#: data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "ë ?ì?´ì??ì?? #2:"
 
-#: data/glade/template-designer.glade.h:46
-msgid "Layout(s)"
-msgstr "ë ?ì?´ì??ì??"
-
-#: data/glade/template-designer.glade.h:47
-msgid "Name and Description"
-msgstr "ì?´ë¦?ê³¼ ì?¤ëª?"
-
-#: data/glade/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "ê°?ë¡? ê°?ì?? (nx):"
 
-#: data/glade/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "ì?¸ë¡? ê°?ì?? (ny):"
 
-#: data/glade/template-designer.glade.h:50
-msgid "Number of Layouts"
-msgstr "ë ?ì?´ì??ì?? ì? í??"
-
-#: data/glade/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "ë ?ì?´ì??ì?? ì? í??:"
 
-#: data/glade/template-designer.glade.h:52
-msgid "Page Size"
-msgstr "ì?©ì§? í?¬ê¸°"
-
-#: data/glade/template-designer.glade.h:54
-msgid "Part #:"
-msgstr "ë?¼ë²¨ë¶?ë¥?:"
-
-#: data/glade/template-designer.glade.h:55
-msgid "Please enter the following identifying information about the template stationery."
+#: ../data/ui/template-designer.ui.h:44
+msgid ""
+"Please enter the following identifying information about the template "
+"stationery."
 msgstr "ì??ë ¥ ì??ì??ì?? ê¸°ë³¸ ì??ì?? ì ?ë³´ë¥¼ ì??ë ¥í??ì?¸ì??."
 
-#: data/glade/template-designer.glade.h:56
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "ë ?ì?´ì??ì?? ì ?ë³´ë¥¼ ì??ë ¥í??ì?¸ì??."
 
-#: data/glade/template-designer.glade.h:57
-msgid "Please enter the following size parameters of a single label in your template."
+#: ../data/ui/template-designer.ui.h:46
+msgid ""
+"Please enter the following size parameters of a single label in your "
+"template."
 msgstr "ë?¼ë²¨ì??ì??ì?? ì¹?ì??ë¥¼ ì??ë ¥í??ì?¸ì??."
 
-#: data/glade/template-designer.glade.h:58
-msgid "Please enter the following size parameters of a single label or card in your template."
+#: ../data/ui/template-designer.ui.h:47
+msgid ""
+"Please enter the following size parameters of a single label or card in your "
+"template."
 msgstr "ë?¼ë²¨ì??ì?? ë??ë?? ì¹´ë??ì??ì??ì?? ì¹?ì??ë¥¼ ì??ë ¥í??ì?¸ì??."
 
-#: data/glade/template-designer.glade.h:59
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë??ì?? ê¸°ë³¸ í??í??ë¥¼ ì? í??í??ì?¸ì??."
 
-#: data/glade/template-designer.glade.h:60
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "ì??ì?? ì?©ì§?ì?? í?¬ê¸° ì? í??"
 
-#: data/glade/template-designer.glade.h:61
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "ì?©ì§? í??ì?¤í?¸ ì?¸ì??"
 
-#: data/glade/template-designer.glade.h:62
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "ì§?ì?¬ê°?í?? ë??ë?? ì ?ì?¬ê°?í??(ë§?ë¬´ë¦¬ë¥¼ ë?¥ê¸?ê²? ë§?ë?¤ ì?? ì??ì??)"
 
-#: data/glade/template-designer.glade.h:63
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "ë?¥ê·¼í??"
 
-#: data/glade/template-designer.glade.h:64
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -2161,7 +2521,7 @@ msgstr ""
 "2. ë??ê°?ì?? ë ?ì?´ì??ì??\n"
 "ì??ì?? í??ì??"
 
-#: data/glade/template-designer.glade.h:66
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2169,11 +2529,11 @@ msgstr ""
 "1. í??ê°?ì?? ë ?ì?´ì??ì??\n"
 "ì??ì?? í??ì??"
 
-#: data/glade/template-designer.glade.h:68
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "ì??ì§? pitch (dy):"
 
-#: data/glade/template-designer.glade.h:69
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2183,361 +2543,1226 @@ msgstr ""
 "\n"
 "ì°¨ê·¼ì°¨ê·¼ gLabelsì?? ì?¬ì?©ì?? ì??ì??ì?? ì?½ê²? ë§?ë?¤ ì?? ì??ê²? ë??ì??ë??ë¦½ë??ë?¤. "
 
-#: data/templates/paper-sizes.xml.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "ì ?ë³¸"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "Copies"
+msgstr "ë§¤ì??"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "ë§¤ì??:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "ë¬¸ì?? ì?¬ë°± ì ?ì?´"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+msgid "Options"
+msgstr "ì?µì??"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "ì?©ì§?:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "ë?¼ë²¨ì?? ì??ì??"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "ë¶?í?°:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "ì²«ë²?ì§¸ ì?©ì§?ì??ì??"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "ì??ê²?:"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "ë?¼ë²¨, ëª?í?¨ ê·¸ë¦¬ê³  ë¯¸ë??ì?´ ì»¤ë²? ë§?ë?¤ê¸°"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "gLabels ë?¼ë²¨ ë??ì??ì?´ë??"
+
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "gLabels í??ë¡?ì ?í?¸ í??ì?¼"
+
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
+
+#. Other ISO A series sizes
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:6
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:7
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:12
+#. ISO B series sizes
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:13
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9ì?©ì§?"
 
-#: data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "US Executive"
 
-#: data/templates/paper-sizes.xml.h:24
+#. Other US paper sizes
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "US Legal"
 
-#: data/templates/avery-us-templates.xml.h:1
-#: data/templates/zweckform-iso-templates.xml.h:1
+#: ../templates/categories.xml.h:1
+msgid "Any card"
+msgstr ""
+
+#: ../templates/categories.xml.h:2
+#, fuzzy
+msgid "Any label"
+msgstr "ë?¼ë²¨ ì?´ê¸°"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
+#, fuzzy
+msgid "Business cards"
+msgstr "ëª?í?¨"
+
+#: ../templates/categories.xml.h:4
+msgid "CD/DVD or other media"
+msgstr ""
+
+#: ../templates/categories.xml.h:5
+msgid "Mailing/shipping products"
+msgstr ""
+
+#: ../templates/categories.xml.h:6
+#, fuzzy
+msgid "Rectangular labels"
+msgstr "ì§?ì?¬ê°?í?? ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
+#, fuzzy
+msgid "Round labels"
+msgstr "Allround ë?¼ë²¨"
+
+#: ../templates/categories.xml.h:8
+#, fuzzy
+msgid "Square labels"
+msgstr "êµ¬í?? ë?¼ë²¨"
+
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "ì£¼ì?? ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:2
-#: data/templates/avery-iso-templates.xml.h:2
-#: data/templates/zweckform-iso-templates.xml.h:3
-#: data/templates/misc-us-templates.xml.h:2
-#: data/templates/misc-iso-templates.xml.h:9
+#. ===================================================================
+#. ============================================================
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "ëª?í?¨"
 
-#: data/templates/avery-us-templates.xml.h:3
+#. ===================================================================
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
+msgid "CD/DVD Labels"
+msgstr "CD/DVD ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "CD/DVD ë?¼ë²¨ (Disc ë?¼ë²¨)"
 
-#: data/templates/avery-us-templates.xml.h:4
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels (Spine Labels)"
+msgstr "CD/DVD ë?¼ë²¨ (Disc ë?¼ë²¨)"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr "ë??ì?¤í?¬ ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:5
+#. the LSK labels can be torn in half down the center
+#: ../templates/avery-us-templates.xml.h:14
+#, fuzzy
+msgid "Divider Labels"
+msgstr "ë??ì?¤í?¬ ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+#, fuzzy
+msgid "File Folder Labels"
+msgstr "Arch í??ì?¼ ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr "ì¶?ì?? ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:6
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "Full Sheet ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:7
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:22
+#, fuzzy
+msgid "ID Labels"
+msgstr "DLT ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:24
+#, fuzzy
+msgid "Index Cards"
+msgstr "ëª?í?¨"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "í?° ì??í?? ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:8
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "Name Badge ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:9
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:30
+msgid "Post cards"
+msgstr ""
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "ë°?ì?¡ ì£¼ì??ì?© ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:10
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
+#, fuzzy
+msgid "Round Labels"
+msgstr "Allround ë?¼ë²¨"
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "ì¶?í?? ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:11
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "ì??ì?? ì??í?? ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:12
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "êµ¬í?? ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:13
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:42
+msgid "Tent Cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "ë¹?ë??ì?¤ í??ì?? ì??ë©´ ë?¼ë²¨"
 
-#: data/templates/avery-us-templates.xml.h:14
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr "ë¹?ë??ì?¤ í??ì?? ì??ë©´ ë?¼ë²¨"
 
-#: data/templates/avery-iso-templates.xml.h:1
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:4
 msgid "Address labels"
 msgstr "ì£¼ì?? ë?¼ë²¨"
 
-#: data/templates/avery-iso-templates.xml.h:3
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Allround labels"
+msgstr "Allround ë?¼ë²¨"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "CD Booklet"
 msgstr "CD Booklet"
 
-#: data/templates/avery-iso-templates.xml.h:4
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:12
 msgid "CD Inlet"
 msgstr "CD Inlet"
 
-#: data/templates/avery-iso-templates.xml.h:5
-#: data/templates/zweckform-iso-templates.xml.h:4
-#: data/templates/misc-us-templates.xml.h:4
-#: data/templates/misc-iso-templates.xml.h:10
-msgid "CD/DVD Labels"
-msgstr "CD/DVD ë?¼ë²¨"
-
-#: data/templates/avery-iso-templates.xml.h:6
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:18
 msgid "Diskette labels"
 msgstr "ë??ì?¤í?¬ ë?¼ë²¨"
 
-#: data/templates/avery-iso-templates.xml.h:7
-#: data/templates/zweckform-iso-templates.xml.h:7
-#: data/templates/misc-iso-templates.xml.h:17
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
 msgstr "ë´?í?¬ ë?¼ë²¨"
 
-#: data/templates/avery-iso-templates.xml.h:8
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:22
 msgid "Mailing labels"
 msgstr "ë´?í?¬ ë?¼ë²¨"
 
-#: data/templates/avery-iso-templates.xml.h:9
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:24
 msgid "Mini Address Labels"
 msgstr "ì??ì?? ì£¼ì??ë?¼ë²¨"
 
-#: data/templates/avery-iso-templates.xml.h:10
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:26
+#, fuzzy
+msgid "Mini Labels"
+msgstr "Mini-CD ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:28
 msgid "Shipping labels"
 msgstr "ì¶?í?? ë?¼ë²¨"
 
-#: data/templates/zweckform-iso-templates.xml.h:2
-msgid "Allround Labels"
-msgstr "Allround ë?¼ë²¨"
+#: ../templates/brother-other-templates.xml.h:1
+msgid "Multi Purpose Labels 17mm x 54mm"
+msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:5
-msgid "Correction and Cover-up Labels"
-msgstr "ì??ì§? ê³¼ Cover-up ë?¼ë²¨"
+#: ../templates/brother-other-templates.xml.h:2
+#, fuzzy
+msgid "Shipping Labels 62mm x 100mm"
+msgstr "ì¶?í?? ë?¼ë²¨"
 
-#: data/templates/zweckform-iso-templates.xml.h:6
-msgid "Lever Arch File Labels"
-msgstr "Lever Arch í??ì?¼ ë?¼ë²¨"
+#.
+#. *********************************************************************
+#. *********************************************************************
+#. 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.
+#.
+#. One difference from typical templates is that the template size is
+#. not the actual media size - it is the size of the printable area,
+#. which is smaller than the media size.  This is because (at least with
+#. the Brother driver) coordinates are relative the corner of this area.
+#.
+#. *********************************************************************
+#. *********************************************************************
+#.
+#: ../templates/brother-other-templates.xml.h:20
+#, fuzzy
+msgid "Standard Address Labels 29mm x 90mm"
+msgstr "ë°?ì?¡ ì£¼ì??ì?© ë?¼ë²¨"
 
-#: data/templates/zweckform-iso-templates.xml.h:8
-msgid "QSL-Karten Etiketten 70mm x 50,8mm"
-msgstr "QSL-Karten Etiketten (70mm x 50.8mm)"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:2
+msgid "3.5in Diskette"
+msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:9
-msgid "Rectangular Copier Labels"
-msgstr "ë¶?ë¥?í??ê¸° ë?¼ë²¨"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:6
+#, fuzzy
+msgid "File Folder"
+msgstr "ì?? ì±?ì?°ê¸°"
 
-#: data/templates/zweckform-iso-templates.xml.h:10
-#: data/templates/misc-iso-templates.xml.h:22
-msgid "Rectangular Labels"
-msgstr "ì§?ì?¬ê°?í?? ë?¼ë²¨"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:8
+msgid "Hanging Folder"
+msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:11
-msgid "Video Labels (back)"
-msgstr "ë¹?ë??ì?¤ ë?¼ë²¨ (ë?¤)"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:10
+#, fuzzy
+msgid "Large Address Labels"
+msgstr "ì£¼ì?? ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:14
+#, fuzzy
+msgid "Shipping Address Labels"
+msgstr "ì??ì?? ì£¼ì??ë?¼ë²¨"
 
-#: data/templates/misc-us-templates.xml.h:1
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:2
 msgid "Business Card CD"
 msgstr "ëª?í?¨ CD"
 
-#: data/templates/misc-us-templates.xml.h:3
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
 msgid "CD Template Rectangles"
 msgstr "CD ì??ì?? (ì§?ì?¬ê°?í??)"
 
-#: data/templates/misc-us-templates.xml.h:5
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
 msgid "CD/DVD Labels (Face Only)"
 msgstr "CD/DVD ë?¼ë²¨ (í??ì§?ë§?)"
 
-#: data/templates/misc-us-templates.xml.h:6
-#: data/templates/misc-iso-templates.xml.h:11
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "CD/DVD Labels (face only)"
 msgstr "CD/DVD ë?¼ë²¨ (í??ì§?ë§?)"
 
-#: data/templates/misc-us-templates.xml.h:7
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:14
+#, fuzzy
+msgid "Cassette Labels"
+msgstr "ë??ì?¤í?¬ ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:16
 msgid "DLT Labels"
 msgstr "DLT ë?¼ë²¨"
 
-#: data/templates/misc-us-templates.xml.h:8
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "CD Booklet"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr "Microtube ë?¼ë²¨"
 
-#: data/templates/misc-us-templates.xml.h:9
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr "Mini-CD ë?¼ë²¨"
 
-#: data/templates/misc-us-templates.xml.h:10
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr "PRO CD ë?¼ë²¨ 2-up (CD ì?¸ë¡?í??ì§? ì ?ì?©)"
 
-#: data/templates/misc-us-templates.xml.h:11
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "PRO CD ë?¼ë²¨ 2-up (í??ì§?ë§?)"
 
-#: data/templates/misc-us-templates.xml.h:12
-#: data/templates/misc-iso-templates.xml.h:21
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr "PRO CD ë?¼ë²¨ 2-up (í??ì§?ë§?)"
 
-#: data/templates/misc-us-templates.xml.h:13
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr "Slimline CD ì¼?ì?´ì?¤ (ì?°ì¸¡ì??)"
 
-#: data/templates/misc-us-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr "Slimline CD ì¼?ì?´ì?¤(ì??ì??)"
 
-#: data/templates/misc-iso-templates.xml.h:1
-msgid "Agipa 119488: Business Cards"
-msgstr "Agipa 119488: ëª?í?¨"
-
-#: data/templates/misc-iso-templates.xml.h:2
-msgid "Allround Labels --24"
-msgstr "Allround ë?¼ë²¨ --24"
-
-#: data/templates/misc-iso-templates.xml.h:3
-msgid "Allround Labels --44"
-msgstr "Allround ë?¼ë²¨ --44"
-
-#: data/templates/misc-iso-templates.xml.h:4
-msgid "Allround Labels --64"
-msgstr "Allround ë?¼ë²¨ --64"
-
-#: data/templates/misc-iso-templates.xml.h:5
-msgid "Allround Labels --65"
-msgstr "Allround ë?¼ë²¨ --65"
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
+msgid "Allround Labels"
+msgstr "Allround ë?¼ë²¨"
 
-#: data/templates/misc-iso-templates.xml.h:6
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr "Arch í??ì?¼ ë?¼ë²¨"
 
-#: data/templates/misc-iso-templates.xml.h:7
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr "Arch í??ì?¼ ë?¼ë²¨ (í?°ê²?)"
 
-#: data/templates/misc-iso-templates.xml.h:8
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr "Arch í??ì?¼ ë?¼ë²¨ (ì??ì??ê²?)"
 
-#: data/templates/misc-iso-templates.xml.h:12
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:14
+#, fuzzy
+msgid "CD Labels"
+msgstr "DLT ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "ê¸°ë³¸ CD/DVD ë?¼ë²¨ (í??ì§?ë§?)"
 
-#: data/templates/misc-iso-templates.xml.h:13
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "ë??ì?¤ì¼? ë?¼ë²¨ (í??ì§?ë§?)"
 
-#: data/templates/misc-iso-templates.xml.h:14
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "EPSON í?¬í?  ì?¤í?°ì»¤ 16"
 
-#: data/templates/misc-iso-templates.xml.h:15
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "Etiketten"
 
-#: data/templates/misc-iso-templates.xml.h:16
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "Fridge Magnet ì?¤í?°ì»¤"
 
-#: data/templates/misc-iso-templates.xml.h:18
-msgid "Mailing Labels --14"
-msgstr "ë´?í?¬ ë?¼ë²¨ --14"
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:30
+#, fuzzy
+msgid "General Labels"
+msgstr "ë´?í?¬ ë?¼ë²¨"
 
-#: data/templates/misc-iso-templates.xml.h:19
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:32
+msgid "Inkjet/Laser Labels 70x37mm"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr "ì£¼ì?? ë?¼ë²¨ (2í??)"
 
-#: data/templates/misc-iso-templates.xml.h:20
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr "ì£¼ì??ë?¼ë²¨ (3í??)"
 
-#: data/templates/misc-iso-templates.xml.h:23
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
+msgid "Rectangular Labels"
+msgstr "ì§?ì?¬ê°?í?? ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "ì??ì?? ì£¼ì??ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "ë¹?ë??ì?¤ ë?¼ë²¨ (í??ì§?ë§?)"
 
-#: data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "ë?¼ë²¨, ëª?í?¨ ê·¸ë¦¬ê³  ë¯¸ë??ì?´ ì»¤ë²? ë§?ë?¤ê¸°"
+#. ===================================================================
+#: ../templates/misc-other-templates.xml.h:2
+#, fuzzy
+msgid "Multi-Purpose Labels"
+msgstr "Microtube ë?¼ë²¨"
 
-#: data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "gLabels ë?¼ë²¨ ë??ì??ì?´ë??"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "ì£¼ì?? ë?¼ë²¨"
 
-#: data/mime/glabels.keys.in.h:1
-#: data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "gLabels í??ë¡?ì ?í?¸ í??ì?¼"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "ë??ì?¤í?¬ ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "ëª?í?¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "ëª?í?¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "ëª?í?¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "ëª?í?¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "ë??ì?¤í?¬ ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "ëª?í?¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "gLabelsì?? ë??í?´"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "êµ¬í?? ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Self-adhesive labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
+msgid "Correction and Cover-up Labels"
+msgstr "ì??ì§? ê³¼ Cover-up ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:12
+#, fuzzy
+msgid "File Back Labels"
+msgstr "ì¶?ì?? ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:14
+msgid "Lever Arch File Labels"
+msgstr "Lever Arch í??ì?¼ ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:18
+msgid "Multi-purpose Stick+Lift Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:20
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr "QSL-Karten Etiketten (70mm x 50.8mm)"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:22
+msgid "Rectangular Copier Labels"
+msgstr "ë¶?ë¥?í??ê¸° ë?¼ë²¨"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:26
+msgid "Video Labels (back)"
+msgstr "ë¹?ë??ì?¤ ë?¼ë²¨ (ë?¤)"
+
+#~ msgid "Show view debugging messages."
+#~ msgstr "ë³´ê¸°ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show item debugging messages."
+#~ msgstr "ì??ì?´í?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show printing debugging messages."
+#~ msgstr "ì?¸ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show prefs debugging messages."
+#~ msgstr "Prefs ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show file debugging messages."
+#~ msgstr "í??ì?¼ ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show document debugging messages."
+#~ msgstr "ë¬¸ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show template debugging messages."
+#~ msgstr "Template ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show paper debugging messages."
+#~ msgstr "Paper ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show xml debugging messages."
+#~ msgstr "XML ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show document merge debugging messages."
+#~ msgstr "Document ì?¬ë°± ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show commands debugging messages."
+#~ msgstr "Command ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show undo debugging messages."
+#~ msgstr "Undo ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show recent debugging messages."
+#~ msgstr "ìµ?ê·¼ì?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show window debugging messages."
+#~ msgstr "ì??ë??ì?° ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show ui debugging messages."
+#~ msgstr "GUI ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show property_bar debugging messages."
+#~ msgstr "ì??ì?±ë??êµ¬ ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show media select widget debugging messages."
+#~ msgstr "ì? í?? ì ?í?? ë¯¸ë??ì?´ ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show mini preview widget debugging messages."
+#~ msgstr "ì ?í?? ì??ê²? ë¯¸ë¦¬ë³´ê¸° ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show pixbuf cache debugging messages."
+#~ msgstr "pixbuf cache ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show widget debugging messages."
+#~ msgstr "ì ?í?? ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Show object editor debugging messages."
+#~ msgstr "ê°?ì±? í?¸ì§?ê¸° ë??ë²?ê¹? ë©?ì??ì§?ë¥¼ ë³´ì?´ê¸°"
+
+#~ msgid "Turn on all debugging messages."
+#~ msgstr "ëª¨ë?  ë??ë²?ê¹? ë©?ì??ì§? ì¼?ê¸°"
+
+#~ msgid "Could not initialize Bonobo!\n"
+#~ msgstr "Bonobo ì´?ê¸°í?? í?  ì?? ì??ì??ï¼?\n"
+
+#~ msgid "print this message"
+#~ msgstr "ì?´ ë©?ì??ì§?ë¥¼ ì?¸ì??"
+
+#~ msgid "print the version of glabels-batch being used"
+#~ msgstr "gLabel-batch ë²?ì ? ì?¸ì??"
+
+#~ msgid "[OPTION...] GLABELS_FILE..."
+#~ msgstr "[ì?µì??...] gLabels í??ì?¼..."
+
+#~ msgid "missing glabels file\n"
+#~ msgstr "gLabel í??ì?¼ì?´ ë³´ì?´ì§? ì??ì??\n"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Media Type"
+#~ msgstr "ë§¤ì²´ í??ì??"
+
+#~ msgid "Open"
+#~ msgstr "ì?´ê¸°"
+
+#~ msgid "Align _Horizontally"
+#~ msgstr "ê°?ë¡?ë¡? ì ?ë ¬(_H)"
+
+#~ msgid "Align _Vertically"
+#~ msgstr "ì?¸ë¡?ë¡? ì ?ë ¬(_V)"
+
+#~ msgid "_Delete"
+#~ msgstr "ì?ì ?(_D)"
+
+#~ msgid "Print"
+#~ msgstr "ì?¸ì??"
+
+#~ msgid "_Job"
+#~ msgstr "ì??ì??(_J)"
+
+#~ msgid "P_rinter"
+#~ msgstr "í??ë¦°í?°(_R)"
+
+#~ msgid "Print preview"
+#~ msgstr "ì?¸ì?? ë¯¸ë¦¬ë³´ê¸°"
+
+#~ msgid "Importing from glabels 1.91 format"
+#~ msgstr "gLabels 1.91ë¡? ë¶?í?° ê°?ì ¸ì?¤ê¸°"
+
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "ì½¤ë§?ë¡? êµ¬ë¶?ë?? í??ì?¤í?¸í??ì?¼(CSV)"
+
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "ì½?ë¡ ì?¼ë¡? êµ¬ë¶?ë?? í??ì?¤í?¸ í??ì?¼"
+
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "í??ì?¼ë¡? êµ¬ë¶?ë?? í??ì?¤í?¸ í??ì?¼"
+
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "ì§?ë¦? %.5g %s"
+
+#~ msgid "Choose Custom Color"
+#~ msgstr "ì??ì??ì?? ì??ì?? ì? í??"
+
+#~ msgid "light brown"
+#~ msgstr "ë°?ì?? ê°?ì??"
+
+#~ msgid "brown gold"
+#~ msgstr "ê³ ë??ì??"
+
+#~ msgid "dark green #2"
+#~ msgstr "ì?´ë??ì?´ ë?¹ì?? #2"
+
+#~ msgid "navy"
+#~ msgstr "ë?¨ì??"
+
+#~ msgid "purple #2"
+#~ msgstr "ì??ì£¼ì?? #2"
+
+#~ msgid "very dark gray"
+#~ msgstr "ë§¤ì?° ì?´ë??ì?´ í??ì??"
+
+#~ msgid "red-orange"
+#~ msgstr "ì ?ì?¤ë ?ì§?ì??"
+
+#~ msgid "dull blue"
+#~ msgstr "í??í?? í??ë??ì??"
+
+#~ msgid "dull purple"
+#~ msgstr "í??í?? ì??ì£¼ì??"
+
+#~ msgid "dark grey"
+#~ msgstr "ì?´ë??ì?´ í??ì??"
+
+#~ msgid "red"
+#~ msgstr "ë¹¨ê°?ì??"
+
+#~ msgid "lime"
+#~ msgstr "ë?¼ì??ì??"
+
+#~ msgid "dull blue #2"
+#~ msgstr "í??í?? í??ë??ì??#2"
+
+#~ msgid "sky blue #2"
+#~ msgstr "í??ë??ì?? #2"
+
+#~ msgid "gray"
+#~ msgstr "í??ì??"
+
+#~ msgid "magenta"
+#~ msgstr "ë§?ì  í??ì??"
+
+#~ msgid "bright orange"
+#~ msgstr "ë°?ì?? ì?¤ë ?ì§?ì??"
+
+#~ msgid "bright blue"
+#~ msgstr "ë°?ì?? í??ë??ì??"
+
+#~ msgid "red purple"
+#~ msgstr "ë¹¨ê°? ì??ì£¼ì??"
+
+#~ msgid "light grey"
+#~ msgstr "ê°?ë²¼ì?´ í??ì??"
+
+#~ msgid "light orange"
+#~ msgstr "ê°?ë²¼ì?´ ì?¤ë ?ì§?ì??"
+
+#~ msgid "light blue"
+#~ msgstr "ê°?ë²¼ì?´ ë°?ë??ì??"
+
+#~ msgid "light purple"
+#~ msgstr "ê°?ë²¼ì?´ ì??ì£¼ì??"
+
+#~ msgid "purplish blue"
+#~ msgstr "ì??ì£¼ë¹? í??ë??ì??"
+
+#~ msgid "dark purple"
+#~ msgstr "ì?´ë??ì?´ ì??ì£¼ì??"
+
+#~ msgid "No paper files found!"
+#~ msgstr "ì?©ì§? í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
+
+#~ msgid "Close"
+#~ msgstr "ë?«ê¸°"
+
+#~ msgid "Cu_t"
+#~ msgstr "ì??ë¥´ê¸°(_T)"
+
+#~ msgid "Customize"
+#~ msgstr "ì»¤ì?¤í?°ë§?ì?´ì¦?"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "ë??êµ¬ ì»¤ì?¤í?°ë§?ì?´ì¦?"
+
+#~ msgid "Dump XML"
+#~ msgstr "XML ë?¤í??"
+
+#~ msgid "Dump the GUI Xml description"
+#~ msgstr "GUIì?? XMLì?¤ëª? ë?¤í??"
+
+#~ msgid "Font selector"
+#~ msgstr "ê¸?ê¼´ ì? í??ê¸°"
+
+#~ msgid "Icon and _Text"
+#~ msgstr "ì??ì?´ì½?ê³¼ ê¸?ì??(_T)"
+
+#~ msgid "M_arkup"
+#~ msgstr "ë§?í?¬ì??(_A)"
+
+#~ msgid "New"
+#~ msgstr "ì??ë¡? ë§?ë?¤ê¸°"
+
+#~ msgid "Object property editor"
+#~ msgstr "í?ëª© ì??ì?± í?¸ì§?ê¸°"
+
+#~ msgid "Only show icons in the drawing toolbar"
+#~ msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ì??ì?? ì??ì?´ì½?ë§? ë³´ì?´ê¸°"
+
+#~ msgid "Only show icons in the main toolbar"
+#~ msgstr "ì£¼ ë??êµ¬ì??ì?? ì??ì?´ì½?ë§? ë³´ì?´ê¸°"
+
+#~ msgid "Pr_eferences..."
+#~ msgstr "ì??ì?±(_E)..."
+
+#~ msgid "Properties"
+#~ msgstr "ì??ì?±"
+
+#~ msgid "Quit"
+#~ msgstr "ì¢?ë£?"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "ì?¬ì?¤í?? í? ê²? ì??ì??"
+
+#~ msgid "Save"
+#~ msgstr "ì ?ì?¥"
+
+#~ msgid "Save As"
+#~ msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
+
+#~ msgid "Select _All"
+#~ msgstr "ëª¨ë?? ì? í??(_A)"
+
+#~ msgid "Set drawing toolbar button style according to desktop default"
+#~ msgstr "ê¸°ë³¸ ë?°ì?¤í?¬í?? ëª¨ì??ì?? ë?°ë?¼ ê·¸ë¦¬ê¸° ë??êµ¬ ë²?í?¼ ëª¨ì??ì?? ì§?ì ?"
+
+#~ msgid "Set main toolbar button style according to desktop default"
+#~ msgstr "ê¸°ë³¸ ë?°ì?¤í?¬í?? ëª¨ì??ì?? ë?°ë?¼ ì£¼ ë??êµ¬ ë²?í?¼ ëª¨ì??ì?? ì§?ì ?"
+
+#~ msgid "Show _Tooltips"
+#~ msgstr "í?? ë³´ê¸°(_T)"
+
+#~ msgid "Show both icons and texts in the drawing toolbar"
+#~ msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ì?? ì??ì?´ì½?ê³¼ ê¸?ì?? ë³´ì?´ê¸°"
+
+#~ msgid "Show both icons and texts in the main toolbar"
+#~ msgstr "ì£¼ ë??êµ¬ì?? ì??ì?´ì½? ê³¼ ê¸?ì?? ë³´ì?´ê¸°"
+
+#~ msgid "Show tooltips in the drawing toolbar"
+#~ msgstr "ê·¸ë¦¬ê¸° ë??êµ¬ì?? í?? ë³´ì?´ê¸°"
+
+#~ msgid "Show tooltips in the main toolbar"
+#~ msgstr "ì£¼ ë??êµ¬ì?? í?? ë³´ì?´ê¸°"
+
+#~ msgid "Show tooltips in the property toolbar"
+#~ msgstr "ì??ì?± ë??êµ¬ì?? í?? ë³´ì?´ê¸°"
+
+#~ msgid "Template Designer"
+#~ msgstr "ì??ì?? ë??ì??ì?´ë??"
+
+#~ msgid "U_n-select All"
+#~ msgstr "ëª¨ë?  ì? í?? í?´ì ?(_N)"
+
+#~ msgid "Undo the last action"
+#~ msgstr "ë§?ì§?ë§? ë??ì??ì?¼ë¡? ë??ë??ë¦¬ê¸°"
+
+#~ msgid "_About..."
+#~ msgstr "...ì?? ë??í?´(_A)"
+
+#~ msgid "_Bottoms"
+#~ msgstr "ì??ë??(_B)"
+
+#~ msgid "_Contents"
+#~ msgstr "ëª©ì°¨(_C)"
+
+#~ msgid "_Copy"
+#~ msgstr "ë³µì?¬(_C)"
+
+#~ msgid "_Create Object"
+#~ msgstr "í?ëª© ë§?ë?¤ê¸°(_C)"
+
+#~ msgid "_Debug"
+#~ msgstr "ë??ë²?ê·¸(_D)"
+
+#~ msgid "_Desktop Default"
+#~ msgstr "ê¸°ë³¸ ë?°ì?¤í?¬í??(_D)"
+
+#~ msgid "_Drawing Toolbar"
+#~ msgstr "ê·¸ë¦¬ê¸° ë??êµ¬(_D)"
+
+#~ msgid "_Icon"
+#~ msgstr "ì??ì?´ì½?(_I)"
+
+#~ msgid "_Main Toolbar"
+#~ msgstr "ì£¼ ë??êµ¬(_M)"
+
+#~ msgid "_Merge Properties..."
+#~ msgstr "ì?¬ë°± ì??ì?±(_M)..."
+
+#~ msgid "_Paste"
+#~ msgstr "ë¶?ì?´ê¸°(_P)"
+
+#~ msgid "_Property Toolbar"
+#~ msgstr "ì??ì?± ë??êµ¬(_P)"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">ê¸°ë³¸ ì?©ì§? í?¬ê¸°</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">ì±?ì?°ê¸°</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">ì? </span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">ê¸?ì??</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">ì? ë??</span>"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Xxx ê°?ì²´ ì??ì?±</span>"
+
+#~ msgid "Load image"
+#~ msgstr "ê·¸ë¦¼ ë¶?ë?¬ì?´"
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Label or Card Size (Rectangular)"
+#~ msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë?? í?¬ê¸°(ì§?ì?¬ê°?í??)"
+
+#~ msgid "Agipa 119488: Business Cards"
+#~ msgstr "Agipa 119488: ëª?í?¨"
+
+#~ msgid "Allround Labels --24"
+#~ msgstr "Allround ë?¼ë²¨ --24"
+
+#~ msgid "Allround Labels --44"
+#~ msgstr "Allround ë?¼ë²¨ --44"
+
+#~ msgid "Allround Labels --64"
+#~ msgstr "Allround ë?¼ë²¨ --64"
+
+#~ msgid "Allround Labels --65"
+#~ msgstr "Allround ë?¼ë²¨ --65"
 
+#~ msgid "Mailing Labels --14"
+#~ msgstr "ë´?í?¬ ë?¼ë²¨ --14"
diff --git a/po/nb.po b/po/nb.po
index f0a4747..58aaf09 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,139 +6,365 @@ msgid ""
 msgstr ""
 "Project-Id-Version: contacts\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-15 13:58+0100\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-03-15 14:10+0100\n"
 "Last-Translator: Espen Stefansen <espens svn gnome org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb lister ping uio no>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/bc.c:65
+#: ../src/bc.c:66
 msgid "POSTNET (any)"
 msgstr ""
 
-#: ../src/bc.c:68
+#: ../src/bc.c:69
 msgid "POSTNET-5 (ZIP only)"
 msgstr ""
 
-#: ../src/bc.c:71
+#: ../src/bc.c:72
 msgid "POSTNET-9 (ZIP+4)"
 msgstr ""
 
-#: ../src/bc.c:74
+#: ../src/bc.c:75
 msgid "POSTNET-11 (DPBC)"
 msgstr ""
 
-#: ../src/bc.c:79
+#: ../src/bc.c:80
 msgid "CEPNET"
 msgstr ""
 
-#: ../src/bc.c:82
+#: ../src/bc.c:83
 msgid "EAN (any)"
 msgstr ""
 
-#: ../src/bc.c:85
+#: ../src/bc.c:86
 msgid "EAN-8"
 msgstr ""
 
-#: ../src/bc.c:88
+#: ../src/bc.c:89
 msgid "EAN-8 +2"
 msgstr ""
 
-#: ../src/bc.c:91
+#: ../src/bc.c:92
 msgid "EAN-8 +5"
 msgstr ""
 
-#: ../src/bc.c:94
+#: ../src/bc.c:95
 msgid "EAN-13"
 msgstr ""
 
-#: ../src/bc.c:97
+#: ../src/bc.c:98
 msgid "EAN-13 +2"
 msgstr ""
 
-#: ../src/bc.c:100
+#: ../src/bc.c:101
 msgid "EAN-13 +5"
 msgstr ""
 
-#: ../src/bc.c:103
+#: ../src/bc.c:104
 msgid "UPC (UPC-A or UPC-E)"
 msgstr ""
 
-#: ../src/bc.c:106
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr ""
 
-#: ../src/bc.c:109
+#: ../src/bc.c:110
 msgid "UPC-A +2"
 msgstr ""
 
-#: ../src/bc.c:112
+#: ../src/bc.c:113
 msgid "UPC-A +5"
 msgstr ""
 
-#: ../src/bc.c:115
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr ""
 
-#: ../src/bc.c:118
+#: ../src/bc.c:119
 msgid "UPC-E +2"
 msgstr ""
 
-#: ../src/bc.c:121
+#: ../src/bc.c:122
 msgid "UPC-E +5"
 msgstr ""
 
-#: ../src/bc.c:124
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr ""
 
-#: ../src/bc.c:127
+#: ../src/bc.c:128
 msgid "ISBN +5"
 msgstr ""
 
-#: ../src/bc.c:130
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr ""
 
-#: ../src/bc.c:133
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr ""
 
-#: ../src/bc.c:136
+#: ../src/bc.c:137
 msgid "Code 128C"
 msgstr ""
 
-#: ../src/bc.c:139
+#: ../src/bc.c:140
 msgid "Code 128B"
 msgstr ""
 
-#: ../src/bc.c:142
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr ""
 
-#: ../src/bc.c:145
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr ""
 
-#: ../src/bc.c:148
+#: ../src/bc.c:149
 msgid "MSI"
 msgstr ""
 
-#: ../src/bc.c:151
+#: ../src/bc.c:152
 msgid "Plessey"
 msgstr ""
 
-#: ../src/bc.c:154
+#: ../src/bc.c:155 ../src/bc.c:213
 msgid "Code 93"
 msgstr ""
 
-#: ../src/bc.c:161
-msgid "IEC16022 (DataMatrix)"
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
 msgstr ""
 
 #: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+msgid "Code One"
+msgstr ""
+
+#: ../src/bc.c:186
+msgid "Code 11"
+msgstr ""
+
+#: ../src/bc.c:189
+msgid "Code 16K"
+msgstr ""
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+msgid "Code 39 Extended"
+msgstr ""
+
+#: ../src/bc.c:210
+msgid "Code 49"
+msgstr ""
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+msgid "Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+msgid "HIBC Code 128"
+msgstr ""
+
+#: ../src/bc.c:267
+msgid "HIBC Code 39"
+msgstr ""
+
+#: ../src/bc.c:270
+msgid "HIBC Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+msgid "MSI Plessey"
+msgstr ""
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+msgid "PLANET"
+msgstr ""
+
+#: ../src/bc.c:324
+msgid "PostNet"
+msgstr ""
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Strekkode"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Slett"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+msgid "UK Plessey"
+msgstr ""
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
+
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -262,40 +488,40 @@ msgstr ""
 msgid "White"
 msgstr "Hvit"
 
-#: ../src/color-combo-menu.c:116
-#, c-format
-msgid "10\\% Gray"
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:117
-#, c-format
-msgid "25\\% Gray"
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:118
-#, c-format
-msgid "40\\% Gray"
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:119
-#, c-format
-msgid "50\\% Gray"
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:120
-#, c-format
-msgid "60\\% Gray"
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:121
+#: ../src/color-combo-menu.c:126
 msgid "Black"
 msgstr "Sort"
 
-#: ../src/color-combo-menu.c:249 ../src/color-combo-menu.c:368
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 msgid "Custom Color"
 msgstr "Egendefinert farge"
 
-#: ../src/color-combo-menu.c:314
+#: ../src/color-combo-menu.c:319
 #, c-format
 msgid "Custom Color #%u"
 msgstr ""
@@ -304,80 +530,80 @@ msgstr ""
 msgid "gLabels Fatal Error!"
 msgstr ""
 
-#: ../src/file.c:86
+#: ../src/file.c:84
 msgid "New Label or Card"
 msgstr ""
 
-#: ../src/file.c:190 ../src/label.c:584 ../src/label.c:628
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr ""
 
-#: ../src/file.c:296 ../src/file.c:586
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/file.c:301 ../src/file.c:591
+#: ../src/file.c:272 ../src/file.c:562
 msgid "gLabels documents"
 msgstr ""
 
-#: ../src/file.c:348 ../src/file.c:649
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
 msgstr ""
 
-#: ../src/file.c:351 ../src/file.c:367
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: ../src/file.c:364
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
-#: ../src/file.c:439
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr ""
 
-#: ../src/file.c:442
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr ""
 
-#: ../src/file.c:520 ../src/file.c:699
+#: ../src/file.c:491 ../src/file.c:670
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr ""
 
-#: ../src/file.c:524 ../src/file.c:703
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: ../src/file.c:564
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Lagre Â«%sÂ» som"
 
-#: ../src/file.c:652
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr ""
 
-#: ../src/file.c:673
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr ""
 
-#: ../src/file.c:677
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr "Filen eksisterer allerede."
 
-#: ../src/file.c:773
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: ../src/file.c:777
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: ../src/file.c:780
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "Lukk uten Ã¥ lagre"
 
@@ -428,78 +654,75 @@ msgstr "0123456789 .:,;(*!?)"
 msgid "Sample text"
 msgstr ""
 
-#: ../src/glabels-batch.c:52
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr ""
 
-#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "filnavn"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr ""
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "kopier"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "fÃ¸rste"
 
-#: ../src/glabels-batch.c:60
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr ""
 
-#: ../src/glabels-batch.c:62
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr ""
 
-#: ../src/glabels-batch.c:64
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr ""
 
-#: ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr ""
 
-#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr ""
 
-#: ../src/glabels-batch.c:98
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr ""
 
-#: ../src/glabels-batch.c:106 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/glabels-batch.c:149
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr ""
 
-#: ../src/glabels-batch.c:184
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr ""
@@ -520,11 +743,11 @@ msgstr ""
 msgid "Barcode property"
 msgstr ""
 
-#: ../src/label-barcode.c:482
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr ""
 
-#: ../src/label-barcode.c:486
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr ""
 
@@ -533,93 +756,93 @@ msgid "Create box object"
 msgstr ""
 
 #: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
-#: ../data/builder/property-bar.builder.h:3
+#: ../data/ui/property-bar.ui.h:3
 msgid "Fill color"
 msgstr ""
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../src/stock.c:94 ../data/builder/property-bar.builder.h:8
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
 msgid "Line color"
 msgstr ""
 
 #: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
-#: ../data/builder/property-bar.builder.h:9
+#: ../data/ui/property-bar.ui.h:9
 msgid "Line width"
 msgstr ""
 
-#: ../src/label.c:399
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr ""
 
-#: ../src/label.c:702 ../src/ui.c:422
+#: ../src/label.c:705 ../src/ui.c:422
 msgid "Merge properties"
 msgstr ""
 
-#: ../src/label.c:1184 ../src/ui.c:215
+#: ../src/label.c:1197 ../src/ui.c:215
 msgid "Delete"
 msgstr "Slett"
 
-#: ../src/label.c:1217 ../src/ui.c:324
+#: ../src/label.c:1230 ../src/ui.c:324
 msgid "Bring to front"
 msgstr ""
 
-#: ../src/label.c:1253 ../src/ui.c:331
+#: ../src/label.c:1266 ../src/ui.c:331
 msgid "Send to back"
 msgstr ""
 
-#: ../src/label.c:1294
+#: ../src/label.c:1307
 msgid "Rotate"
 msgstr "Roter"
 
-#: ../src/label.c:1329 ../src/ui.c:338
+#: ../src/label.c:1342 ../src/ui.c:338
 msgid "Rotate left"
 msgstr "Roter til venstre"
 
-#: ../src/label.c:1362 ../src/ui.c:345
+#: ../src/label.c:1375 ../src/ui.c:345
 msgid "Rotate right"
 msgstr "Roter til hÃ¸yre"
 
-#: ../src/label.c:1397 ../src/ui.c:352
+#: ../src/label.c:1410 ../src/ui.c:352
 msgid "Flip horizontally"
 msgstr "Vend horisontalt"
 
-#: ../src/label.c:1432 ../src/ui.c:359
+#: ../src/label.c:1445 ../src/ui.c:359
 msgid "Flip vertically"
 msgstr "Vend vertikalt"
 
-#: ../src/label.c:1472 ../src/ui.c:366
+#: ../src/label.c:1485 ../src/ui.c:366
 msgid "Align left"
 msgstr "Juster til venstre"
 
-#: ../src/label.c:1529 ../src/ui.c:373
+#: ../src/label.c:1542 ../src/ui.c:373
 msgid "Align right"
 msgstr "Juster til hÃ¸yre"
 
-#: ../src/label.c:1590 ../src/ui.c:380
+#: ../src/label.c:1603 ../src/ui.c:380
 msgid "Align horizontal center"
 msgstr ""
 
-#: ../src/label.c:1666 ../src/ui.c:387
+#: ../src/label.c:1679 ../src/ui.c:387
 msgid "Align tops"
 msgstr ""
 
-#: ../src/label.c:1723 ../src/ui.c:394
+#: ../src/label.c:1736 ../src/ui.c:394
 msgid "Align bottoms"
 msgstr ""
 
-#: ../src/label.c:1784 ../src/ui.c:401
+#: ../src/label.c:1797 ../src/ui.c:401
 msgid "Align vertical center"
 msgstr ""
 
-#: ../src/label.c:1862 ../src/ui.c:408
+#: ../src/label.c:1875 ../src/ui.c:408
 msgid "Center horizontally"
 msgstr ""
 
-#: ../src/label.c:1909 ../src/ui.c:415
+#: ../src/label.c:1922 ../src/ui.c:415
 msgid "Center vertically"
 msgstr ""
 
-#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
 msgid "Paste"
 msgstr ""
 
@@ -627,11 +850,11 @@ msgstr ""
 msgid "Create ellipse object"
 msgstr ""
 
-#: ../src/label-image.c:161 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:312
 msgid "Create image object"
 msgstr ""
 
-#: ../src/label-image.c:265 ../src/label-image.c:336
+#: ../src/label-image.c:333 ../src/label-image.c:474
 msgid "Set image"
 msgstr "Sett bilde"
 
@@ -665,51 +888,94 @@ msgstr ""
 msgid "Shadow opacity"
 msgstr "_Vis kontakt"
 
-#: ../src/label-text.c:266 ../src/ui.c:284
+#: ../src/label-text.c:279 ../src/ui.c:284
 msgid "Create text object"
 msgstr ""
 
-#: ../src/label-text.c:438
+#: ../src/label-text.c:451
 msgid "Typing"
 msgstr ""
 
-#: ../src/label-text.c:571 ../data/builder/property-bar.builder.h:4
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
 msgid "Font family"
 msgstr ""
 
-#: ../src/label-text.c:609 ../data/builder/property-bar.builder.h:5
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
 msgid "Font size"
 msgstr ""
 
-#: ../src/label-text.c:642
+#: ../src/label-text.c:655
 msgid "Font weight"
 msgstr ""
 
-#: ../src/label-text.c:675 ../data/builder/property-bar.builder.h:6
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
 msgid "Italic"
 msgstr ""
 
-#: ../src/label-text.c:708
+#: ../src/label-text.c:721
 msgid "Align text"
 msgstr ""
 
-#: ../src/label-text.c:741
+#: ../src/label-text.c:754
 msgid "Line spacing"
 msgstr ""
 
-#: ../src/label-text.c:774 ../data/builder/property-bar.builder.h:11
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr ""
 
-#: ../src/label-text.c:918
+#: ../src/label-text.c:931
 msgid "Auto shrink"
 msgstr ""
 
-#: ../src/media-combo-menu.c:130
-msgid "Recent templates"
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+msgctxt "Brand"
+msgid "Any"
+msgstr ""
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
+msgstr ""
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
 msgstr ""
 
-#: ../src/merge.c:169 ../src/merge.c:210 ../src/merge.c:374 ../src/merge.c:377
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr ""
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr ""
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
+
+#: ../src/media-select.c:1157
+msgid "No custom templates found."
+msgstr ""
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
 msgstr "Ingen"
 
@@ -755,11 +1021,19 @@ msgstr ""
 msgid "Text: Colon separated values with keys on line 1"
 msgstr ""
 
-#: ../src/merge-init.c:104
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
 msgid "Evolution Addressbook"
 msgstr "Evolution adressebok"
 
-#: ../src/merge-init.c:110
+#: ../src/merge-init.c:125
 msgid "VCards"
 msgstr "VCard"
 
@@ -771,7 +1045,7 @@ msgstr ""
 msgid "Select merge-database source"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:446
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
 msgid "N/A"
 msgstr ""
 
@@ -784,16 +1058,39 @@ msgstr "Velg"
 msgid "Record/Field"
 msgstr "_Fjern felt"
 
-#: ../src/merge-properties-dialog.c:360
-#: ../data/builder/object-editor.builder.h:10
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "Data"
 
-#: ../src/merge-properties-dialog.c:439
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
 msgid "Fixed"
 msgstr "Fast"
 
-#: ../src/object-editor-bc-page.c:92 ../src/object-editor-shadow-page.c:93
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Velg alle objekter"
+
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "Orientering:"
+
+#: ../src/new-label-dialog.c:229
+#, fuzzy
+msgid "Review"
+msgstr "Endre stÃ¸rrelse"
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
 #: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
 #: ../src/ui-property-bar.c:280
 msgid "Default"
@@ -854,25 +1151,17 @@ msgstr ""
 msgid "No Line"
 msgstr "Ingen linje"
 
-#: ../src/prefs-dialog.c:172 ../data/builder/prefs-dialog.builder.h:21
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
 msgid "gLabels Preferences"
 msgstr ""
 
 #. ===================================================================
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:217
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:6
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr ""
 
-#: ../src/rotate-label-button.c:122
-msgid "Normal"
-msgstr ""
-
-#: ../src/rotate-label-button.c:133
-msgid "Rotated"
-msgstr ""
-
 #: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr ""
@@ -970,54 +1259,56 @@ msgstr ""
 msgid "Not Linked"
 msgstr ""
 
-#: ../src/template-designer.c:397
-msgid "gLabels Template Designer"
+#: ../src/template-designer.c:404
+msgid "New gLabels Template"
 msgstr ""
 
-#: ../src/template-designer.c:454
+#: ../src/template-designer.c:461
 msgid "Welcome"
 msgstr ""
 
-#: ../src/template-designer.c:493
+#: ../src/template-designer.c:500
 msgid "Name and Description"
 msgstr ""
 
-#: ../src/template-designer.c:541
+#: ../src/template-designer.c:548
 msgid "Page Size"
 msgstr ""
 
-#: ../src/template-designer.c:607
+#: ../src/template-designer.c:614
 msgid "Label or Card Shape"
 msgstr ""
 
-#: ../src/template-designer.c:654
+#: ../src/template-designer.c:661
 msgid "Label or Card Size"
 msgstr ""
 
-#: ../src/template-designer.c:753
+#: ../src/template-designer.c:760
 msgid "Label Size (round)"
 msgstr ""
 
-#: ../src/template-designer.c:834
+#: ../src/template-designer.c:841
 msgid "Label Size (CD/DVD)"
 msgstr ""
 
-#: ../src/template-designer.c:925
+#: ../src/template-designer.c:932
 msgid "Number of Layouts"
 msgstr ""
 
-#: ../src/template-designer.c:993
+#: ../src/template-designer.c:1000
 msgid "Layout(s)"
 msgstr ""
 
-#: ../src/template-designer.c:1098
+#: ../src/template-designer.c:1105
 msgid "Design Completed"
 msgstr ""
 
-#: ../src/template-designer.c:1275
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
+msgstr ""
+
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
 msgstr ""
 
 #. Menu entries.
@@ -1250,8 +1541,8 @@ msgstr ""
 msgid "Select, move and modify objects"
 msgstr ""
 
-#: ../src/ui.c:282 ../src/view-text.c:102
-#: ../data/builder/object-editor.builder.h:30
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Tekst"
 
@@ -1263,7 +1554,8 @@ msgstr "Boks"
 msgid "Create box/rectangle object"
 msgstr ""
 
-#: ../src/ui.c:296 ../data/builder/object-editor.builder.h:19
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Linje"
 
@@ -1275,7 +1567,7 @@ msgstr ""
 msgid "Create ellipse/circle object"
 msgstr ""
 
-#: ../src/ui.c:310 ../data/builder/object-editor.builder.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Bilde"
 
@@ -1461,104 +1753,119 @@ msgstr ""
 msgid "(modified)"
 msgstr ""
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr ""
 
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:227
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr ""
 
-#: ../src/xml-label.c:264
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr ""
 
-#: ../src/xml-label.c:272
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: ../src/xml-label.c:281
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: ../src/xml-label.c:291
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr ""
 
-#: ../src/xml-label.c:360
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:856
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:779
+#: ../src/xml-label.c:944
+#, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr ""
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr ""
 
-#: ../src/xml-label.c:1104
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr ""
 
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:115
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "Ã?vrige"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:128
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr ""
 
-#: ../libglabels/db.c:488
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:880
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1826
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1893
+#: ../libglabels/db.c:2164
 #, c-format
 msgid "%s full page label"
 msgstr ""
 
-#: ../libglabels/template.c:148
+#: ../libglabels/template.c:156
 #, c-format
 msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr ""
 
-#: ../libglabels/template.c:714 ../libglabels/template.c:718
-msgid "per sheet"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, c-format
+msgid "%d Ã? %d (%d per sheet)"
 msgstr ""
 
-#: ../libglabels/template.c:718
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
 #, c-format
-msgid "%d %s"
+msgid "%d per sheet"
 msgstr ""
 
-#: ../libglabels/template.c:788 ../libglabels/template.c:794
-#: ../libglabels/template.c:804 ../libglabels/template.c:810
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
 msgid "diameter"
 msgstr ""
 
@@ -1566,14 +1873,14 @@ msgstr ""
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/builder/object-editor.builder.h:41
-#: ../data/builder/prefs-dialog.builder.h:22
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr ""
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/builder/object-editor.builder.h:40
-#: ../data/builder/template-designer.builder.h:64
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr ""
 
@@ -1592,32 +1899,32 @@ msgstr ""
 msgid "picas"
 msgstr ""
 
-#: ../libglabels/xml-template.c:221
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr ""
 
 #. This should always be an id, but just in case a name
 #. slips by!
-#: ../libglabels/xml-template.c:242
+#: ../libglabels/xml-template.c:244
 #, c-format
 msgid "Unknown page size id \"%s\", trying as name"
 msgstr ""
 
-#: ../libglabels/xml-template.c:254
+#: ../libglabels/xml-template.c:256
 #, c-format
 msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
-#: ../libglabels/xml-template.c:273
+#: ../libglabels/xml-template.c:275
 msgid "Forward references not supported."
 msgstr ""
 
-#: ../libglabels/xml-template.c:724
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 
-#: ../libglabels/xml-template.c:734
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr ""
 
@@ -1629,394 +1936,380 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr ""
-
-#: ../data/builder/merge-properties-dialog.builder.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Kilde</b>"
-
-#: ../data/builder/merge-properties-dialog.builder.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "Lokasjon:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Record selection/preview"
+msgstr ""
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Velg alle"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Kilde</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Velg bort alle"
 
-#: ../data/builder/new-label-dialog.builder.h:1
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "Egendefinert farge"
+
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "SidestÃ¸rrelse:"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Velg alle"
+
+#: ../data/ui/new-label-dialog.ui.h:1
 msgid ""
-"1\n"
-"2\n"
-"3\n"
-"4"
-msgstr ""
-"1\n"
-"2\n"
-"3\n"
-"4"
-
-#: ../data/builder/new-label-dialog.builder.h:5
-msgid "<b>Information</b>"
-msgstr "<b>Informasjon</b>"
-
-#: ../data/builder/new-label-dialog.builder.h:6
-msgid "<b>Preview</b>"
-msgstr "<b>ForhÃ¥ndsvisning</b>"
-
-#: ../data/builder/new-label-dialog.builder.h:7
-msgid "<b>Select media</b>"
-msgstr "<b>Velg medie:</b>"
-
-#: ../data/builder/new-label-dialog.builder.h:8
-#: ../data/builder/template-designer.builder.h:27
+"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:27
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../data/builder/new-label-dialog.builder.h:9
+#: ../data/ui/new-label-dialog.ui.h:3
 msgid "Label size:"
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:10
+#: ../data/ui/new-label-dialog.ui.h:4
 msgid "Layout:"
 msgstr "Utforming:"
 
-#: ../data/builder/new-label-dialog.builder.h:11
-msgid "Orientation:"
-msgstr "Orientering:"
-
-#: ../data/builder/new-label-dialog.builder.h:12
-#: ../data/builder/template-designer.builder.h:42
-msgid "Page size:"
-msgstr "SidestÃ¸rrelse:"
+#: ../data/ui/new-label-dialog.ui.h:5
+msgid "Normal"
+msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:13
-#: ../data/builder/template-designer.builder.h:43
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
 msgid "Part #:"
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:14
-msgid "Similar products:"
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:15
-msgid "Template:"
-msgstr "Mal:"
+#: ../data/ui/new-label-dialog.ui.h:9
+msgid "Rotated"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:16
+#: ../data/ui/new-label-dialog.ui.h:12
 msgid "Vendor:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:2
+#: ../data/ui/object-editor.ui.h:2
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/builder/object-editor.builder.h:3
-msgid "00000000000 00000"
-msgstr ""
-
-#: ../data/builder/object-editor.builder.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr ""
-
-#: ../data/builder/object-editor.builder.h:5
-#: ../data/builder/prefs-dialog.builder.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Sjekksum"
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Farge:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Familie:"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Fil:"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Fyll"
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "HÃ¸yde:"
 
-#: ../data/builder/object-editor.builder.h:17
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "NÃ¸kkel:"
 
-#: ../data/builder/object-editor.builder.h:18
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Lengde:"
 
-#: ../data/builder/object-editor.builder.h:20
-#: ../data/builder/prefs-dialog.builder.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:21
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Posisjon"
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Skygge"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "StÃ¸rrelse:"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../data/builder/object-editor.builder.h:31
-#: ../data/builder/prefs-dialog.builder.h:20
-#: ../data/builder/template-designer.builder.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Bredde:"
 
-#: ../data/builder/object-editor.builder.h:32
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:33
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "grader"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "format:"
 
-#: ../data/builder/prefs-dialog.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/builder/prefs-dialog.builder.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:6
-msgid "<span weight=\"bold\">Units</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "Default page size"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "Skrift:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Tommer"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 #, fuzzy
 msgid "Locale"
 msgstr "Lokalitet"
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "Millimeter"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Punkter"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:19 ../templates/paper-sizes.xml.h:35
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:19
+msgid "Units"
+msgstr ""
+
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -2027,19 +2320,19 @@ msgid ""
 "or \"Back\" to continue editing this design."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -2048,170 +2341,131 @@ msgid ""
 "The second example illustrates when two layouts are needed."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:46
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
 "This dialog will assist you in the creation of a custom gLabels template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:62
-msgid "cd_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:63
-msgid "finish_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:65
-msgid "layout_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:66
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 #, fuzzy
-msgid "name_page"
-msgstr "Hjemmeside"
-
-#: ../data/builder/template-designer.builder.h:67
-msgid "nlayouts_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:68
-msgid "pg_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:69
-msgid "rect_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:70
-msgid "round_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:71
-msgid "shape_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:72
-msgid "start_page"
-msgstr ""
+msgid "Copies"
+msgstr "Kopier:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:1
-msgid "<b>Copies</b>"
-msgstr "<b>Kopier</b>"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "Kopier:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
-msgid "<b>Merge Control</b>"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Merge Control"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
-msgid "<b>Options</b>"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
 msgstr "<b>Alternativer</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
-msgid "Collate"
-msgstr ""
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
-msgid "Copies:"
-msgstr "Kopier:"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:7
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 #, fuzzy
 msgid "Sheets:"
 msgstr "Gate"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:8
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
 msgid "Start on label"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:9
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
 msgid "from:"
 msgstr "fra:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:10
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
 msgid "on 1st sheet"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:14
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
 msgid "to:"
 msgstr "til:"
 
@@ -2356,7 +2610,8 @@ msgstr ""
 msgid "Any label"
 msgstr ""
 
-#: ../templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "Visittkort"
 
@@ -2372,7 +2627,8 @@ msgstr ""
 msgid "Rectangular labels"
 msgstr ""
 
-#: ../templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr ""
 
@@ -2388,6 +2644,7 @@ msgstr ""
 #: ../templates/dymo-other-templates.xml.h:4
 #: ../templates/maco-us-templates.xml.h:2
 #: ../templates/misc-iso-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
 #, fuzzy
@@ -2414,6 +2671,7 @@ msgstr "Visittkort"
 #: ../templates/avery-iso-templates.xml.h:14
 #: ../templates/misc-us-templates.xml.h:8
 #: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
 #: ../templates/worldlabel-us-templates.xml.h:2
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
@@ -2496,7 +2754,7 @@ msgstr ""
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
 #: ../templates/maco-us-templates.xml.h:3
-#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-us-templates.xml.h:30
 #: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr ""
@@ -2565,7 +2823,7 @@ msgstr ""
 #. ===============================================================
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:20
-#: ../templates/misc-us-templates.xml.h:18
+#: ../templates/misc-us-templates.xml.h:20
 #: ../templates/misc-iso-templates.xml.h:36
 #: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
@@ -2677,35 +2935,40 @@ msgid "DLT Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:20
-msgid "Microtube labels"
+#: ../templates/misc-us-templates.xml.h:18
+msgid "Jewel Case Booklet"
 msgstr ""
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:22
+msgid "Microtube labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:24
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:26
+#: ../templates/misc-us-templates.xml.h:28
 #: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:31
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr ""
 
@@ -2788,6 +3051,12 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "Adressebok"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr ""
 
@@ -2797,6 +3066,135 @@ msgid "Multi-Purpose Labels"
 msgstr ""
 
 #. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Adressebok"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Om glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Visittkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Visittkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Visittkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Visittkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+msgid "Floppy disk labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Visittkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+msgid "Labels A4"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+msgid "Labels A5"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+msgid "Labels A6"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+#, fuzzy
+msgid "Name plates"
+msgstr "Mal:"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Om glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+msgid "SD card labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Self-adhesive labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr ""
@@ -2831,3 +3229,29 @@ msgstr ""
 msgid "Video Labels (back)"
 msgstr ""
 
+#~ msgid ""
+#~ "1\n"
+#~ "2\n"
+#~ "3\n"
+#~ "4"
+#~ msgstr ""
+#~ "1\n"
+#~ "2\n"
+#~ "3\n"
+#~ "4"
+
+#~ msgid "<b>Information</b>"
+#~ msgstr "<b>Informasjon</b>"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>ForhÃ¥ndsvisning</b>"
+
+#~ msgid "<b>Select media</b>"
+#~ msgstr "<b>Velg medie:</b>"
+
+#, fuzzy
+#~ msgid "name_page"
+#~ msgstr "Hjemmeside"
+
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>Kopier</b>"
diff --git a/po/pl.po b/po/pl.po
index d5b935c..e0aad11 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,183 +6,365 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gLabels\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 21:56+0200\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2002-07-23 11:43+0100\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec elka pw edu pl>\n"
 "Language-Team: Polish <pl li org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bc-backends/barcode-0.98/compat/getopt.c:583
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: ../bc-backends/barcode-0.98/compat/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: ../bc-backends/barcode-0.98/compat/getopt.c:612
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: ../bc-backends/barcode-0.98/compat/getopt.c:629
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: ../bc-backends/barcode-0.98/compat/getopt.c:658
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: ../bc-backends/barcode-0.98/compat/getopt.c:662
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: ../bc-backends/barcode-0.98/compat/getopt.c:688
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: ../bc-backends/barcode-0.98/compat/getopt.c:691
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: ../bc-backends/barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: ../src/bc.c:65
+#: ../src/bc.c:66
 msgid "POSTNET (any)"
 msgstr ""
 
-#: ../src/bc.c:68
+#: ../src/bc.c:69
 msgid "POSTNET-5 (ZIP only)"
 msgstr ""
 
-#: ../src/bc.c:71
+#: ../src/bc.c:72
 msgid "POSTNET-9 (ZIP+4)"
 msgstr ""
 
-#: ../src/bc.c:74
+#: ../src/bc.c:75
 msgid "POSTNET-11 (DPBC)"
 msgstr ""
 
-#: ../src/bc.c:77
+#: ../src/bc.c:80
 msgid "CEPNET"
 msgstr ""
 
-#: ../src/bc.c:80
+#: ../src/bc.c:83
 msgid "EAN (any)"
 msgstr ""
 
-#: ../src/bc.c:83
+#: ../src/bc.c:86
 msgid "EAN-8"
 msgstr ""
 
-#: ../src/bc.c:86
+#: ../src/bc.c:89
 msgid "EAN-8 +2"
 msgstr ""
 
-#: ../src/bc.c:89
+#: ../src/bc.c:92
 msgid "EAN-8 +5"
 msgstr ""
 
-#: ../src/bc.c:92
+#: ../src/bc.c:95
 msgid "EAN-13"
 msgstr ""
 
-#: ../src/bc.c:95
+#: ../src/bc.c:98
 msgid "EAN-13 +2"
 msgstr ""
 
-#: ../src/bc.c:98
+#: ../src/bc.c:101
 msgid "EAN-13 +5"
 msgstr ""
 
-#: ../src/bc.c:101
+#: ../src/bc.c:104
 msgid "UPC (UPC-A or UPC-E)"
 msgstr ""
 
-#: ../src/bc.c:104
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr ""
 
-#: ../src/bc.c:107
+#: ../src/bc.c:110
 msgid "UPC-A +2"
 msgstr ""
 
-#: ../src/bc.c:110
+#: ../src/bc.c:113
 msgid "UPC-A +5"
 msgstr ""
 
-#: ../src/bc.c:113
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr ""
 
-#: ../src/bc.c:116
+#: ../src/bc.c:119
 msgid "UPC-E +2"
 msgstr ""
 
-#: ../src/bc.c:119
+#: ../src/bc.c:122
 msgid "UPC-E +5"
 msgstr ""
 
-#: ../src/bc.c:122
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr ""
 
-#: ../src/bc.c:125
+#: ../src/bc.c:128
 msgid "ISBN +5"
 msgstr ""
 
-#: ../src/bc.c:128
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr ""
 
-#: ../src/bc.c:131
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr ""
 
-#: ../src/bc.c:134
+#: ../src/bc.c:137
 msgid "Code 128C"
 msgstr ""
 
-#: ../src/bc.c:137
+#: ../src/bc.c:140
 msgid "Code 128B"
 msgstr ""
 
-#: ../src/bc.c:140
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr ""
 
-#: ../src/bc.c:143
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr ""
 
-#: ../src/bc.c:146
+#: ../src/bc.c:149
 msgid "MSI"
 msgstr ""
 
-#: ../src/bc.c:149
+#: ../src/bc.c:152
 msgid "Plessey"
 msgstr ""
 
-#: ../src/bc.c:152
+#: ../src/bc.c:155 ../src/bc.c:213
+msgid "Code 93"
+msgstr ""
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+msgid "Code One"
+msgstr ""
+
+#: ../src/bc.c:186
+msgid "Code 11"
+msgstr ""
+
+#: ../src/bc.c:189
+msgid "Code 16K"
+msgstr ""
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+msgid "Code 39 Extended"
+msgstr ""
+
+#: ../src/bc.c:210
+msgid "Code 49"
+msgstr ""
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+msgid "Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+msgid "HIBC Code 128"
+msgstr ""
+
+#: ../src/bc.c:267
+msgid "HIBC Code 39"
+msgstr ""
+
+#: ../src/bc.c:270
+msgid "HIBC Data Matrix"
+msgstr ""
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+msgid "MSI Plessey"
+msgstr ""
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+msgid "PLANET"
+msgstr ""
+
+#: ../src/bc.c:324
+msgid "PostNet"
+msgstr ""
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Kod paskowy"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "UsuÃ±"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+msgid "UK Plessey"
+msgstr ""
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr ""
 
-#: ../src/bc.c:155
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -311,41 +493,41 @@ msgstr ""
 msgid "White"
 msgstr ""
 
-#: ../src/color-combo-menu.c:116
-#, c-format
+#: ../src/color-combo-menu.c:117
+#, no-c-format
 msgid "10% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:117
-#, c-format
+#: ../src/color-combo-menu.c:119
+#, no-c-format
 msgid "25% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:118
-#, c-format
+#: ../src/color-combo-menu.c:121
+#, no-c-format
 msgid "40% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:119
-#, c-format
+#: ../src/color-combo-menu.c:123
+#, no-c-format
 msgid "50% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:120
-#, c-format
+#: ../src/color-combo-menu.c:125
+#, no-c-format
 msgid "60% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:121
+#: ../src/color-combo-menu.c:126
 msgid "Black"
 msgstr ""
 
-#: ../src/color-combo-menu.c:249 ../src/color-combo-menu.c:368
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 #, fuzzy
 msgid "Custom Color"
 msgstr "Kolor:"
 
-#: ../src/color-combo-menu.c:314
+#: ../src/color-combo-menu.c:319
 #, fuzzy, c-format
 msgid "Custom Color #%u"
 msgstr "Kolor:"
@@ -354,196 +536,480 @@ msgstr "Kolor:"
 msgid "gLabels Fatal Error!"
 msgstr ""
 
-#: ../src/file.c:86
+#: ../src/file.c:84
 msgid "New Label or Card"
 msgstr "Nowa etykieta lub karta"
 
-#: ../src/file.c:188
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 #, fuzzy
 msgid "Label properties"
 msgstr "WÂ³aÂ¶ciwoÂ¶ci tekstu"
 
-#: ../src/file.c:291 ../src/file.c:581
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr ""
 
-#: ../src/file.c:296 ../src/file.c:586
+#: ../src/file.c:272 ../src/file.c:562
 #, fuzzy
 msgid "gLabels documents"
 msgstr "Glabels: Preferencje"
 
-#: ../src/file.c:343 ../src/file.c:644
+#: ../src/file.c:319 ../src/file.c:620
 #, fuzzy
 msgid "Empty file name selection"
 msgstr "Usuwa wszelkie zaznaczenia"
 
-#: ../src/file.c:346 ../src/file.c:362
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: ../src/file.c:359
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr ""
 
-#: ../src/file.c:434
+#: ../src/file.c:410
 #, fuzzy, c-format
 msgid "Could not open file \"%s\""
 msgstr "Nie moÂ¿na otworzyÃ¦ pliku"
 
-#: ../src/file.c:437
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr ""
 
-#: ../src/file.c:515 ../src/file.c:694
+#: ../src/file.c:491 ../src/file.c:670
 #, fuzzy, c-format
 msgid "Could not save file \"%s\""
 msgstr "Nie moÂ¿na zapisaÃ¦ pliku"
 
-#: ../src/file.c:519 ../src/file.c:698
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: ../src/file.c:559
+#: ../src/file.c:535
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "Zapisz etykietÃª jako"
 
-#: ../src/file.c:647
+#: ../src/file.c:623
 #, fuzzy
 msgid "Please supply a valid file name"
 msgstr "NaleÂ¿y podaÃ¦ nazwÃª pliku"
 
-#: ../src/file.c:668
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr ""
 
-#: ../src/file.c:672
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr ""
 
-#: ../src/file.c:768
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: ../src/file.c:772
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: ../src/file.c:775
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr ""
 
-#: ../src/font-combo-menu.c:127
+#: ../src/font-combo-menu.c:137
+msgid "Recent fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:152
 msgid "Proportional fonts"
 msgstr ""
 
-#: ../src/font-combo-menu.c:142
+#: ../src/font-combo-menu.c:160
 msgid "Fixed-width fonts"
 msgstr ""
 
-#: ../src/font-combo-menu.c:157
+#: ../src/font-combo-menu.c:168
 msgid "All fonts"
 msgstr ""
 
-#: ../src/glabels-batch.c:51
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+#, fuzzy
+msgid "Sample text"
+msgstr "PrÃ³bne dane"
+
+#: ../src/glabels-batch.c:53
 #, fuzzy
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "okreÂ¶l nazwÃª pliku wyjÂ¶ciowego (domyÂ¶lnie=\"output.ps\")"
 
-#: ../src/glabels-batch.c:51 ../src/glabels-batch.c:65
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "nazwa pliku"
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "liczba arkuszy (domyÂ¶lnie=1)"
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "arkusz(e/y)"
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "liczba kopii (domyÂ¶lnie=1)"
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "kopi(a/e/i)"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:59
 #, fuzzy
 msgid "first label on first sheet (default=1)"
 msgstr "liczba arkuszy (domyÂ¶lnie=1)"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr ""
 
-#: ../src/glabels-batch.c:59
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "drukowanie ramek (w celu przetestowania wyrÃ³wnania)"
 
-#: ../src/glabels-batch.c:61
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "drukowanie odwrÃ³cone (np. odbicie zwierciadlane)"
 
-#: ../src/glabels-batch.c:63
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr ""
 
-#: ../src/glabels-batch.c:65
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr ""
 
-#: ../src/glabels-batch.c:67 ../src/glabels.c:62
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr ""
 
-#: ../src/glabels-batch.c:96
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr ""
 
-#: ../src/glabels-batch.c:104 ../src/glabels.c:87
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/glabels-batch.c:146
+#: ../src/glabels-batch.c:151
 #, fuzzy, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "nie moÂ¿na otworzyÃ¦ pliku glabels o nazwie %s\n"
 
-#: ../src/glabels-batch.c:180
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "nie moÂ¿na otworzyÃ¦ pliku glabels o nazwie %s\n"
 
-#: ../src/glabels.c:79
+#: ../src/glabels.c:81
 msgid "Launch gLabels label and business card designer."
 msgstr ""
 
-#: ../src/label-barcode.c:435
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Tworzy kod paskowy"
+
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "Dane kodu paskowego"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci kodu paskowego"
+
+#: ../src/label-barcode.c:485
 #, fuzzy
 msgid "Barcode data empty"
 msgstr "Dane kodu paskowego"
 
-#: ../src/label-barcode.c:439
+#: ../src/label-barcode.c:489
 #, fuzzy
 msgid "Invalid barcode data"
 msgstr "Niepoprawny kod paskowy"
 
-#: ../src/label.c:547
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "Tworzy obiekt tekstowy"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr ""
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr ""
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr ""
+
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr ""
 
-#: ../src/merge.c:169 ../src/merge.c:210 ../src/merge.c:374 ../src/merge.c:377
+#: ../src/label.c:705 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "WÂ³aÂ¶ciwoÂ¶ci zÂ³Â±czania"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "UsuÃ±"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "Przesun na wierzch"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "PrzesuÃ± w dÃ³Â³"
+
+#: ../src/label.c:1307
+#, fuzzy
+msgid "Rotate"
+msgstr "ObrÃ³Ã¦"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "ObrÃ³Ã¦"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "ObrÃ³Ã¦"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr ""
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr ""
+
+#: ../src/label.c:1485 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "WyrÃ³wnanie:"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr ""
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr ""
+
+#: ../src/label.c:1679 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "WyrÃ³wnanie:"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr ""
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr ""
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr ""
+
+#: ../src/label.c:1922 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "OgÃ³lne"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr ""
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Tworzy liniÃª"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Tworzy obraz"
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "Wyzeruj rozmiar obrazu"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Tworzy liniÃª"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Rozmiar strony:"
+
+#: ../src/label-object.c:1185
+msgid "Shadow state"
+msgstr ""
+
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
+msgstr ""
+
+#: ../src/label-object.c:1276
+msgid "Shadow color"
+msgstr ""
+
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
+msgstr ""
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Tworzy obiekt tekstowy"
+
+#: ../src/label-text.c:451
+msgid "Typing"
+msgstr ""
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "Nie zapisuj"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+#, fuzzy
+msgid "Font size"
+msgstr "Nie zapisuj"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "ObrÃ³Ã¦"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr ""
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "WyrÃ³wnanie:"
+
+#: ../src/label-text.c:754
+msgid "Line spacing"
+msgstr ""
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr ""
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+msgctxt "Brand"
+msgid "Any"
+msgstr ""
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
+msgstr ""
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
+msgstr ""
+
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "Nie znaleziono pliku szablonu!"
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr ""
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Nie znaleziono pliku szablonu!"
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
 msgstr "Brak"
 
@@ -566,140 +1032,182 @@ msgid "Couldn't get contacts."
 msgstr ""
 
 #: ../src/merge-init.c:57
-#, fuzzy
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Tekst oddzielony przecinkami (CSV)"
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
 #: ../src/merge-init.c:64
-#, fuzzy
-msgid "Text file with colon delimeters"
-msgstr "Tekst oddzielany dwukropkami"
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: ../src/merge-init.c:71
-#, fuzzy
-msgid "Text file with tab delimeters"
-msgstr "Tekst oddzielony tabulacjami"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: ../src/merge-init.c:80
-msgid "Data from default Evolution Addressbook"
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
 msgstr ""
 
-#: ../src/merge-init.c:86
-msgid "Data from a file containing VCards"
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:279
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Nie moÂ¿na otworzyÃ¦ pliku"
+
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr ""
+
+#: ../src/merge-properties-dialog.c:282
 #, fuzzy
 msgid "Merge Properties"
 msgstr "WÂ³aÂ¶ciwoÂ¶ci zÂ³Â±czania"
 
-#: ../src/merge-properties-dialog.c:305 ../src/merge-properties-dialog.c:421
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
 msgid "Select merge-database source"
 msgstr "Wybierz Å?rÃ³dÂ³o bazy danych zÂ³Â±czania "
 
-#: ../src/merge-properties-dialog.c:316 ../src/merge-properties-dialog.c:443
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/merge-properties-dialog.c:342
+#: ../src/merge-properties-dialog.c:345
 msgid "Select"
 msgstr "Wybierz"
 
-#: ../src/merge-properties-dialog.c:349
+#: ../src/merge-properties-dialog.c:352
 msgid "Record/Field"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:357
-#: ../data/builder/object-editor.builder.h:10
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "Dane"
 
-#: ../src/merge-properties-dialog.c:436
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
 #, fuzzy
 msgid "Fixed"
 msgstr "Pola"
 
-#: ../src/new-label-dialog.c:112
-#, fuzzy
-msgid "<b>Media type</b>"
-msgstr "Typ noÂ¶nika"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
 
-#: ../src/new-label-dialog.c:122
+#: ../src/new-label-dialog.c:203
 #, fuzzy
-msgid "<b>Label orientation</b>"
-msgstr "UÂ³oÂ¿enie etykiety"
+msgid "Select Product"
+msgstr "Wybierz"
 
-#: ../src/object-editor-bc-page.c:91 ../src/object-editor-shadow-page.c:91
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:337
-#: ../src/ui-property-bar.c:278
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
+
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
 #, fuzzy
 msgid "Default"
 msgstr "UsuÃ±"
 
-#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:343
-#: ../src/ui-property-bar.c:290
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+#, fuzzy
+msgid "Object properties"
+msgstr "WÂ³aÂ¶ciwoÂ¶ci tekstu"
+
+#: ../src/object-editor.c:309
+#, fuzzy
+msgid "Box object properties"
+msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci skrzynki"
+
+#: ../src/object-editor.c:328
+#, fuzzy
+msgid "Ellipse object properties"
+msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci elipsy"
+
+#: ../src/object-editor.c:347
+#, fuzzy
+msgid "Line object properties"
+msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci skrzynki"
+
+#: ../src/object-editor.c:364
+#, fuzzy
+msgid "Image object properties"
+msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci obrazu"
+
+#: ../src/object-editor.c:381
+#, fuzzy
+msgid "Text object properties"
+msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci skrzynki"
+
+#: ../src/object-editor.c:403
+#, fuzzy
+msgid "Barcode object properties"
+msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci kodu paskowego"
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Wstaw pole zÂ³Â±czenia"
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
 #, fuzzy
 msgid "No Fill"
 msgstr "WypeÂ³nienie"
 
-#: ../src/object-editor-image-page.c:270
+#: ../src/object-editor-image-page.c:278
 msgid "All Files"
 msgstr ""
 
-#: ../src/object-editor-image-page.c:275
+#: ../src/object-editor-image-page.c:283
 #, fuzzy
 msgid "All Images"
 msgstr "Obraz"
 
-#: ../src/object-editor-image-page.c:290
+#: ../src/object-editor-image-page.c:298
 #, c-format
 msgid "%s (*.%s)"
 msgstr ""
 
-#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:340
-#: ../src/ui-property-bar.c:302
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
 #, fuzzy
 msgid "No Line"
 msgstr "Brak"
 
-#. Should not happen
-#: ../src/prefs.c:156 ../src/prefs.c:163
-#: ../data/builder/object-editor.builder.h:42
-#: ../data/builder/prefs-dialog.builder.h:22
-msgid "points"
-msgstr "punkty(-Ã³w)"
-
-#: ../src/prefs.c:158 ../data/builder/object-editor.builder.h:41
-#: ../data/builder/template-designer.builder.h:64
-msgid "inches"
-msgstr "cali"
-
-#: ../src/prefs.c:160
-msgid "mm"
-msgstr "mm"
-
-#: ../src/prefs-dialog.c:172 ../data/builder/prefs-dialog.builder.h:21
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
 #, fuzzy
 msgid "gLabels Preferences"
 msgstr "Glabels: Preferencje"
 
 #. ===================================================================
-#: ../src/print-op.c:203 ../src/print-op-dialog.c:217
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:6
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etykiety"
 
-#: ../src/rotate-label-button.c:122
-#, fuzzy
-msgid "Normal"
-msgstr "Format:"
-
-#: ../src/rotate-label-button.c:133
-#, fuzzy
-msgid "Rotated"
-msgstr "ObrÃ³Ã¦"
-
 #: ../src/stock.c:70
 #, fuzzy
 msgid "_Select Mode"
@@ -802,14 +1310,6 @@ msgstr ""
 msgid "Label Ce_nter"
 msgstr ""
 
-#: ../src/stock.c:93 ../data/builder/property-bar.builder.h:3
-msgid "Fill color"
-msgstr ""
-
-#: ../src/stock.c:94 ../data/builder/property-bar.builder.h:7
-msgid "Line color"
-msgstr ""
-
 #: ../src/stock.c:95 ../src/stock.c:97
 #, fuzzy
 msgid "Linked"
@@ -820,579 +1320,498 @@ msgstr "Linia"
 msgid "Not Linked"
 msgstr "Brak"
 
-#: ../src/template-designer.c:401
-msgid "gLabels Template Designer"
+#: ../src/template-designer.c:404
+msgid "New gLabels Template"
 msgstr ""
 
-#: ../src/template-designer.c:456
+#: ../src/template-designer.c:461
 msgid "Welcome"
 msgstr ""
 
-#: ../src/template-designer.c:495
+#: ../src/template-designer.c:500
 #, fuzzy
 msgid "Name and Description"
 msgstr "Opis:"
 
-#: ../src/template-designer.c:543
+#: ../src/template-designer.c:548
 #, fuzzy
 msgid "Page Size"
 msgstr "Rozmiar strony:"
 
-#: ../src/template-designer.c:609
+#: ../src/template-designer.c:614
 #, fuzzy
 msgid "Label or Card Shape"
 msgstr "Nowa etykieta lub karta"
 
-#: ../src/template-designer.c:655
+#: ../src/template-designer.c:661
 #, fuzzy
 msgid "Label or Card Size"
 msgstr "Nowa etykieta lub karta"
 
-#: ../src/template-designer.c:751
+#: ../src/template-designer.c:760
 #, fuzzy
 msgid "Label Size (round)"
 msgstr "Rozmiar etykiety:"
 
-#: ../src/template-designer.c:829
+#: ../src/template-designer.c:841
 msgid "Label Size (CD/DVD)"
 msgstr ""
 
-#: ../src/template-designer.c:917
+#: ../src/template-designer.c:932
 msgid "Number of Layouts"
 msgstr ""
 
-#: ../src/template-designer.c:981
+#: ../src/template-designer.c:1000
 #, fuzzy
 msgid "Layout(s)"
 msgstr "WyglÂ±d:"
 
-#: ../src/template-designer.c:1086
+#: ../src/template-designer.c:1105
 msgid "Design Completed"
 msgstr ""
 
-#: ../src/template-designer.c:1259
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
+msgstr ""
+
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
 msgstr ""
 
 #. Menu entries.
-#: ../src/ui.c:88
+#: ../src/ui.c:93
 #, fuzzy
 msgid "_File"
 msgstr "WypeÂ³nienie"
 
-#: ../src/ui.c:89
+#: ../src/ui.c:94
 #, fuzzy
 msgid "Open Recent _Files"
 msgstr "Otwiera plik"
 
-#: ../src/ui.c:90
+#: ../src/ui.c:95
 msgid "_Edit"
 msgstr ""
 
-#: ../src/ui.c:91
+#: ../src/ui.c:96
 #, fuzzy
 msgid "_View"
 msgstr "_Nowa"
 
-#: ../src/ui.c:92
+#: ../src/ui.c:97
 msgid "Customize Main Toolbar"
 msgstr ""
 
-#: ../src/ui.c:93
+#: ../src/ui.c:98
 msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: ../src/ui.c:94
+#: ../src/ui.c:99
 msgid "Customize Properties Toolbar"
 msgstr ""
 
-#: ../src/ui.c:95
+#: ../src/ui.c:100
 msgid "_Objects"
 msgstr ""
 
-#: ../src/ui.c:96
+#: ../src/ui.c:101
 #, fuzzy
 msgid "_Create"
 msgstr "Tworzy obiekt tekstowy"
 
-#: ../src/ui.c:97
+#: ../src/ui.c:102
 msgid "_Order"
 msgstr ""
 
-#: ../src/ui.c:98
+#: ../src/ui.c:103
 #, fuzzy
 msgid "_Rotate/Flip"
 msgstr "ObrÃ³Ã¦"
 
-#: ../src/ui.c:99
+#: ../src/ui.c:104
 msgid "Align _Horizontal"
 msgstr ""
 
-#: ../src/ui.c:100
+#: ../src/ui.c:105
 msgid "Align _Vertical"
 msgstr ""
 
-#: ../src/ui.c:101
+#: ../src/ui.c:106
 msgid "_Help"
 msgstr ""
 
 #. Popup entries.
-#: ../src/ui.c:104 ../src/ui.c:105
+#: ../src/ui.c:109 ../src/ui.c:110
 msgid "Context Menu"
 msgstr ""
 
-#: ../src/ui.c:110
+#: ../src/ui.c:115
 msgid "_New"
 msgstr "_Nowa"
 
-#: ../src/ui.c:112
+#: ../src/ui.c:117
 #, fuzzy
 msgid "Create a new file"
 msgstr "Tworzy liniÃª"
 
-#: ../src/ui.c:117
+#: ../src/ui.c:122
 #, fuzzy
 msgid "_Open..."
 msgstr "OtwÃ³rz"
 
-#: ../src/ui.c:119
+#: ../src/ui.c:124
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ../src/ui.c:124
+#: ../src/ui.c:129
 #, fuzzy
 msgid "_Save"
 msgstr "Zapisz jako"
 
-#: ../src/ui.c:126
+#: ../src/ui.c:131
 #, fuzzy
 msgid "Save current file"
 msgstr "Zapisuje bieÂ¿Â±cy plik"
 
-#: ../src/ui.c:131
+#: ../src/ui.c:136
 #, fuzzy
 msgid "Save _As..."
 msgstr "Zapisz jako"
 
-#: ../src/ui.c:133
+#: ../src/ui.c:138
 #, fuzzy
 msgid "Save the current file to a different name"
 msgstr "Zapisuje bieÂ¿Â±cy plik"
 
-#: ../src/ui.c:138
+#: ../src/ui.c:143
 #, fuzzy
 msgid "_Print..."
 msgstr "Wydrukuj"
 
-#: ../src/ui.c:140
+#: ../src/ui.c:145
 #, fuzzy
 msgid "Print the current file"
 msgstr "Drukuje bieÂ¿Â±cy plik"
 
-#: ../src/ui.c:145
+#: ../src/ui.c:150
 #, fuzzy
 msgid "Properties..."
 msgstr "WÂ³aÂ¶ciwoÂ¶ci tekstu"
 
-#: ../src/ui.c:147
+#: ../src/ui.c:152
 #, fuzzy
 msgid "Modify document properties"
 msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci zÂ³Â±czania dokumentÃ³w"
 
-#: ../src/ui.c:152
+#: ../src/ui.c:157
 msgid "Template _Designer..."
 msgstr ""
 
-#: ../src/ui.c:154
+#: ../src/ui.c:159
 #, fuzzy
 msgid "Create a custom template"
 msgstr "Tworzy liniÃª"
 
-#: ../src/ui.c:159
+#: ../src/ui.c:164
 msgid "_Close"
 msgstr ""
 
-#: ../src/ui.c:161
+#: ../src/ui.c:166
 #, fuzzy
 msgid "Close the current file"
 msgstr "Zapisuje bieÂ¿Â±cy plik"
 
-#: ../src/ui.c:166
+#: ../src/ui.c:171
 msgid "_Quit"
 msgstr ""
 
-#: ../src/ui.c:168
+#: ../src/ui.c:173
 msgid "Quit the program"
 msgstr ""
 
-#: ../src/ui.c:175
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr ""
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr ""
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr ""
 
-#: ../src/ui.c:177
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr ""
 
-#: ../src/ui.c:182
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr ""
 
-#: ../src/ui.c:184
+#: ../src/ui.c:203
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Usuwa wszelkie zaznaczenia"
 
-#: ../src/ui.c:189
-msgid "Paste"
-msgstr ""
-
-#: ../src/ui.c:191
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../src/ui.c:196
-msgid "Delete"
-msgstr "UsuÃ±"
-
-#: ../src/ui.c:198
+#: ../src/ui.c:217
 #, fuzzy
 msgid "Delete the selected objects"
 msgstr "Tworzy obiekt tekstowy"
 
-#: ../src/ui.c:203
+#: ../src/ui.c:222
 #, fuzzy
 msgid "Select All"
 msgstr "O_dznacz wszystko"
 
-#: ../src/ui.c:205
+#: ../src/ui.c:224
 #, fuzzy
 msgid "Select all objects"
 msgstr "Wybierz, przenoÂ¶ i modyfikuj obiekty"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:229
 #, fuzzy
 msgid "Un-select All"
 msgstr "O_dznacz wszystko"
 
-#: ../src/ui.c:212
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "Usuwa wszelkie zaznaczenia"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:236
 #, fuzzy
 msgid "Preferences"
 msgstr "Glabels: Preferencje"
 
-#: ../src/ui.c:219
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr ""
 
-#: ../src/ui.c:226
+#: ../src/ui.c:245
 #, fuzzy
 msgid "Zoom in"
 msgstr "PowiÃªksz"
 
-#: ../src/ui.c:228
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr ""
 
-#: ../src/ui.c:233
+#: ../src/ui.c:252
 #, fuzzy
 msgid "Zoom out"
 msgstr "Pomniejsz"
 
-#: ../src/ui.c:235
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr ""
 
-#: ../src/ui.c:240
+#: ../src/ui.c:259
 #, fuzzy
 msgid "Zoom 1 to 1"
 msgstr "PowiÃªkszenie 1:1"
 
-#: ../src/ui.c:242
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr ""
 
-#: ../src/ui.c:247
+#: ../src/ui.c:266
 #, fuzzy
 msgid "Zoom to fit"
 msgstr "PowiÃªksza 1:1"
 
-#: ../src/ui.c:249
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr ""
 
-#: ../src/ui.c:256
+#: ../src/ui.c:275
 #, fuzzy
 msgid "Select Mode"
 msgstr "Wybierz"
 
-#: ../src/ui.c:258
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "Wybierz, przenoÂ¶ i modyfikuj obiekty"
 
-#: ../src/ui.c:263 ../src/view-text.c:501
-#: ../data/builder/object-editor.builder.h:31
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/ui.c:265
-msgid "Create text object"
-msgstr "Tworzy obiekt tekstowy"
-
-#: ../src/ui.c:270
+#: ../src/ui.c:289
 #, fuzzy
 msgid "Box"
 msgstr "Skrzynka"
 
-#: ../src/ui.c:272
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr "Tworzy skrzynkÃª/prostokÂ±t"
 
-#: ../src/ui.c:277 ../data/builder/object-editor.builder.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Linia"
 
-#: ../src/ui.c:279
-msgid "Create line object"
-msgstr "Tworzy liniÃª"
-
-#: ../src/ui.c:284
+#: ../src/ui.c:303
 #, fuzzy
 msgid "Ellipse"
 msgstr "Elipsa"
 
-#: ../src/ui.c:286
+#: ../src/ui.c:305
 msgid "Create ellipse/circle object"
 msgstr "Tworzy elipsÃª/okrÂ±g"
 
-#: ../src/ui.c:291 ../data/builder/object-editor.builder.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Obraz"
 
-#: ../src/ui.c:293
-msgid "Create image object"
-msgstr "Tworzy obraz"
-
-#: ../src/ui.c:298
+#: ../src/ui.c:317
 #, fuzzy
 msgid "Barcode"
 msgstr "Kod paskowy"
 
-#: ../src/ui.c:300
-msgid "Create barcode object"
-msgstr "Tworzy kod paskowy"
-
-#: ../src/ui.c:305
-#, fuzzy
-msgid "Bring to front"
-msgstr "Przesun na wierzch"
-
-#: ../src/ui.c:307
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr ""
 
-#: ../src/ui.c:312
-#, fuzzy
-msgid "Send to back"
-msgstr "PrzesuÃ± w dÃ³Â³"
-
-#: ../src/ui.c:314
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr ""
 
-#: ../src/ui.c:319
-#, fuzzy
-msgid "Rotate left"
-msgstr "ObrÃ³Ã¦"
-
-#: ../src/ui.c:321
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr ""
 
-#: ../src/ui.c:326
-#, fuzzy
-msgid "Rotate right"
-msgstr "ObrÃ³Ã¦"
-
-#: ../src/ui.c:328
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr ""
 
-#: ../src/ui.c:333
-msgid "Flip horizontally"
-msgstr ""
-
-#: ../src/ui.c:335
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr ""
 
-#: ../src/ui.c:340
-msgid "Flip vertically"
-msgstr ""
-
-#: ../src/ui.c:342
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr ""
 
-#: ../src/ui.c:347
-#, fuzzy
-msgid "Align left"
-msgstr "WyrÃ³wnanie:"
-
-#: ../src/ui.c:349
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr ""
 
-#: ../src/ui.c:354
-msgid "Align right"
-msgstr ""
-
-#: ../src/ui.c:356
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr ""
 
-#: ../src/ui.c:361
-msgid "Align horizontal center"
-msgstr ""
-
-#: ../src/ui.c:363
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr ""
 
-#: ../src/ui.c:368
-#, fuzzy
-msgid "Align tops"
-msgstr "WyrÃ³wnanie:"
-
-#: ../src/ui.c:370
+#: ../src/ui.c:389
 #, fuzzy
 msgid "Align objects to top edges"
 msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci skrzynki"
 
-#: ../src/ui.c:375
-msgid "Align bottoms"
-msgstr ""
-
-#: ../src/ui.c:377
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr ""
 
-#: ../src/ui.c:382
-msgid "Align vertical center"
-msgstr ""
-
-#: ../src/ui.c:384
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr ""
 
-#: ../src/ui.c:389
-msgid "Center horizontally"
-msgstr ""
-
-#: ../src/ui.c:391
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: ../src/ui.c:396
-#, fuzzy
-msgid "Center vertically"
-msgstr "OgÃ³lne"
-
-#: ../src/ui.c:398
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: ../src/ui.c:403
-#, fuzzy
-msgid "Merge properties"
-msgstr "WÂ³aÂ¶ciwoÂ¶ci zÂ³Â±czania"
-
-#: ../src/ui.c:405
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr "Modyfikuje wÂ³aÂ¶ciwoÂ¶ci zÂ³Â±czania"
 
-#: ../src/ui.c:412
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr ""
 
-#: ../src/ui.c:414
+#: ../src/ui.c:433
 #, fuzzy
 msgid "Open glabels manual"
 msgstr "OtwÃ³rz etykietÃª"
 
-#: ../src/ui.c:419
+#: ../src/ui.c:438
 msgid "About..."
 msgstr ""
 
-#: ../src/ui.c:421
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr ""
 
-#: ../src/ui.c:431
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr ""
 
-#: ../src/ui.c:433
+#: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr ""
 
-#: ../src/ui.c:439
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr ""
 
-#: ../src/ui.c:441
+#: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
 msgstr ""
 
-#: ../src/ui.c:447
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr ""
 
-#: ../src/ui.c:449
+#: ../src/ui.c:468
 msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: ../src/ui.c:460
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr ""
 
-#: ../src/ui.c:462
+#: ../src/ui.c:481
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: ../src/ui.c:468
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr ""
 
-#: ../src/ui.c:470
+#: ../src/ui.c:489
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: ../src/ui-commands.c:1100
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr ""
 
-#: ../src/ui-commands.c:1106
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 
-#: ../src/ui-commands.c:1107
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+msgid "or visit http://glabels.org/";
 msgstr ""
 
-#: ../src/ui-commands.c:1119
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr ""
 
-#: ../src/ui-commands.c:1123
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/ui-commands.c:1126
+#: ../src/ui-commands.c:1161
 #, fuzzy
 msgid ""
 "gLabels is free software: you can redistribute it and/or modify\n"
@@ -1416,220 +1835,199 @@ msgstr ""
 "GWARANCJI; nawet wynikajÂ±cej z RÃ?KOJMI lub UÂ¯YWANIA W OKREÅ LONYM CELU. "
 "Zajrzyj do Licencji Publicznej GNU aby uzyskaÃ¦ wiÃªcej szczegÃ³Â³Ã³w.\n"
 
-#: ../src/ui-commands.c:1153
+#: ../src/ui-commands.c:1190
 #, fuzzy
 msgid "glabels"
 msgstr "Etykiety"
 
-#: ../src/ui-sidebar.c:154
-#, fuzzy
-msgid "Object properties"
-msgstr "WÂ³aÂ¶ciwoÂ¶ci tekstu"
-
-#. Build editor.
-#: ../src/view-barcode.c:176
-#, fuzzy
-msgid "Barcode object properties"
-msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci kodu paskowego"
-
-#. Build editor.
-#: ../src/view-box.c:176
-#, fuzzy
-msgid "Box object properties"
-msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci skrzynki"
-
-#. Build editor.
-#: ../src/view-ellipse.c:178
-#, fuzzy
-msgid "Ellipse object properties"
-msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci elipsy"
-
-#. Build editor.
-#: ../src/view-image.c:176
-#, fuzzy
-msgid "Image object properties"
-msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci obrazu"
-
-#. Build editor.
-#: ../src/view-line.c:176
-#, fuzzy
-msgid "Line object properties"
-msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci skrzynki"
-
-#. Build editor.
-#: ../src/view-text.c:180
-#, fuzzy
-msgid "Text object properties"
-msgstr "Modyfikacja wÂ³aÂ¶ciwoÂ¶ci skrzynki"
-
 #: ../src/warning-handler.c:69
 #, fuzzy
 msgid "gLabels Error!"
 msgstr "Glabels: Preferencje"
 
-#: ../src/wdgt-media-select.c:290 ../src/wdgt-media-select.c:294
-#: ../src/wdgt-media-select.c:299 ../src/wdgt-media-select.c:308
-#: ../src/wdgt-media-select.c:311 ../src/wdgt-media-select.c:405
-#: ../src/wdgt-media-select.c:618 ../src/wdgt-media-select.c:627
-msgid "Any"
-msgstr ""
-
-#: ../src/wdgt-media-select.c:653
-#, fuzzy, c-format
-msgid "%d per sheet"
-msgstr "%d x %d (%d na arkusz)"
-
-#: ../src/wdgt-media-select.c:684
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-#: ../src/wdgt-media-select.c:689
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-#: ../src/wdgt-media-select.c:700 ../src/wdgt-media-select.c:714
-#, c-format
-msgid "%s %s diameter"
-msgstr ""
-
-#: ../src/wdgt-media-select.c:704 ../src/wdgt-media-select.c:718
-#, c-format
-msgid "%.5g %s diameter"
-msgstr ""
-
-#: ../src/wdgt-media-select.c:793
-#, fuzzy
-msgid "No recent templates found."
-msgstr "Nie znaleziono pliku szablonu!"
-
-#: ../src/wdgt-media-select.c:794
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr ""
-
-#: ../src/wdgt-media-select.c:874
-msgid "No match."
-msgstr ""
-
-#: ../src/wdgt-media-select.c:875
-msgid "Try selecting a different brand, page size or category."
-msgstr ""
-
-#: ../src/window.c:256
+#: ../src/window.c:284
 msgid "(none) - gLabels"
 msgstr ""
 
-#: ../src/window.c:435
+#: ../src/window.c:485
 msgid "(modified)"
 msgstr ""
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:320
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Niepoprawny wÃªzeÂ³ gÂ³Ã³wny = \"%s\""
 
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:403
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "niepoprawny wÃªzeÂ³ = \"%s\""
 
-#: ../src/xml-label.c:187 ../src/xml-label.c:225
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "bÂ³Â±d przetwarzania pliku xml"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Brak gÂ³Ã³wnego dokumentu"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:301
 #, fuzzy, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr ""
 "dokument jest niepoprawnego typu, nie odnaleziono przestrzeni nazw glabels"
 
-#: ../src/xml-label.c:357
+#: ../src/xml-label.c:370
 #, fuzzy, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Niepoprawny wÃªzeÂ³ gÂ³Ã³wny = \"%s\""
 
-#: ../src/xml-label.c:850
+#: ../src/xml-label.c:868
 #, fuzzy, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "niepoprawny wÃªzeÂ³ = \"%s\""
 
-#: ../src/xml-label.c:1092 ../libglabels/xml-template.c:664
+#: ../src/xml-label.c:944
+#, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr ""
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr ""
 
-#: ../src/xml-label.c:1099
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "Problem podczas zapisu pliku xml."
 
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:109
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr ""
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:122
+#: ../libglabels/db.c:279
 #, fuzzy
 msgid "User defined"
 msgstr "Wstaw pole zÂ³Â±czenia"
 
-#: ../libglabels/db.c:473
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:866
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1450
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1527
+#: ../libglabels/db.c:2164
+#, c-format
+msgid "%s full page label"
+msgstr ""
+
+#: ../libglabels/template.c:156
 #, c-format
-msgid "Generic %s full page template"
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d (%d na arkusz)"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
+msgstr "%d x %d (%d na arkusz)"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "Milimetry"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "punkty(-Ã³w)"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "cali"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
 msgstr ""
 
-#: ../libglabels/xml-template.c:221
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr ""
 
 #. This should always be an id, but just in case a name
 #. slips by!
-#: ../libglabels/xml-template.c:238
+#: ../libglabels/xml-template.c:244
 #, c-format
 msgid "Unknown page size id \"%s\", trying as name"
 msgstr ""
 
-#: ../libglabels/xml-template.c:250
+#: ../libglabels/xml-template.c:256
 #, c-format
 msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
-#: ../libglabels/xml-template.c:609
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
+
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 
-#: ../libglabels/xml-template.c:619
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr ""
 
@@ -1641,365 +2039,393 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr ""
-
-#: ../data/builder/merge-properties-dialog.builder.h:2
-#, fuzzy
-msgid "<b>Source</b>"
-msgstr "Â¬rÃ³dÂ³o"
-
-#: ../data/builder/merge-properties-dialog.builder.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "PoÂ³oÂ¿enie:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Record selection/preview"
+msgstr ""
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 #, fuzzy
 msgid "Select all"
 msgstr "O_dznacz wszystko"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "Â¬rÃ³dÂ³o"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 #, fuzzy
 msgid "Unselect all"
 msgstr "O_dznacz wszystko"
 
-#: ../data/builder/object-editor.builder.h:2
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "WÂ³asny klucz pola"
 
-#: ../data/builder/object-editor.builder.h:3
-msgid "00000000000 00000"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "Rozmiar strony:"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "O_dznacz wszystko"
+
+#: ../data/ui/new-label-dialog.ui.h:1
+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:27
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Rozmiar etykiety:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "WyglÂ±d:"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "Format:"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "ObrÃ³Ã¦"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:5
-#: ../data/builder/prefs-dialog.builder.h:7
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "WyrÃ³wnanie:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "KÂ±t"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Kolor:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:10
 #, fuzzy
 msgid "Family:"
 msgstr "WypeÂ³nienie"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:11
 #, fuzzy
 msgid "File:"
 msgstr "WypeÂ³nienie"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "WypeÂ³nienie"
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "WysokoÂ¶Ã¦:"
 
-#: ../data/builder/object-editor.builder.h:17
-msgid "Insert merge field"
-msgstr "Wstaw pole zÂ³Â±czenia"
-
-#: ../data/builder/object-editor.builder.h:18
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "Klucz:"
 
-#: ../data/builder/object-editor.builder.h:19
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "DÂ³ugoÂ¶Ã¦:"
 
-#: ../data/builder/object-editor.builder.h:21
-#: ../data/builder/prefs-dialog.builder.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "LiteraÂ³:"
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Pozycja"
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Wyzeruj rozmiar obrazu"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:25
 #, fuzzy
 msgid "Size:"
 msgstr "Rozmiar"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:26
 #, fuzzy
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/builder/object-editor.builder.h:30
+#: ../data/ui/object-editor.ui.h:27
 #, fuzzy
 msgid "Style:"
 msgstr "Styl"
 
-#: ../data/builder/object-editor.builder.h:32
-#: ../data/builder/prefs-dialog.builder.h:20
-#: ../data/builder/template-designer.builder.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "SzerokoÂ¶Ã¦:"
 
-#: ../data/builder/object-editor.builder.h:33
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "stopni(e)"
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:40
+#: ../data/ui/object-editor.ui.h:37
 #, fuzzy
 msgid "format:"
 msgstr "Format:"
 
-#: ../data/builder/prefs-dialog.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr ""
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "Default page size"
+msgstr "DomyÂ¶lny rozmiar strony"
 
-#: ../data/builder/prefs-dialog.builder.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "Czcionka:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Cale"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 #, fuzzy
 msgid "Locale"
 msgstr "Skala"
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "Milimetry"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Punkty"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr ""
 
-#. Most popular (at top of list)
-#: ../data/builder/prefs-dialog.builder.h:19 ../templates/paper-sizes.xml.h:29
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:19
+msgid "Units"
+msgstr ""
+
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:2
+#: ../data/ui/property-bar.ui.h:2
 #, fuzzy
 msgid "Center align"
 msgstr "OgÃ³lne"
 
-#: ../data/builder/property-bar.builder.h:4
-#, fuzzy
-msgid "Font size"
-msgstr "Nie zapisuj"
-
-#: ../data/builder/property-bar.builder.h:5
-msgid "Italic"
-msgstr ""
-
-#: ../data/builder/property-bar.builder.h:6
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:8
-msgid "Line width"
-msgstr ""
-
-#: ../data/builder/property-bar.builder.h:9
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:10
-msgid "Text color"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:6
+#: ../data/ui/template-designer.ui.h:6
 #, fuzzy
 msgid "1. Width:"
 msgstr "SzerokoÂ¶Ã¦:"
 
-#: ../data/builder/template-designer.builder.h:7
+#: ../data/ui/template-designer.ui.h:7
 #, fuzzy
 msgid "2. Height:"
 msgstr "WysokoÂ¶Ã¦:"
 
-#: ../data/builder/template-designer.builder.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -2010,23 +2436,19 @@ msgid ""
 "or \"Back\" to continue editing this design."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:27
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../data/builder/template-designer.builder.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -2035,293 +2457,268 @@ msgid ""
 "The second example illustrates when two layouts are needed."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:37
+#: ../data/ui/template-designer.ui.h:37
 #, fuzzy
 msgid "Layout #1"
 msgstr "WyglÂ±d:"
 
-#: ../data/builder/template-designer.builder.h:38
+#: ../data/ui/template-designer.ui.h:38
 #, fuzzy
 msgid "Layout #2"
 msgstr "WyglÂ±d:"
 
-#: ../data/builder/template-designer.builder.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:42
-msgid "Page size:"
-msgstr "Rozmiar strony:"
-
-#: ../data/builder/template-designer.builder.h:43
-msgid "Part #:"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:46
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:50
+#: ../data/ui/template-designer.ui.h:50
 #, fuzzy
 msgid "Print test sheet"
 msgstr "na pierwszym arkuszu"
 
-#: ../data/builder/template-designer.builder.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
 "This dialog will assist you in the creation of a custom gLabels template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:62
-msgid "cd_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:63
-msgid "finish_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:65
-msgid "layout_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:66
-msgid "name_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:67
-msgid "nlayouts_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:68
-msgid "pg_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:69
-msgid "rect_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:70
-msgid "round_size_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "UkÂ³adanie"
 
-#: ../data/builder/template-designer.builder.h:71
-msgid "shape_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "Copies"
+msgstr "Kopie:"
 
-#: ../data/builder/template-designer.builder.h:72
-msgid "start_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "Kopie:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
 #, fuzzy
-msgid "<b>Copies</b>"
-msgstr "Kopie"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
-msgid "<b>Merge Control</b>"
-msgstr ""
+msgid "Merge Control"
+msgstr "Kontrola zÂ³Â±czania dokumentÃ³w"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
 #, fuzzy
-msgid "<b>Options</b>"
+msgid "Options"
 msgstr "Opcje"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
-msgid "Collate"
-msgstr "UkÂ³adanie"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
-msgid "Copies:"
-msgstr "Kopie:"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:7
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
 msgstr "Arkusze:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:8
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
 msgid "Start on label"
 msgstr "Rozpocznij od etykiety"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:9
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
 msgid "from:"
 msgstr "od:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:10
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
 msgid "on 1st sheet"
 msgstr "na pierwszym arkuszu"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:14
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
 msgid "to:"
 msgstr "do:"
 
-#: ../data/desktop/glabels.desktop.in.h:1
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
 msgid "Create labels, business cards and media covers"
 msgstr ""
 
-#: ../data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+msgid "gLabels Label Designer 3"
 msgstr ""
 
-#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1
+#: ../data/mime/glabels-3.0.xml.in.h:1
 #, fuzzy
 msgid "gLabels Project File"
 msgstr "WÂ³aÂ¶ciwoÂ¶ci tekstu"
 
-#. Other ISO A series sizes
+#. Envelopes
 #: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
+
+#. Other ISO A series sizes
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr ""
 
 #. ISO B series sizes
-#: ../templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr ""
 
-#: ../templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr ""
 
 #. Other US paper sizes
-#: ../templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr ""
 
@@ -2334,7 +2731,8 @@ msgstr ""
 msgid "Any label"
 msgstr "OtwÃ³rz etykietÃª"
 
-#: ../templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr ""
 
@@ -2351,7 +2749,8 @@ msgstr ""
 msgid "Rectangular labels"
 msgstr "Etykiety"
 
-#: ../templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 #, fuzzy
 msgid "Round labels"
 msgstr "Rozpocznij od etykiety"
@@ -2362,10 +2761,15 @@ msgid "Square labels"
 msgstr "Etykiety"
 
 #. ===================================================================
+#. ********************************************************************
+#. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
 #: ../templates/avery-iso-templates.xml.h:2
 #: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
 #: ../templates/misc-iso-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 ""
@@ -2390,6 +2794,8 @@ msgstr ""
 #: ../templates/avery-iso-templates.xml.h:14
 #: ../templates/misc-us-templates.xml.h:8
 #: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
 #: ../templates/zweckform-iso-templates.xml.h:8
 #, fuzzy
 msgid "CD/DVD Labels"
@@ -2409,6 +2815,7 @@ msgstr "Etykiety"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:12
 #: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr ""
 
@@ -2420,84 +2827,103 @@ msgstr "Etykiety"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
 #, fuzzy
-msgid "Filing Labels"
+msgid "File Folder Labels"
 msgstr "Etykiety"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
+#, fuzzy
+msgid "Filing Labels"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 #, fuzzy
 msgid "ID Labels"
 msgstr "Etykiety"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 msgid "Index Cards"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 #, fuzzy
 msgid "Large Round Labels"
 msgstr "Rozpocznij od etykiety"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:26
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:30
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
 #: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:32
-#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
 #, fuzzy
 msgid "Round Labels"
 msgstr "Rozpocznij od etykiety"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:34
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/avery-us-templates.xml.h:38
 #, fuzzy
 msgid "Small Round Labels"
 msgstr "Rozpocznij od etykiety"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:38
+#: ../templates/avery-us-templates.xml.h:40
 #, fuzzy
 msgid "Square Labels"
 msgstr "Etykiety"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:42
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr ""
 
@@ -2530,7 +2956,7 @@ msgstr ""
 #. ===============================================================
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:20
-#: ../templates/misc-us-templates.xml.h:18
+#: ../templates/misc-us-templates.xml.h:20
 #: ../templates/misc-iso-templates.xml.h:36
 #: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
@@ -2559,12 +2985,6 @@ msgstr "Etykiety"
 msgid "Shipping labels"
 msgstr "OtwÃ³rz etykietÃª"
 
-#. ===================================================================
-#: ../templates/avery-other-templates.xml.h:2
-#, fuzzy
-msgid "File Folder Labels"
-msgstr "Etykiety"
-
 #: ../templates/brother-other-templates.xml.h:1
 msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr ""
@@ -2656,35 +3076,40 @@ msgid "DLT Labels"
 msgstr "Etykiety"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:20
-msgid "Microtube labels"
+#: ../templates/misc-us-templates.xml.h:18
+msgid "Jewel Case Booklet"
 msgstr ""
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:22
+msgid "Microtube labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:24
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:26
+#: ../templates/misc-us-templates.xml.h:28
 #: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:31
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr ""
 
@@ -2769,6 +3194,12 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr ""
 
@@ -2779,6 +3210,135 @@ msgid "Multi-Purpose Labels"
 msgstr "Etykiety"
 
 #. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Rozpocznij od etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+msgid "Business cards high glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+msgid "Business cards punched"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+msgid "Business cards punched dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+msgid "Business cards punched glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Rozpocznij od etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+msgid "Foldable business cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Rozpocznij od etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "Etykiety"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr ""
@@ -2814,6 +3374,36 @@ msgstr ""
 msgid "Video Labels (back)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "Tekst oddzielony przecinkami (CSV)"
+
+#, fuzzy
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "Tekst oddzielany dwukropkami"
+
+#, fuzzy
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "Tekst oddzielony tabulacjami"
+
+#, fuzzy
+#~ msgid "<b>Media type</b>"
+#~ msgstr "Typ noÂ¶nika"
+
+#, fuzzy
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "UÂ³oÂ¿enie etykiety"
+
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#, fuzzy
+#~ msgid "<b>Copies</b>"
+#~ msgstr "Kopie"
+
 #~ msgid "print this message"
 #~ msgstr "wyÂ¶wietla ten komunikat"
 
@@ -2837,25 +3427,9 @@ msgstr ""
 #~ msgid "P_rinter"
 #~ msgstr "Wydrukuj"
 
-#~ msgid "Document merge control"
-#~ msgstr "Kontrola zÂ³Â±czania dokumentÃ³w"
-
 #~ msgid "Print preview"
 #~ msgstr "PodglÂ±d wydruku"
 
-#~ msgid "Label size:"
-#~ msgstr "Rozmiar etykiety:"
-
-#~ msgid "Layout:"
-#~ msgstr "WyglÂ±d:"
-
-#~ msgid "%d x %d  (%d per sheet)"
-#~ msgstr "%d x %d (%d na arkusz)"
-
-#, fuzzy
-#~ msgid "custom"
-#~ msgstr "WÂ³asny klucz pola"
-
 #, fuzzy
 #~ msgid "magenta"
 #~ msgstr "Obraz"
@@ -2869,10 +3443,6 @@ msgstr ""
 #~ msgstr "WÂ³asny klucz pola"
 
 #, fuzzy
-#~ msgid "Font name"
-#~ msgstr "Nie zapisuj"
-
-#, fuzzy
 #~ msgid "Font selector"
 #~ msgstr "Usuwa wszelkie zaznaczenia"
 
@@ -2918,9 +3488,6 @@ msgstr ""
 #~ msgid "Display units"
 #~ msgstr "Jednostki wyÂ¶wietlania"
 
-#~ msgid "Default page size"
-#~ msgstr "DomyÂ¶lny rozmiar strony"
-
 #~ msgid "Outline"
 #~ msgstr "Ramka"
 
@@ -2979,9 +3546,6 @@ msgstr ""
 #~ msgid "Column"
 #~ msgstr "Kolumna"
 
-#~ msgid "Sample data"
-#~ msgstr "PrÃ³bne dane"
-
 #~ msgid "Make a new, empty label"
 #~ msgstr "Tworzy nowÂ±, pustÂ± etykietÃª"
 
diff --git a/po/pt.po b/po/pt.po
index 9ed6243..84f2dc4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,140 +6,380 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels 1.91.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-04 12:48+0100\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-03-19 02:02+0000\n"
 "Last-Translator: Filipe Roque <fliproque gmail com>\n"
 "Language-Team: Portuguese <>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/bc.c:65
+#: ../src/bc.c:66
 msgid "POSTNET (any)"
 msgstr "POSTNET (qualquer)"
 
-#: ../src/bc.c:68
+#: ../src/bc.c:69
 msgid "POSTNET-5 (ZIP only)"
 msgstr "POSTNET-5 (ZIP apenas)"
 
-#: ../src/bc.c:71
+#: ../src/bc.c:72
 msgid "POSTNET-9 (ZIP+4)"
 msgstr "POSTNET-9 (ZIP+4)"
 
-#: ../src/bc.c:74
+#: ../src/bc.c:75
 msgid "POSTNET-11 (DPBC)"
 msgstr "POSTNET-11 (DPBC)"
 
-#: ../src/bc.c:79
+#: ../src/bc.c:80
 msgid "CEPNET"
 msgstr "CEPNET"
 
-#: ../src/bc.c:82
+#: ../src/bc.c:83
 msgid "EAN (any)"
 msgstr "EAN (qualquer)"
 
-#: ../src/bc.c:85
+#: ../src/bc.c:86
 msgid "EAN-8"
 msgstr "EAN-8"
 
-#: ../src/bc.c:88
+#: ../src/bc.c:89
 msgid "EAN-8 +2"
 msgstr "EAN-8 +2"
 
-#: ../src/bc.c:91
+#: ../src/bc.c:92
 msgid "EAN-8 +5"
 msgstr "EAN-8 +5"
 
-#: ../src/bc.c:94
+#: ../src/bc.c:95
 msgid "EAN-13"
 msgstr "EAN-13"
 
-#: ../src/bc.c:97
+#: ../src/bc.c:98
 msgid "EAN-13 +2"
 msgstr "EAN-13 +2"
 
-#: ../src/bc.c:100
+#: ../src/bc.c:101
 msgid "EAN-13 +5"
 msgstr "EAN-13 +5"
 
-#: ../src/bc.c:103
+#: ../src/bc.c:104
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A ou UPC-E)"
 
-#: ../src/bc.c:106
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr "UPC-A"
 
-#: ../src/bc.c:109
+#: ../src/bc.c:110
 msgid "UPC-A +2"
 msgstr "UPC-A +2"
 
-#: ../src/bc.c:112
+#: ../src/bc.c:113
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:115
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr "UPC-E"
 
-#: ../src/bc.c:118
+#: ../src/bc.c:119
 msgid "UPC-E +2"
 msgstr "UPC-E +2"
 
-#: ../src/bc.c:121
+#: ../src/bc.c:122
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:124
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr "ISBN"
 
-#: ../src/bc.c:127
+#: ../src/bc.c:128
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:130
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr "CÃ³digo 39"
 
-#: ../src/bc.c:133
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr "CÃ³digo 128"
 
-#: ../src/bc.c:136
+#: ../src/bc.c:137
 msgid "Code 128C"
 msgstr "CÃ³digo 128C"
 
-#: ../src/bc.c:139
+#: ../src/bc.c:140
 msgid "Code 128B"
 msgstr "CÃ³digo 128B"
 
-#: ../src/bc.c:142
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr "Interleaved 2 of 5"
 
-#: ../src/bc.c:145
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr "Codabar"
 
-#: ../src/bc.c:148
+#: ../src/bc.c:149
 msgid "MSI"
 msgstr "MSI"
 
-#: ../src/bc.c:151
+#: ../src/bc.c:152
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:154
+#: ../src/bc.c:155 ../src/bc.c:213
 #, fuzzy
 msgid "Code 93"
 msgstr "CÃ³digo 39"
 
-#: ../src/bc.c:161
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "CÃ³digo 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "CÃ³digo 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "CÃ³digo 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "CÃ³digo 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "CÃ³digo 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "CÃ³digo 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "CÃ³digo 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Colar"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "CÃ³digo de barras"
+
+#: ../src/bc.c:330
+#, fuzzy
+msgid "Pharmacode 2-track"
+msgstr "Dados do CÃ³digo de Barras vazio"
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Apagar"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:168
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -283,42 +523,42 @@ msgstr "branco"
 msgid "White"
 msgstr "branco"
 
-#: ../src/color-combo-menu.c:116
-#, c-format
-msgid "10\\% Gray"
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:117
-#, c-format
-msgid "25\\% Gray"
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:118
-#, c-format
-msgid "40\\% Gray"
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:119
-#, c-format
-msgid "50\\% Gray"
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:120
-#, c-format
-msgid "60\\% Gray"
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
 msgstr ""
 
-#: ../src/color-combo-menu.c:121
+#: ../src/color-combo-menu.c:126
 #, fuzzy
 msgid "Black"
 msgstr "preto"
 
-#: ../src/color-combo-menu.c:249 ../src/color-combo-menu.c:368
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 #, fuzzy
 msgid "Custom Color"
 msgstr "Personalizar cor"
 
-#: ../src/color-combo-menu.c:314
+#: ../src/color-combo-menu.c:319
 #, fuzzy, c-format
 msgid "Custom Color #%u"
 msgstr "Personalizar cor"
@@ -331,77 +571,77 @@ msgstr "Erro fatal do gLabels"
 msgid "New Label or Card"
 msgstr "Nova Etiqueta ou CartÃ£o"
 
-#: ../src/file.c:176 ../src/label.c:584 ../src/label.c:628
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "Propriedades de etiqueta"
 
-#: ../src/file.c:269 ../src/file.c:559
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/file.c:274 ../src/file.c:564
+#: ../src/file.c:272 ../src/file.c:562
 msgid "gLabels documents"
 msgstr "Documentos do gLabels"
 
-#: ../src/file.c:321 ../src/file.c:622
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
 msgstr "SelecÃ§Ã£o de nome do ficheiro vazia"
 
-#: ../src/file.c:324 ../src/file.c:340
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 "Por favor, seleccione um ficheiro ou forneÃ§a um nome de ficheiro vÃ¡lido"
 
-#: ../src/file.c:337
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "ficheiro inexistente"
 
-#: ../src/file.c:412
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "ImpossÃvel abrir o ficheiro \"%s\""
 
-#: ../src/file.c:415
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr "Formato de ficheiro nÃ£o suportado"
 
-#: ../src/file.c:493 ../src/file.c:672
+#: ../src/file.c:491 ../src/file.c:670
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "ImpossÃvel guardar o ficheiro \"%s\""
 
-#: ../src/file.c:497 ../src/file.c:676
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr "Erro encontrado ao guardar. O ficheiro ainda nÃ£o foi guardado."
 
-#: ../src/file.c:537
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Guardar \"%s\" como"
 
-#: ../src/file.c:625
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr "Por favor, forneÃ§a um nome de ficheiro vÃ¡lido"
 
-#: ../src/file.c:646
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Sobrescrever o ficheiro \"%s\"?"
 
-#: ../src/file.c:650
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr "O ficheiro jÃ¡ existe."
 
-#: ../src/file.c:746
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Guardar modificaÃ§Ãµes no documento \"%s\" antes de fechar?"
 
-#: ../src/file.c:750
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr "As suas modificaÃ§Ãµes serÃ£o perdidas se vocÃª nÃ£o as guardar."
 
-#: ../src/file.c:753
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "Fechar sem guardar"
 
@@ -455,78 +695,75 @@ msgstr ""
 msgid "Sample text"
 msgstr "Dado de amostra"
 
-#: ../src/glabels-batch.c:52
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "define o nome do ficheiro de saÃda (padrÃ£o=\"output.ps\")"
 
-#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "nome do ficheiro"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "nÃºmero de pÃ¡ginas (padrÃ£o=1)"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "pÃ¡ginas"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "nÃºmero de cÃ³pias (padrÃ£o=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "cÃ³pias"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "primeira etiqueta na primeira pÃ¡gina (padrÃ£o=1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "primeiro"
 
-#: ../src/glabels-batch.c:60
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "imprimir contornos (para testar alinhamento da impressora)"
 
-#: ../src/glabels-batch.c:62
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "imprimir ao contrÃ¡rio (como uma imagem de espelho)"
 
-#: ../src/glabels-batch.c:64
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "imprimir marcas de cortes"
 
-#: ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "introduza ficheiro para fusÃ£o"
 
-#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[FILE...]"
 
-#: ../src/glabels-batch.c:98
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr ""
 
-#: ../src/glabels-batch.c:106 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/glabels-batch.c:149
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "nÃ£o foi possÃvel fundir com o ficheiro gLabels %s\n"
 
-#: ../src/glabels-batch.c:184
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "impossÃvel abrir o ficheiro gLabels %s\n"
@@ -550,11 +787,11 @@ msgstr "Dados do CÃ³digo de Barras vazio"
 msgid "Barcode property"
 msgstr "Propriedades do objecto cÃ³digo de barras"
 
-#: ../src/label-barcode.c:482
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr "Dados do CÃ³digo de Barras vazio"
 
-#: ../src/label-barcode.c:486
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr "CÃ³digo de barras invÃ¡lido"
 
@@ -564,93 +801,93 @@ msgid "Create box object"
 msgstr "Criar objecto de texto"
 
 #: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
-#: ../data/builder/property-bar.builder.h:3
+#: ../data/ui/property-bar.ui.h:3
 msgid "Fill color"
 msgstr "Encher cor"
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../src/stock.c:94 ../data/builder/property-bar.builder.h:8
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
 msgid "Line color"
 msgstr "Cor da linha"
 
 #: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
-#: ../data/builder/property-bar.builder.h:9
+#: ../data/ui/property-bar.ui.h:9
 msgid "Line width"
 msgstr "Espessura da linha"
 
-#: ../src/label.c:399
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr "Sem tÃtulo"
 
-#: ../src/label.c:702 ../src/ui.c:422
+#: ../src/label.c:705 ../src/ui.c:422
 msgid "Merge properties"
 msgstr "Propriedades de FusÃ£o"
 
-#: ../src/label.c:1184 ../src/ui.c:215
+#: ../src/label.c:1197 ../src/ui.c:215
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../src/label.c:1217 ../src/ui.c:324
+#: ../src/label.c:1230 ../src/ui.c:324
 msgid "Bring to front"
 msgstr "Trazer para a frente"
 
-#: ../src/label.c:1253 ../src/ui.c:331
+#: ../src/label.c:1266 ../src/ui.c:331
 msgid "Send to back"
 msgstr "Enviar para trÃ¡s"
 
-#: ../src/label.c:1294
+#: ../src/label.c:1307
 msgid "Rotate"
 msgstr "Girar"
 
-#: ../src/label.c:1329 ../src/ui.c:338
+#: ../src/label.c:1342 ../src/ui.c:338
 msgid "Rotate left"
 msgstr "Girar para a esquerda"
 
-#: ../src/label.c:1362 ../src/ui.c:345
+#: ../src/label.c:1375 ../src/ui.c:345
 msgid "Rotate right"
 msgstr "Girar para a direita"
 
-#: ../src/label.c:1397 ../src/ui.c:352
+#: ../src/label.c:1410 ../src/ui.c:352
 msgid "Flip horizontally"
 msgstr "Inverter horizontalmente"
 
-#: ../src/label.c:1432 ../src/ui.c:359
+#: ../src/label.c:1445 ../src/ui.c:359
 msgid "Flip vertically"
 msgstr "Inverter verticalmente"
 
-#: ../src/label.c:1472 ../src/ui.c:366
+#: ../src/label.c:1485 ../src/ui.c:366
 msgid "Align left"
 msgstr "Alinhar Ã  esquerda"
 
-#: ../src/label.c:1529 ../src/ui.c:373
+#: ../src/label.c:1542 ../src/ui.c:373
 msgid "Align right"
 msgstr "Alinhar Ã  direita"
 
-#: ../src/label.c:1590 ../src/ui.c:380
+#: ../src/label.c:1603 ../src/ui.c:380
 msgid "Align horizontal center"
 msgstr "Alinhar centros horizontais"
 
-#: ../src/label.c:1666 ../src/ui.c:387
+#: ../src/label.c:1679 ../src/ui.c:387
 msgid "Align tops"
 msgstr "Alinhar pelos topos"
 
-#: ../src/label.c:1723 ../src/ui.c:394
+#: ../src/label.c:1736 ../src/ui.c:394
 msgid "Align bottoms"
 msgstr "Alinhar pelas bases"
 
-#: ../src/label.c:1784 ../src/ui.c:401
+#: ../src/label.c:1797 ../src/ui.c:401
 msgid "Align vertical center"
 msgstr "Alinhar centros verticais"
 
-#: ../src/label.c:1862 ../src/ui.c:408
+#: ../src/label.c:1875 ../src/ui.c:408
 msgid "Center horizontally"
 msgstr "Centra horizontalmente"
 
-#: ../src/label.c:1909 ../src/ui.c:415
+#: ../src/label.c:1922 ../src/ui.c:415
 msgid "Center vertically"
 msgstr "Centra verticalmente"
 
-#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
 msgid "Paste"
 msgstr "Colar"
 
@@ -659,11 +896,11 @@ msgstr "Colar"
 msgid "Create ellipse object"
 msgstr "Criar linha"
 
-#: ../src/label-image.c:161 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:312
 msgid "Create image object"
 msgstr "Criar objecto de imagem"
 
-#: ../src/label-image.c:265 ../src/label-image.c:336
+#: ../src/label-image.c:333 ../src/label-image.c:474
 #, fuzzy
 msgid "Set image"
 msgstr "Redefinir tamanho da imagem"
@@ -701,88 +938,104 @@ msgstr "Sombra"
 msgid "Shadow opacity"
 msgstr "Sombra"
 
-#: ../src/label-text.c:266 ../src/ui.c:284
+#: ../src/label-text.c:279 ../src/ui.c:284
 msgid "Create text object"
 msgstr "Criar objecto de texto"
 
-#: ../src/label-text.c:438
+#: ../src/label-text.c:451
 #, fuzzy
 msgid "Typing"
 msgstr "rosa"
 
-#: ../src/label-text.c:571 ../data/builder/property-bar.builder.h:4
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
 msgid "Font family"
 msgstr "FamÃlia de fontes"
 
-#: ../src/label-text.c:609 ../data/builder/property-bar.builder.h:5
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
 msgid "Font size"
 msgstr "Tamanho de fonte"
 
-#: ../src/label-text.c:642
+#: ../src/label-text.c:655
 #, fuzzy
 msgid "Font weight"
 msgstr "Girar para a direita"
 
-#: ../src/label-text.c:675 ../data/builder/property-bar.builder.h:6
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
 msgid "Italic"
 msgstr "ItÃ¡lico"
 
-#: ../src/label-text.c:708
+#: ../src/label-text.c:721
 #, fuzzy
 msgid "Align text"
 msgstr "Alinhar Ã  esquerda"
 
-#: ../src/label-text.c:741
+#: ../src/label-text.c:754
 #, fuzzy
 msgid "Line spacing"
 msgstr "EspaÃ§amento de linhas:"
 
-#: ../src/label-text.c:774 ../data/builder/property-bar.builder.h:11
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Cor do texto"
 
-#: ../src/label-text.c:918
+#: ../src/label-text.c:931
 msgid "Auto shrink"
 msgstr ""
 
 #: ../src/media-select.c:349 ../src/media-select.c:353
-#: ../src/media-select.c:358 ../src/media-select.c:367
-#: ../src/media-select.c:370 ../src/media-select.c:502
-#: ../src/media-select.c:669 ../src/media-select.c:839
-#: ../src/media-select.c:848
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "Qualquer"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "Qualquer"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
 msgid "Any"
 msgstr "Qualquer"
 
-#: ../src/media-select.c:937
+#: ../src/media-select.c:968
 msgid "No recent templates found."
 msgstr "Nenhum modelo recente encontrado."
 
-#: ../src/media-select.c:939
+#: ../src/media-select.c:970
 #, fuzzy
 msgid "Try selecting a template in the \"Search all\" tab."
 msgstr "Tente seleccionar um modelo da pÃ¡gina \"Procure todos os modelos\"."
 
-#: ../src/media-select.c:1030
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
 msgid "No match."
 msgstr "Sem correspondÃªncia."
 
-#: ../src/media-select.c:1032
+#: ../src/media-select.c:1063
 msgid "Try selecting a different brand, page size or category."
 msgstr ""
 "Tente seleccionar uma marca, tamanho de pagina ou categorias diferentes."
 
-#: ../src/media-select.c:1126
+#: ../src/media-select.c:1157
 #, fuzzy
 msgid "No custom templates found."
 msgstr "Nenhum modelo recente encontrado."
 
-#: ../src/media-select.c:1128
+#: ../src/media-select.c:1159
 msgid ""
 "You may create new templates or try searching for pre-defined templates in "
 "the \"Search all\" tab."
 msgstr ""
 
-#: ../src/merge.c:169 ../src/merge.c:210 ../src/merge.c:374 ../src/merge.c:377
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
 msgstr "Nenhum"
 
@@ -826,12 +1079,20 @@ msgstr ""
 msgid "Text: Colon separated values with keys on line 1"
 msgstr ""
 
-#: ../src/merge-init.c:104
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
 #, fuzzy
 msgid "Evolution Addressbook"
 msgstr "Dados do Livro de EndereÃ§os padrÃ£o do Evolution"
 
-#: ../src/merge-init.c:110
+#: ../src/merge-init.c:125
 #, fuzzy
 msgid "VCards"
 msgstr "CartÃµes tenda"
@@ -844,7 +1105,7 @@ msgstr "Propriedades de FusÃ£o"
 msgid "Select merge-database source"
 msgstr "Seleccionar a fonte da base de dados da fusÃ£o"
 
-#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:446
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
 msgid "N/A"
 msgstr "NÃ£o definido"
 
@@ -856,21 +1117,29 @@ msgstr "Seleccionar"
 msgid "Record/Field"
 msgstr "Registro/Campo"
 
-#: ../src/merge-properties-dialog.c:360
-#: ../data/builder/object-editor.builder.h:10
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "Dados"
 
-#: ../src/merge-properties-dialog.c:439
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
 msgid "Fixed"
 msgstr "Fixo"
 
-#: ../src/new-label-dialog.c:211
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
 #, fuzzy
 msgid "Select Product"
 msgstr "_Seleccionar Modo"
 
-#: ../src/new-label-dialog.c:219
+#: ../src/new-label-dialog.c:215
 msgid "Choose Orientation"
 msgstr ""
 
@@ -878,7 +1147,7 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: ../src/object-editor-bc-page.c:92 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
 #: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
 #: ../src/ui-property-bar.c:280
 msgid "Default"
@@ -941,13 +1210,13 @@ msgstr "%s (*.%s)"
 msgid "No Line"
 msgstr "Nenhuma linha"
 
-#: ../src/prefs-dialog.c:172 ../data/builder/prefs-dialog.builder.h:21
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
 msgid "gLabels Preferences"
 msgstr "PreferÃªncias do gLabels"
 
 #. ===================================================================
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:217
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:6
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etiquetas"
@@ -1048,54 +1317,59 @@ msgstr "Ligado"
 msgid "Not Linked"
 msgstr "NÃ£o ligado"
 
-#: ../src/template-designer.c:397
-msgid "gLabels Template Designer"
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
 msgstr "Criador de modelos do gLabels"
 
-#: ../src/template-designer.c:454
+#: ../src/template-designer.c:461
 msgid "Welcome"
 msgstr "Bem-vindo"
 
-#: ../src/template-designer.c:493
+#: ../src/template-designer.c:500
 msgid "Name and Description"
 msgstr "Nome e DescriÃ§Ã£o"
 
-#: ../src/template-designer.c:541
+#: ../src/template-designer.c:548
 msgid "Page Size"
 msgstr "Tamanho da pÃ¡gina"
 
-#: ../src/template-designer.c:607
+#: ../src/template-designer.c:614
 msgid "Label or Card Shape"
 msgstr "Forma da Etiqueta ou CartÃ£o"
 
-#: ../src/template-designer.c:654
+#: ../src/template-designer.c:661
 msgid "Label or Card Size"
 msgstr "Tamanho da Etiqueta ou CartÃ£o"
 
-#: ../src/template-designer.c:753
+#: ../src/template-designer.c:760
 msgid "Label Size (round)"
 msgstr "Tamanho da etiqueta (redonda)"
 
-#: ../src/template-designer.c:834
+#: ../src/template-designer.c:841
 msgid "Label Size (CD/DVD)"
 msgstr "Tamanho da etiqueta (CD/DVD)"
 
-#: ../src/template-designer.c:925
+#: ../src/template-designer.c:932
 msgid "Number of Layouts"
 msgstr "NÃºmero de disposiÃ§Ãµes"
 
-#: ../src/template-designer.c:993
+#: ../src/template-designer.c:1000
 msgid "Layout(s)"
 msgstr "DisposiÃ§Ã£o"
 
-#: ../src/template-designer.c:1098
+#: ../src/template-designer.c:1105
 msgid "Design Completed"
 msgstr "Desenho Completo"
 
-#: ../src/template-designer.c:1275
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Criador de modelos do gLabels"
+
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
 msgstr ""
 "<span foreground='red' weight='bold'>Marca e sÃ©rie # coincidem com um modelo "
 "existente!</span>"
@@ -1330,8 +1604,8 @@ msgstr "_Seleccionar Modo"
 msgid "Select, move and modify objects"
 msgstr "Selecciona, movimenta e modifica objectos"
 
-#: ../src/ui.c:282 ../src/view-text.c:102
-#: ../data/builder/object-editor.builder.h:30
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Texto"
 
@@ -1343,7 +1617,8 @@ msgstr "Caixa"
 msgid "Create box/rectangle object"
 msgstr "Criar caixa/rectÃ¢ngulo"
 
-#: ../src/ui.c:296 ../data/builder/object-editor.builder.h:19
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Linha"
 
@@ -1355,7 +1630,7 @@ msgstr "_Elipse"
 msgid "Create ellipse/circle object"
 msgstr "Criar elipse/cÃrculo"
 
-#: ../src/ui.c:310 ../data/builder/object-editor.builder.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Imagem"
 
@@ -1541,66 +1816,74 @@ msgstr "(nenhum) - gLabels"
 msgid "(modified)"
 msgstr "(modificado)"
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "Mau nÃ³ de raiz  = \"%s\""
 
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "Mau nÃ³ = \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:227
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "erro: xmlParseFile"
 
-#: ../src/xml-label.c:264
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Sem documento raiz"
 
-#: ../src/xml-label.c:272
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Importando do formato do gLabels 0.1"
 
-#: ../src/xml-label.c:281
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Importando do formato do gLabels 0.4"
 
-#: ../src/xml-label.c:291
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "EspaÃ§o de nome gLabels desconhecido -- Usando %s"
 
-#: ../src/xml-label.c:360
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Mau nÃ³ do documento = \"%s\""
 
-#: ../src/xml-label.c:856
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "Mau nÃ³ de dados  = \"%s\""
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:779
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Tamanho de pÃ¡gina identificador ou nome \"%s\" desconhecido"
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Erro de conversÃ£o UTF8"
 
-#: ../src/xml-label.c:1104
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "Problema a gravar um ficheiro xml."
 
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:254
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "Outro"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:263
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "Utilizador definido"
 
-#: ../libglabels/db.c:634
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1608,7 +1891,7 @@ msgstr ""
 "Incapaz de localizar definiÃ§Ãµes de tamanhos de papel. Libglabels pode nÃ£o "
 "estar instalado correctamente!"
 
-#: ../libglabels/db.c:1026
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1616,7 +1899,7 @@ msgstr ""
 "Incapaz de localizar definiÃ§Ãµes de categoria. Libglabels pode nÃ£o estar "
 "instalado correctamente!"
 
-#: ../libglabels/db.c:2021
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1624,28 +1907,34 @@ msgstr ""
 "Incapaz de localizar modelos. Libglabels pode nÃ£o estar instalado "
 "correctamente!"
 
-#: ../libglabels/db.c:2088
+#: ../libglabels/db.c:2164
 #, fuzzy, c-format
 msgid "%s full page label"
 msgstr "Modelo completo %s genÃ©rico"
 
-#: ../libglabels/template.c:148
+#: ../libglabels/template.c:156
 #, c-format
 msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr ""
 
-#: ../libglabels/template.c:714 ../libglabels/template.c:718
-#, fuzzy
-msgid "per sheet"
-msgstr "%d por pÃ¡gina"
-
-#: ../libglabels/template.c:718
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
 #, c-format
-msgid "%d %s"
+msgid "%d Ã? %d (%d per sheet)"
 msgstr ""
 
-#: ../libglabels/template.c:788 ../libglabels/template.c:794
-#: ../libglabels/template.c:804 ../libglabels/template.c:810
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
+msgstr "%d por pÃ¡gina"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
 #, fuzzy
 msgid "diameter"
 msgstr "%s %s diÃ¢metro"
@@ -1654,14 +1943,14 @@ msgstr "%s %s diÃ¢metro"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/builder/object-editor.builder.h:41
-#: ../data/builder/prefs-dialog.builder.h:22
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr "pontos"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/builder/object-editor.builder.h:40
-#: ../data/builder/template-designer.builder.h:64
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr "polegadas"
 
@@ -1680,34 +1969,34 @@ msgstr ""
 msgid "picas"
 msgstr ""
 
-#: ../libglabels/xml-template.c:221
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr "Falta atributos de nome ou marca/sÃ©rie"
 
 #. This should always be an id, but just in case a name
 #. slips by!
-#: ../libglabels/xml-template.c:242
+#: ../libglabels/xml-template.c:244
 #, c-format
 msgid "Unknown page size id \"%s\", trying as name"
 msgstr ""
 "Tamanho de pÃ¡gina identificador \"%s\" desconhecido, tentando como nome"
 
-#: ../libglabels/xml-template.c:254
+#: ../libglabels/xml-template.c:256
 #, c-format
 msgid "Unknown page size id or name \"%s\""
 msgstr "Tamanho de pÃ¡gina identificador ou nome \"%s\" desconhecido"
 
-#: ../libglabels/xml-template.c:273
+#: ../libglabels/xml-template.c:275
 msgid "Forward references not supported."
 msgstr ""
 
-#: ../libglabels/xml-template.c:724
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 "Falta atributo \"marca\" ou \"sÃ©rie\" requerido, tentando nome obsoleto."
 
-#: ../libglabels/xml-template.c:734
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr "Atributo nome tambÃ©m falta."
 
@@ -1719,429 +2008,384 @@ msgstr "Atributo nome tambÃ©m falta."
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>SelecÃ§Ã£o/previsÃ£o de registro</b>"
-
-#: ../data/builder/merge-properties-dialog.builder.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Fonte</b>"
-
-#: ../data/builder/merge-properties-dialog.builder.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "LocalizaÃ§Ã£o:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>SelecÃ§Ã£o/previsÃ£o de registro</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Seleccionar Tudo"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Fonte</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Desmarcar Tudo"
 
-#: ../data/builder/media-select.builder.h:1
+#: ../data/ui/media-select.ui.h:1
 msgid "Brand:"
 msgstr "SÃ©rie:"
 
-#: ../data/builder/media-select.builder.h:2
+#: ../data/ui/media-select.ui.h:2
 msgid "Category:"
 msgstr "Categoria:"
 
-#: ../data/builder/media-select.builder.h:3
+#: ../data/ui/media-select.ui.h:3
 #, fuzzy
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../data/builder/media-select.builder.h:4
-#: ../data/builder/new-label-dialog.builder.h:10
-#: ../data/builder/template-designer.builder.h:42
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
 msgid "Page size:"
 msgstr "Tamanho da pÃ¡gina:"
 
-#: ../data/builder/media-select.builder.h:5
+#: ../data/ui/media-select.ui.h:5
 msgid "Recent"
 msgstr ""
 
-#: ../data/builder/media-select.builder.h:6
+#: ../data/ui/media-select.ui.h:6
 #, fuzzy
 msgid "Search all"
 msgstr "Seleccionar Tudo"
 
-#: ../data/builder/new-label-dialog.builder.h:1
-msgid ""
-"1\n"
-"2\n"
-"3\n"
-"4"
-msgstr ""
-
-#: ../data/builder/new-label-dialog.builder.h:5
+#: ../data/ui/new-label-dialog.ui.h:1
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
 "your own."
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:6
-#: ../data/builder/template-designer.builder.h:27
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
 msgid "Description:"
 msgstr "DescriÃ§Ã£o:"
 
-#: ../data/builder/new-label-dialog.builder.h:7
+#: ../data/ui/new-label-dialog.ui.h:3
 msgid "Label size:"
 msgstr "Tamanho da etiqueta:"
 
-#: ../data/builder/new-label-dialog.builder.h:8
+#: ../data/ui/new-label-dialog.ui.h:4
 msgid "Layout:"
 msgstr "DisposiÃ§Ã£o:"
 
-#: ../data/builder/new-label-dialog.builder.h:9
+#: ../data/ui/new-label-dialog.ui.h:5
 #, fuzzy
 msgid "Normal"
 msgstr "Formato:"
 
-#: ../data/builder/new-label-dialog.builder.h:11
-#: ../data/builder/template-designer.builder.h:43
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
 msgid "Part #:"
 msgstr "SÃ©rie #:"
 
-#: ../data/builder/new-label-dialog.builder.h:12
+#: ../data/ui/new-label-dialog.ui.h:8
 msgid "Please review and confirm your selection."
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:13
+#: ../data/ui/new-label-dialog.ui.h:9
 #, fuzzy
 msgid "Rotated"
 msgstr "Girar"
 
-#: ../data/builder/new-label-dialog.builder.h:14
+#: ../data/ui/new-label-dialog.ui.h:10
 msgid "Select orientation of label content."
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:15
+#: ../data/ui/new-label-dialog.ui.h:11
 msgid "Similar products:"
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:16
+#: ../data/ui/new-label-dialog.ui.h:12
 msgid "Vendor:"
 msgstr ""
 
-#: ../data/builder/new-label-dialog.builder.h:17
-msgid "page 1"
-msgstr ""
-
-#: ../data/builder/new-label-dialog.builder.h:18
-msgid "page 2"
-msgstr ""
-
-#: ../data/builder/new-label-dialog.builder.h:19
-msgid "page 3"
-msgstr ""
-
-#: ../data/builder/object-editor.builder.h:2
+#: ../data/ui/object-editor.ui.h:2
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/builder/object-editor.builder.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/builder/object-editor.builder.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">propriedades do objecto Xxx</span>"
-
-#: ../data/builder/object-editor.builder.h:5
-#: ../data/builder/prefs-dialog.builder.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "Permitir que fusÃ£o encolha o texto automaticamente"
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Ã?ngulo:"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Soma de verificaÃ§Ã£o"
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Activar sombra"
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "FamÃlia:"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Preencher"
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Altura:"
 
-#: ../data/builder/object-editor.builder.h:17
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "Chave:"
 
-#: ../data/builder/object-editor.builder.h:18
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Comprimento:"
 
-#: ../data/builder/object-editor.builder.h:20
-#: ../data/builder/prefs-dialog.builder.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "EspaÃ§amento de linhas:"
 
-#: ../data/builder/object-editor.builder.h:21
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Literal:"
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "Opacidade:"
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "PosiÃ§Ã£o"
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Redefinir tamanho da imagem"
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Sombra"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Estilo:"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Estilo:"
 
-#: ../data/builder/object-editor.builder.h:31
-#: ../data/builder/prefs-dialog.builder.h:20
-#: ../data/builder/template-designer.builder.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Largura:"
 
-#: ../data/builder/object-editor.builder.h:32
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "Deslocamento X:"
 
-#: ../data/builder/object-editor.builder.h:33
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "Deslocamento Y:"
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "graus"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "dÃgitos:"
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "Formato:"
 
-#: ../data/builder/prefs-dialog.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "..."
 
-#: ../data/builder/prefs-dialog.builder.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Tamanho de pÃ¡gina padrÃ£o</span>"
-
-#: ../data/builder/prefs-dialog.builder.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Preencher</span>"
-
-#: ../data/builder/prefs-dialog.builder.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linha</span>"
-
-#: ../data/builder/prefs-dialog.builder.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Texto</span>"
-
-#: ../data/builder/prefs-dialog.builder.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Unidades</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "Redefinir tamanho da imagem"
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Polegadas"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "Local"
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "MilÃmetros"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "PadrÃµes do objecto"
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Pontos"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "Seleccione as propriedades padrÃµes para novos objectos."
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "Seleccione comportamento especÃfico do local."
 
-#: ../data/builder/prefs-dialog.builder.h:19 ../templates/paper-sizes.xml.h:35
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Sem tÃtulo"
+
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../data/builder/property-bar.builder.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "Alinhar pelos centros"
 
-#: ../data/builder/property-bar.builder.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "Alinhamento Ã  esquerda"
 
-#: ../data/builder/property-bar.builder.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "Alinhamento Ã  direita"
 
-#: ../data/builder/template-designer.builder.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(ex., \"Etiquetas de correio,\" \"CartÃµes de visita,\" ...)"
 
-#: ../data/builder/template-designer.builder.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(ex., 8163A)"
 
-#: ../data/builder/template-designer.builder.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(ex., Avery, Acme, ...)"
 
-#: ../data/builder/template-designer.builder.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. Raio exterior:"
 
-#: ../data/builder/template-designer.builder.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. Raio"
 
-#: ../data/builder/template-designer.builder.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Largura:"
 
-#: ../data/builder/template-designer.builder.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. Altura:"
 
-#: ../data/builder/template-designer.builder.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. Raio interior"
 
-#: ../data/builder/template-designer.builder.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. DesperdÃcio (impressÃ£o sobreposta permitida)"
 
-#: ../data/builder/template-designer.builder.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. Largura de corte:"
 
-#: ../data/builder/template-designer.builder.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Margem"
 
-#: ../data/builder/template-designer.builder.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. Arredondar (raio do canto):"
 
-#: ../data/builder/template-designer.builder.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. Altura de corte:"
 
-#: ../data/builder/template-designer.builder.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. DesperdÃcio horizontal (impressÃ£o sobreposta permitida):"
 
-#: ../data/builder/template-designer.builder.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. DesperdÃcio vertical (impressÃ£o sobreposta permitida):"
 
-#: ../data/builder/template-designer.builder.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. DesperdÃcio (impressÃ£o sobreposta permitida):"
 
-#: ../data/builder/template-designer.builder.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Margem"
 
-#: ../data/builder/template-designer.builder.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "Marca/Fabricante:"
 
-#: ../data/builder/template-designer.builder.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD (incluindo Mini-CD)"
 
-#: ../data/builder/template-designer.builder.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -2160,19 +2404,19 @@ msgstr ""
 "desenho\n"
 "ou \"Retroceder\" para continuar a editar."
 
-#: ../data/builder/template-designer.builder.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "DistÃ¢ncia da margem esquerda (x0):"
 
-#: ../data/builder/template-designer.builder.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "DistÃ¢ncia da margem superior (y0):"
 
-#: ../data/builder/template-designer.builder.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "EspaÃ§amento horizontal (dx):"
 
-#: ../data/builder/template-designer.builder.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -2187,38 +2431,38 @@ msgstr ""
 "Muitos modelos sÃ³ precisam de uma disposiÃ§Ã£o, como no primeiro exemplo.\n"
 "O segundo exemplo ilustra quando duas disposiÃ§Ãµes sÃ£o necessÃ¡rias."
 
-#: ../data/builder/template-designer.builder.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "DisposiÃ§Ã£o #1"
 
-#: ../data/builder/template-designer.builder.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "DisposiÃ§Ã£o #2"
 
-#: ../data/builder/template-designer.builder.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "NÃºmero de colunas (nx):"
 
-#: ../data/builder/template-designer.builder.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "NÃºmero de linhas (ny):"
 
-#: ../data/builder/template-designer.builder.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "NÃºmero de disposiÃ§Ãµes:"
 
-#: ../data/builder/template-designer.builder.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr ""
 "Por favor introduza a seguinte informaÃ§Ã£o identificativa acerca do modelo."
 
-#: ../data/builder/template-designer.builder.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "Por favor introduza a seguinte informaÃ§Ã£o da disposiÃ§Ã£o."
 
-#: ../data/builder/template-designer.builder.h:46
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
@@ -2226,7 +2470,7 @@ msgstr ""
 "Por favor introduza a seguinte informaÃ§Ã£o dos parÃ¢metros de tamanho de uma "
 "etiqueta simples no seu modelo"
 
-#: ../data/builder/template-designer.builder.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
@@ -2234,43 +2478,43 @@ msgstr ""
 "Por favor introduza a seguinte informaÃ§Ã£o dos parÃ¢metros de tamanho de uma "
 "etiqueta simples ou cartÃ£o no seu modelo"
 
-#: ../data/builder/template-designer.builder.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr "Por favor seleccione a forma bÃ¡sica das suas etiquetas ou cartÃµes."
 
-#: ../data/builder/template-designer.builder.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "Por favor seleccione o tamanho da pÃ¡gina do modelo"
 
-#: ../data/builder/template-designer.builder.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Imprimir folha de teste"
 
-#: ../data/builder/template-designer.builder.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "Rectangular ou quadrado (pode ter cantos redondos)"
 
-#: ../data/builder/template-designer.builder.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "Redondo"
 
-#: ../data/builder/template-designer.builder.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
 msgstr "Modelos que precisam de duas disposiÃ§Ãµes."
 
-#: ../data/builder/template-designer.builder.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
 msgstr "Modelos que precisam apenas de uma disposiÃ§Ã£o."
 
-#: ../data/builder/template-designer.builder.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "EspaÃ§amento vertical (dy):"
 
-#: ../data/builder/template-designer.builder.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2280,85 +2524,46 @@ msgstr ""
 "\n"
 "Este diÃ¡logo o ajudarÃ¡ na criaÃ§Ã£o de um modelo personalizado."
 
-#: ../data/builder/template-designer.builder.h:62
-msgid "cd_size_page"
-msgstr "cd_size_page"
-
-#: ../data/builder/template-designer.builder.h:63
-msgid "finish_page"
-msgstr "finish_page"
-
-#: ../data/builder/template-designer.builder.h:65
-msgid "layout_page"
-msgstr "layout_page"
-
-#: ../data/builder/template-designer.builder.h:66
-msgid "name_page"
-msgstr "name_page"
-
-#: ../data/builder/template-designer.builder.h:67
-msgid "nlayouts_page"
-msgstr "nlayouts_page"
-
-#: ../data/builder/template-designer.builder.h:68
-msgid "pg_size_page"
-msgstr "pg_size_page"
-
-#: ../data/builder/template-designer.builder.h:69
-msgid "rect_size_page"
-msgstr "rect_size_page"
-
-#: ../data/builder/template-designer.builder.h:70
-msgid "round_size_page"
-msgstr "round_size_page"
-
-#: ../data/builder/template-designer.builder.h:71
-msgid "shape_page"
-msgstr "shape_page"
-
-#: ../data/builder/template-designer.builder.h:72
-msgid "start_page"
-msgstr "start_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "Comparar"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 #, fuzzy
-msgid "<b>Copies</b>"
-msgstr "<b>OpÃ§Ãµes</b>"
+msgid "Copies"
+msgstr "CÃ³pias:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "CÃ³pias:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
 #, fuzzy
-msgid "<b>Merge Control</b>"
+msgid "Merge Control"
 msgstr "<b>Controlo de ImpressÃ£o (FusÃ£o)</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
-msgid "<b>Options</b>"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
 msgstr "<b>OpÃ§Ãµes</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
-msgid "Collate"
-msgstr "Comparar"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
-msgid "Copies:"
-msgstr "CÃ³pias:"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:7
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
 msgstr "PÃ¡ginas:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:8
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
 msgid "Start on label"
 msgstr "Iniciar na etiqueta"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:9
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
 msgid "from:"
 msgstr "de:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:10
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
 msgid "on 1st sheet"
 msgstr "na primeira folha"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:14
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
 msgid "to:"
 msgstr "para:"
 
@@ -2503,7 +2708,8 @@ msgstr "Qualquer cartÃ£o"
 msgid "Any label"
 msgstr "Qualquer etiqueta"
 
-#: ../templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "CartÃµes de visita"
 
@@ -2519,7 +2725,8 @@ msgstr "Produtos para correio/expediÃ§Ã£o"
 msgid "Rectangular labels"
 msgstr "Etiquetas rectangulares"
 
-#: ../templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "Etiquetas arredondadas"
 
@@ -2535,6 +2742,7 @@ msgstr "Etiquetas quadradas"
 #: ../templates/dymo-other-templates.xml.h:4
 #: ../templates/maco-us-templates.xml.h:2
 #: ../templates/misc-iso-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"
@@ -2560,6 +2768,7 @@ msgstr "CartÃµes de visita"
 #: ../templates/avery-iso-templates.xml.h:14
 #: ../templates/misc-us-templates.xml.h:8
 #: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
 #: ../templates/worldlabel-us-templates.xml.h:2
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
@@ -2953,6 +3162,141 @@ msgid "Multi-Purpose Labels"
 msgstr "Etiquetas GenÃ©ricas"
 
 #. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Etiquetas de endereÃ§os"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Etiquetas de disquete"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "CartÃµes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "CartÃµes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "CartÃµes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "CartÃµes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Etiquetas redondas"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "CartÃµes de visita"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Etiquetas"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Etiquetas"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Etiquetas"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+#, fuzzy
+msgid "Name plates"
+msgstr "name_page"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Acerca do gLabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "Etiquetas quadradas"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "Etiquetas quadradas"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr "Etiquetas de CorrecÃ§Ã£o e Cobrir"
@@ -2987,3 +3331,55 @@ msgstr "Etiquetas de CÃ³pia Rectangulares"
 msgid "Video Labels (back)"
 msgstr "Etiquetas de VÃdeo (traseira)"
 
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">propriedades do objecto Xxx</span>"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Tamanho de pÃ¡gina padrÃ£o</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Preencher</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Linha</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Texto</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Unidades</span>"
+
+#~ msgid "cd_size_page"
+#~ msgstr "cd_size_page"
+
+#~ msgid "finish_page"
+#~ msgstr "finish_page"
+
+#~ msgid "layout_page"
+#~ msgstr "layout_page"
+
+#~ msgid "nlayouts_page"
+#~ msgstr "nlayouts_page"
+
+#~ msgid "pg_size_page"
+#~ msgstr "pg_size_page"
+
+#~ msgid "rect_size_page"
+#~ msgstr "rect_size_page"
+
+#~ msgid "round_size_page"
+#~ msgstr "round_size_page"
+
+#~ msgid "shape_page"
+#~ msgstr "shape_page"
+
+#~ msgid "start_page"
+#~ msgstr "start_page"
+
+#, fuzzy
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>OpÃ§Ãµes</b>"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 73d5845..66bb12c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels 1.91.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-05 22:26-0300\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2010-06-05 12:45-0300\n"
 "Last-Translator: Michel Recondo <michel recondo com br>\n"
 "Language-Team: Brazilian portuguese <gnome-pt_br-list gnome org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../src/bc.c:66
@@ -68,7 +68,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A ou UPC-E)"
 
-#: ../src/bc.c:107
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -80,7 +80,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:116
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -92,7 +92,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:125
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -100,11 +100,11 @@ msgstr "ISBN"
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:131
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr "Code 39"
 
-#: ../src/bc.c:134
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr "Code 128"
 
@@ -116,11 +116,11 @@ msgstr "Code 128C"
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc.c:143
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr "2 de 5 intercalado"
 
-#: ../src/bc.c:146
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr "Codabar"
 
@@ -132,19 +132,256 @@ msgstr "MSI"
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:155
+#: ../src/bc.c:155 ../src/bc.c:213
 msgid "Code 93"
 msgstr "Code 93"
 
 #: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
 msgid "GS1-128"
 msgstr "GS1-128"
 
-#: ../src/bc.c:169
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+#, fuzzy
+msgid "HIBC QR Code"
+msgstr "IEC18004 (QRCode)"
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Colar"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "CÃ³digo de barras"
+
+#: ../src/bc.c:330
+#, fuzzy
+msgid "Pharmacode 2-track"
+msgstr "Dado do cÃ³digo de barras:"
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Excluir"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:176
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr "IEC18004 (QRCode)"
 
@@ -314,7 +551,7 @@ msgstr "Erro fatal do gLabels!"
 msgid "New Label or Card"
 msgstr "Nova etiqueta ou cartÃ£o"
 
-#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "Propriedades da etiqueta"
 
@@ -434,63 +671,63 @@ msgstr "0123456789 .:,;(*!?)"
 msgid "Sample text"
 msgstr "Texto de amostra"
 
-#: ../src/glabels-batch.c:52
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "define o nome do arquivo de saÃda (padrÃ£o=\"output.pdf\")"
 
-#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "nome_de_arquivo"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "nÃºmero de pÃ¡ginas (padrÃ£o=1)"
 
-#: ../src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "pÃ¡ginas"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "nÃºmero de cÃ³pias (padrÃ£o=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "cÃ³pias"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr "primeira etiqueta na primeira folha (padrÃ£o=1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr "primeiro"
 
-#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "imprimir contornos (para testar alinhamento da impressora)"
 
-#: ../src/glabels-batch.c:62 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "imprimir ao contrÃ¡rio (como uma imagem de espelho)"
 
-#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "imprime marcas de corte"
 
-#: ../src/glabels-batch.c:66
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr "arquivo de entrada para mesclagem"
 
-#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[ARQUIVO...]"
 
-#: ../src/glabels-batch.c:98
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr "Imprime arquivos criados com o gLabels."
 
-#: ../src/glabels-batch.c:106 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
@@ -500,13 +737,13 @@ msgstr ""
 "Execute \"%s --help\" para ver uma lista completa de opÃ§Ãµes disponÃveis de "
 "linha de comando.\n"
 
-#: ../src/glabels-batch.c:149
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr ""
 "nÃ£o Ã© possÃvel realizar a mesclagem do documento com o arquivo glabels %s\n"
 
-#: ../src/glabels-batch.c:184
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "nÃ£o Ã© possÃvel abrir o arquivo glabels %s\n"
@@ -527,11 +764,11 @@ msgstr "Dado do cÃ³digo de barras:"
 msgid "Barcode property"
 msgstr "Propriedade do cÃ³digo de barras"
 
-#: ../src/label-barcode.c:483
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr "Dados do cÃ³digo de barras vazios"
 
-#: ../src/label-barcode.c:487
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr "Dados do cÃ³digo de barras invÃ¡lidos"
 
@@ -554,79 +791,79 @@ msgstr "Cor de linha"
 msgid "Line width"
 msgstr "Largura da linha"
 
-#: ../src/label.c:399
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr "Sem_tÃtulo"
 
-#: ../src/label.c:702 ../src/ui.c:422
+#: ../src/label.c:705 ../src/ui.c:422
 msgid "Merge properties"
 msgstr "Propriedades de mesclagem"
 
-#: ../src/label.c:1184 ../src/ui.c:215
+#: ../src/label.c:1197 ../src/ui.c:215
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../src/label.c:1217 ../src/ui.c:324
+#: ../src/label.c:1230 ../src/ui.c:324
 msgid "Bring to front"
 msgstr "Trazer para frente"
 
-#: ../src/label.c:1253 ../src/ui.c:331
+#: ../src/label.c:1266 ../src/ui.c:331
 msgid "Send to back"
 msgstr "Enviar para trÃ¡s"
 
-#: ../src/label.c:1294
+#: ../src/label.c:1307
 msgid "Rotate"
 msgstr "Girar"
 
-#: ../src/label.c:1329 ../src/ui.c:338
+#: ../src/label.c:1342 ../src/ui.c:338
 msgid "Rotate left"
 msgstr "Girar Ã  esquerda"
 
-#: ../src/label.c:1362 ../src/ui.c:345
+#: ../src/label.c:1375 ../src/ui.c:345
 msgid "Rotate right"
 msgstr "Girar Ã  direita"
 
-#: ../src/label.c:1397 ../src/ui.c:352
+#: ../src/label.c:1410 ../src/ui.c:352
 msgid "Flip horizontally"
 msgstr "Refletir horizontalmente"
 
-#: ../src/label.c:1432 ../src/ui.c:359
+#: ../src/label.c:1445 ../src/ui.c:359
 msgid "Flip vertically"
 msgstr "Refletir verticalmente"
 
-#: ../src/label.c:1472 ../src/ui.c:366
+#: ../src/label.c:1485 ../src/ui.c:366
 msgid "Align left"
 msgstr "Alinha Ã  esquerda"
 
-#: ../src/label.c:1529 ../src/ui.c:373
+#: ../src/label.c:1542 ../src/ui.c:373
 msgid "Align right"
 msgstr "Alinha Ã  direita"
 
-#: ../src/label.c:1590 ../src/ui.c:380
+#: ../src/label.c:1603 ../src/ui.c:380
 msgid "Align horizontal center"
 msgstr "Alinha pelo centro horizontal"
 
-#: ../src/label.c:1666 ../src/ui.c:387
+#: ../src/label.c:1679 ../src/ui.c:387
 msgid "Align tops"
 msgstr "Alinha pelos topos"
 
-#: ../src/label.c:1723 ../src/ui.c:394
+#: ../src/label.c:1736 ../src/ui.c:394
 msgid "Align bottoms"
 msgstr "Alinha pelas bases"
 
-#: ../src/label.c:1784 ../src/ui.c:401
+#: ../src/label.c:1797 ../src/ui.c:401
 msgid "Align vertical center"
 msgstr "Alinha pelo centro vertical"
 
-#: ../src/label.c:1862 ../src/ui.c:408
+#: ../src/label.c:1875 ../src/ui.c:408
 msgid "Center horizontally"
 msgstr "Centraliza horizontalmente"
 
-#: ../src/label.c:1909 ../src/ui.c:415
+#: ../src/label.c:1922 ../src/ui.c:415
 msgid "Center vertically"
 msgstr "Centraliza verticalmente"
 
-#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
 msgid "Paste"
 msgstr "Colar"
 
@@ -634,11 +871,11 @@ msgstr "Colar"
 msgid "Create ellipse object"
 msgstr "Criar objeto elipse"
 
-#: ../src/label-image.c:161 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:312
 msgid "Create image object"
 msgstr "Criar objeto imagem"
 
-#: ../src/label-image.c:265 ../src/label-image.c:336
+#: ../src/label-image.c:333 ../src/label-image.c:474
 msgid "Set image"
 msgstr "Define a imagem"
 
@@ -803,11 +1040,21 @@ msgstr "Texto: valores separados por dois pontos"
 msgid "Text: Colon separated values with keys on line 1"
 msgstr "Texto: valores separados por dois pontos com as chaves na linha 1"
 
-#: ../src/merge-init.c:104
+#: ../src/merge-init.c:102
+#, fuzzy
+msgid "Text: Semicolon separated values"
+msgstr "Texto: valores separados por dois pontos"
+
+#: ../src/merge-init.c:109
+#, fuzzy
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr "Texto: valores separados por dois pontos com as chaves na linha 1"
+
+#: ../src/merge-init.c:119
 msgid "Evolution Addressbook"
 msgstr "Livro de endereÃ§os do Evolution"
 
-#: ../src/merge-init.c:110
+#: ../src/merge-init.c:125
 msgid "VCards"
 msgstr "VCards"
 
@@ -831,7 +1078,7 @@ msgstr "Selecionar"
 msgid "Record/Field"
 msgstr "Registro/Campo"
 
-#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "Dado"
 
@@ -927,7 +1174,7 @@ msgstr "PreferÃªncias do gLabels"
 
 #. ===================================================================
 #: ../src/print-op.c:205 ../src/print-op-dialog.c:217
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etiquetas"
@@ -1076,10 +1323,9 @@ msgstr "DisposiÃ§Ã£o completa"
 msgid "Edit gLabels Template"
 msgstr "Editar modelo do gLabels"
 
-#: ../src/template-designer.c:1422
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
 msgstr ""
 "<span foreground='red' weight='bold'>Marca e nÃºmero confere com um modelo "
 "existente!</span>"
@@ -1314,7 +1560,8 @@ msgstr "Selecionar modo"
 msgid "Select, move and modify objects"
 msgstr "Seleciona, movimenta e modifica objetos"
 
-#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Texto"
 
@@ -1326,7 +1573,8 @@ msgstr "Caixa"
 msgid "Create box/rectangle object"
 msgstr "Criar objeto caixa/retÃ¢ngulo"
 
-#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Linha"
 
@@ -1338,7 +1586,7 @@ msgstr "Elipse"
 msgid "Create ellipse/circle object"
 msgstr "Criar objeto elipse/cÃrculo"
 
-#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Imagem"
 
@@ -1524,52 +1772,57 @@ msgstr "(sem nome) - gLabels"
 msgid "(modified)"
 msgstr "(modificado)"
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr "NÃ³ raiz ruim = \"%s\""
 
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr "nÃ³ ruim = \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:227
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "erro: xmlParseFile"
 
-#: ../src/xml-label.c:264
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Sem raiz do documento"
 
-#: ../src/xml-label.c:272
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Importando do formato do glabels 0.1"
 
-#: ../src/xml-label.c:281
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Importando do formato do glabels 0.4"
 
-#: ../src/xml-label.c:291
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "EspaÃ§o de nome glabels desconhecido -- usando %s"
 
-#: ../src/xml-label.c:360
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "NÃ³ ruim no nÃ³ Documento =  \"%s\""
 
-#: ../src/xml-label.c:856
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "nÃ³ ruim no nÃ³ Dados = \"%s\""
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Id ou nome \"%s\" de tamanho de pÃ¡gina desconhecido"
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Erro de conversÃ£o UTF-8"
 
-#: ../src/xml-label.c:1104
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "Problema ao salvar arquivo xml."
 
@@ -1621,12 +1874,24 @@ msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr ""
 "A parte equivalente (\"%s\") para \"%s\" nÃ£o foi definida anteriormente."
 
-#: ../libglabels/template.c:722 ../libglabels/template.c:726
-msgid "per sheet"
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d  (%d por pÃ¡gina)"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
 msgstr "por pÃ¡gina"
 
-#: ../libglabels/template.c:796 ../libglabels/template.c:802
-#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
 msgid "diameter"
 msgstr "diÃ¢metro"
 
@@ -1634,13 +1899,13 @@ msgstr "diÃ¢metro"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:40
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr "pontos"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
 #: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr "pol."
@@ -1700,25 +1965,27 @@ msgstr "O atributo nome tambÃ©m estÃ¡ faltando."
 #. * End:                   -- emacs
 #.
 #: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>SeleÃ§Ã£o/previsÃ£o de registro</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Fonte</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "LocalizaÃ§Ã£o:"
 
-#: ../data/ui/merge-properties-dialog.ui.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>SeleÃ§Ã£o/previsÃ£o de registro</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Selecionar tudo"
 
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Fonte</b>"
+
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Desmarcar tudo"
@@ -1801,133 +2068,128 @@ msgstr "Fabricante:"
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Propriedades do objeto Xxx</span>"
-
-#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../data/ui/object-editor.ui.h:5
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "Permitir Ã  mesclagem encolher o texto automaticamente"
 
-#: ../data/ui/object-editor.ui.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Ã?ngulo:"
 
-#: ../data/ui/object-editor.ui.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Checksum"
 
-#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../data/ui/object-editor.ui.h:10
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Habilitar sombra"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "FamÃlia:"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Arquivo:"
 
-#: ../data/ui/object-editor.ui.h:13
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Preencher"
 
-#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Altura:"
 
-#: ../data/ui/object-editor.ui.h:16
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "Chave:"
 
-#: ../data/ui/object-editor.ui.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Comprimento:"
 
-#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "EspaÃ§amento de linha:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Literal:"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "Opacidade"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "PosiÃ§Ã£o"
 
-#: ../data/ui/object-editor.ui.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Redefinir tamanho da imagem"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Sombra"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../data/ui/object-editor.ui.h:26
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../data/ui/object-editor.ui.h:27
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Estilo:"
 
-#: ../data/ui/object-editor.ui.h:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
 #: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Largura:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "Deslocamento X:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "Deslocamento Y:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "graus"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "dÃgitos:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "formato:"
 
@@ -1935,66 +2197,55 @@ msgstr "formato:"
 msgid "   "
 msgstr "   "
 
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Tamanho de pÃ¡gina padrÃ£o</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Preenchimento</span>"
-
 #: ../data/ui/prefs-dialog.ui.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linha</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Texto</span>"
+msgid "Default page size"
+msgstr "Tamanho de pÃ¡gina padrÃ£o"
 
 #: ../data/ui/prefs-dialog.ui.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Unidades</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../data/ui/prefs-dialog.ui.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/ui/prefs-dialog.ui.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Polegadas"
 
-#: ../data/ui/prefs-dialog.ui.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "Local"
 
-#: ../data/ui/prefs-dialog.ui.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "MilÃmetros"
 
-#: ../data/ui/prefs-dialog.ui.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "PadrÃµes do objeto"
 
-#: ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Pontos"
 
-#: ../data/ui/prefs-dialog.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "Selecione as propriedades padrÃµes para novos objetos."
 
-#: ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "Selecione comportamento especÃfico do local."
 
-#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "Carta"
 
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Sem_tÃtulo"
+
 #: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Negrito"
@@ -2232,25 +2483,28 @@ msgstr ""
 "Este diÃ¡logo irÃ¡ lhe auxiliar na criaÃ§Ã£o de um modelo gLabels personalizado."
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "<b>Copies</b>"
-msgstr "<b>CÃ³pias</b>"
+msgid "Collate"
+msgstr "Ordenar"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-msgid "<b>Merge Control</b>"
-msgstr "<b>Controle de mesclagem</b>"
+#, fuzzy
+msgid "Copies"
+msgstr "CÃ³pias:"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>OpÃ§Ãµes</b>"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-msgid "Collate"
-msgstr "Ordenar"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
 msgid "Copies:"
 msgstr "CÃ³pias:"
 
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "<b>Controle de mesclagem</b>"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>OpÃ§Ãµes</b>"
+
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
 msgstr "PÃ¡ginas:"
@@ -3019,6 +3273,28 @@ msgstr "Etiquetas retangulares para copiadoras"
 msgid "Video Labels (back)"
 msgstr "Etiquetas de vÃdeo (verso)"
 
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Propriedades do objeto Xxx</span>"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Tamanho de pÃ¡gina padrÃ£o</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Preenchimento</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Linha</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Texto</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Unidades</span>"
+
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>CÃ³pias</b>"
+
 #~ msgid "Show view debugging messages."
 #~ msgstr "Exibe mensagens de depuraÃ§Ã£o de visualizaÃ§Ã£o."
 
@@ -3144,9 +3420,6 @@ msgstr "Etiquetas de vÃdeo (verso)"
 #~ msgid "Text file with tab delimeters"
 #~ msgstr "Arquivo texto separado com tab"
 
-#~ msgid "%d x %d  (%d per sheet)"
-#~ msgstr "%d x %d  (%d por pÃ¡gina)"
-
 #~ msgid "%s x %s %s"
 #~ msgstr "%s x %s %s"
 
@@ -3309,9 +3582,6 @@ msgstr "Etiquetas de vÃdeo (verso)"
 #~ msgid "Display units"
 #~ msgstr "Exibir unidades"
 
-#~ msgid "Default page size"
-#~ msgstr "Tamanho de pÃ¡gina padrÃ£o"
-
 #~ msgid "Outline"
 #~ msgstr "Contorno"
 
diff --git a/po/ru.po b/po/ru.po
index ff02c9e..b03721e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-29 00:34+0400\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2009-07-29 19:58+0400\n"
 "Last-Translator: Alexandre Prokoudine <alexandre prokoudine gmail com>\n"
 "Language-Team: Russian <ru li org>\n"
@@ -17,20 +17,661 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../src/glabels.c:66 ../src/glabels-batch.c:69
-msgid "[FILE...]"
-msgstr "[Ð¤Ð?Ð?Ð?...]"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (Ð»Ñ?Ð±Ð¾Ð¹)"
+
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ð¸Ð½Ð´ÐµÐºÑ?)"
+
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP+4)"
+
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
+
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (Ð»Ñ?Ð±Ð¾Ð¹)"
 
-#: ../src/glabels.c:83
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
+
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
+
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
+
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
+
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
+
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
+
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A or UPC-E)"
+
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
+
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
+
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
+
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
+
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
+
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
+
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
+
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
+
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Code 128C"
+
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Code 128B"
+
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "Interleaved 2 of 5"
+
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
+
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
+
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:155 ../src/bc.c:213
 #, fuzzy
-msgid "Launch gLabels label and business card designer."
-msgstr "Ð?Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð° Ð´Ð»Ñ? Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº Ð¸ Ð²Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐµÐº\n"
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+#, fuzzy
+msgid "HIBC QR Code"
+msgstr "IEC18004 (QRCode)"
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ?"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Ð¨Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ?"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr "IEC18004 (QRCode)"
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+msgid "Default Color"
+msgstr "Ð¦Ð²ÐµÑ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
+
+#: ../src/color-combo-menu.c:83
+msgid "Dark Red"
+msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-ÐºÑ?Ð°Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½ÐµÐ²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr "Ð¢ÐµÐ¼Ð½Ñ?Ð¹ Ð·Ð¾Ð»Ð¾Ñ?Ð°Ñ?Ð½Ð¸Ðº"
+
+#: ../src/color-combo-menu.c:86
+msgid "Dark Green"
+msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr "Ð¢ÐµÐ¼Ð½Ð¾-Ñ?Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
 
-#: ../src/glabels.c:91 ../src/glabels-batch.c:105
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ñ?Ð¸Ð½Ð¸Ð¹"
+
+#: ../src/color-combo-menu.c:89
+msgid "Dark Violet"
+msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ñ?Ð¸Ð¾Ð»ÐµÑ?Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:91
+msgid "Red"
+msgstr "Ð?Ñ?Ð°Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:92
+msgid "Orange"
+msgstr "Ð?Ñ?Ð°Ð½Ð¶ÐµÐ²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr "Ð¢ÐµÐ¼Ð½Ð¾-Ð¶ÐµÐ»Ñ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:94
+msgid "Medium green"
+msgstr "Ð¢Ñ?Ñ?ÐºÐ»Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr "Ð?Ð¸Ñ?Ñ?Ð·Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:96
+msgid "Blue"
+msgstr "Ð¡Ð¸Ð½Ð¸Ð¹"
+
+#: ../src/color-combo-menu.c:97
+msgid "Purple"
+msgstr "Ð?Ñ?Ñ?Ð¿Ñ?Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr "Ð¡Ð¾Ð¼Ð¾Ð½"
+
+#: ../src/color-combo-menu.c:100
+msgid "Gold"
+msgstr "Ð?Ð¾Ð»Ð¾Ñ?Ð¾Ð¹"
+
+#: ../src/color-combo-menu.c:101
+msgid "Yellow"
+msgstr "Ð?Ñ?Ð»Ñ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:102
+msgid "Green"
+msgstr "Ð?ÐµÐ»Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr "Ð¦Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:104
+msgid "SkyBlue"
+msgstr "Ð?ÐµÐ±ÐµÑ?Ð½Ð¾-Ñ?Ð¸Ð½Ð¸Ð¹"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr "Ð¤Ð¸Ð¾Ð»ÐµÑ?Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:107
+msgid "Pink"
+msgstr "Ð Ð¾Ð·Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr "Ð¥Ð°ÐºÐ¸"
+
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
+msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð¶Ñ?Ð»Ñ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:110
+msgid "Light Green"
+msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
+msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ñ?Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr "Ð?Ñ?Ð¿Ð¸Ð´Ð½Ð¾-Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
+msgstr "Ð§ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ñ?"
+
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr "Ð?ÐµÐ»Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr "10% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr "25% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr "40% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr "50% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr "60% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:126
+msgid "Black"
+msgstr "Ð§Ñ?Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+msgid "Custom Color"
+msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ?:"
+
+#: ../src/color-combo-menu.c:319
 #, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+msgid "Custom Color #%u"
+msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ? #%u"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr "Ð¤Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ° gLabels!"
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "Ð?Ð¾Ð²Ð°Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ° Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ°"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+msgid "Label properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
+msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
+
+#: ../src/file.c:272 ../src/file.c:562
+msgid "gLabels documents"
+msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ñ? gLabels"
+
+#: ../src/file.c:319 ../src/file.c:620
+msgid "Empty file name selection"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ Ð²Ñ?Ð±Ð¾Ñ? Ñ?Ð°Ð¹Ð»Ð°"
+
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
+msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð²Ð²ÐµÐ´Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
+
+#: ../src/file.c:335
+msgid "File does not exist"
+msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
+
+#: ../src/file.c:410
+#, c-format
+msgid "Could not open file \"%s\""
+msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð»  \"%s\""
+
+#: ../src/file.c:413
+msgid "Not a supported file format"
+msgstr "Ð¤Ð°Ð¹Ð» Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð°"
+
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
+msgid "Could not save file \"%s\""
+msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\""
+
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
+msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Ñ?Ð°Ð¹Ð»Ð°.  Ð¤Ð°Ð¹Ð» Ð²Ñ?Ñ? ÐµÑ?Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ð½."
+
+#: ../src/file.c:535
+#, c-format
+msgid "Save \"%s\" as"
+msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? \"%s\" ÐºÐ°Ðº"
+
+#: ../src/file.c:623
+msgid "Please supply a valid file name"
+msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
+
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
+msgstr "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ð¸Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\"?"
+
+#: ../src/file.c:648
+msgid "File already exists."
+msgstr "Ð¤Ð°Ð¹Ð» Ñ?Ð¶Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?."
+
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
+msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð² Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ðµ \"%s\" Ð¿ÐµÑ?ÐµÐ´ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð¸ÐµÐ¼?"
+
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
+msgstr "Ð?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð´Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÑ?Ñ?Ð½Ñ?, ÐµÑ?Ð»Ð¸ Ð²Ñ? Ð¸Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ."
+
+#: ../src/file.c:751
+msgid "Close without saving"
+msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ? Ð±ÐµÐ· Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ?"
+
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ñ?Ð°Ð±Ð»Ð¾Ð½Ñ?"
+
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
+
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
 msgstr ""
 
 #: ../src/glabels-batch.c:53
@@ -65,15 +706,15 @@ msgstr "Ð¿ÐµÑ?Ð²Ð°Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ° Ð½Ð° Ð¿ÐµÑ?Ð²Ð¾Ð¹ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ (Ð¿Ð¾ 
 msgid "first"
 msgstr "Ð¿ÐµÑ?Ð²Ð¾Ðµ"
 
-#: ../src/glabels-batch.c:61 ../data/builder/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ð°Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº (Ð´Ð»Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð²Ñ?Ñ?Ð°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ñ?)"
 
-#: ../src/glabels-batch.c:63 ../data/builder/print-custom-widget.glade.h:5
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ð°Ñ?Ñ? Ð·ÐµÑ?ÐºÐ°Ð»Ñ?Ð½Ð¾Ðµ Ð¾Ñ?Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: ../src/glabels-batch.c:65 ../data/builder/print-custom-widget.glade.h:4
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?ÐºÐ¸ Ð¿Ð¾Ð´ Ð¾Ð±Ñ?ÐµÐ·"
 
@@ -81,132 +722,632 @@ msgstr "Ð?ÐµÑ?Ð°Ñ?Ð°Ñ?Ñ? Ð¼ÐµÑ?ÐºÐ¸ Ð¿Ð¾Ð´ Ð¾Ð±Ñ?ÐµÐ·"
 msgid "input file for merging"
 msgstr "Ð?Ñ?Ð¾Ð´Ð½Ð¾Ð¹ Ñ?Ð°Ð¹Ð» Ð´Ð»Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð»ÐµÐ¹"
 
-#: ../src/glabels-batch.c:97
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[Ð¤Ð?Ð?Ð?...]"
+
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr "Ð?Ð°Ð¿ÐµÑ?Ð°Ñ?Ð°Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ð½Ð½Ñ?Ðµ Ð² gLabels Ñ?Ð°Ð¹Ð»Ñ?."
 
-#: ../src/glabels-batch.c:147
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð»ÐµÐ¹ Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð° Ñ?Ð°Ð¹Ð»Ð¾Ð¼ gLabels %s\n"
 
-#: ../src/glabels-batch.c:169
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð» %s\n"
 
-#: ../src/window.c:259
-msgid "(none) - gLabels"
-msgstr "(Ð½ÐµÑ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ? Ð¼Ð°ÐºÐµÑ?Ð¾Ð²) - gLabels"
+#: ../src/glabels.c:81
+#, fuzzy
+msgid "Launch gLabels label and business card designer."
+msgstr "Ð?Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð° Ð´Ð»Ñ? Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº Ð¸ Ð²Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐµÐº\n"
 
-#: ../src/window.c:432
-msgid "(modified)"
-msgstr "(Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾)"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
 
-#: ../src/stock.c:72
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´Ð° Ð½Ðµ Ð²Ð²ÐµÐ´ÐµÐ½Ñ?"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ñ?Ð¸Ð¿Ð° Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
+
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´Ð° Ð½Ðµ Ð²Ð²ÐµÐ´ÐµÐ½Ñ?"
+
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´Ð°"
+
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "Ð¦Ð²ÐµÑ? Ð·Ð°Ð»Ð¸Ð²ÐºÐ¸"
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "Ð¦Ð²ÐµÑ? Ð»Ð¸Ð½Ð¸Ð¸"
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "Ð¢Ð¾Ð»Ñ?Ð¸Ð½Ð° Ð»Ð¸Ð½Ð¸Ð¸"
+
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "Ð?ÐµÐ· Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ?"
+
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Ð?Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ?Ñ? Ð¿Ð¾Ð»Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ?"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "Ð?Ð° Ð¿ÐµÑ?ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr "Ð?Ð° Ð·Ð°Ð´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
+
+#: ../src/label.c:1307
+#, fuzzy
+msgid "Rotate"
+msgstr "Ð¡ Ð¿Ð¾Ð²Ð¾Ñ?Ð¾Ñ?Ð¾Ð¼"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð»ÐµÐ²Ð¾"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð¿Ñ?Ð°Ð²Ð¾"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ð¾"
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ð¾"
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð»ÐµÐ²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð¿Ñ?Ð°Ð²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð½ÐµÐ¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð½Ð¸Ð¶Ð½ÐµÐ¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð¸"
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð¸"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ?"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ñ?Ð¾Ð²Ð¾Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?:"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
+
+#: ../src/label-text.c:451
+msgid "Typing"
+msgstr ""
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "Ð?Ð°Ñ?Ð½Ð¸Ñ?Ñ?Ñ?Ð°"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ð¸Ñ?Ñ?Ð°"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð¿Ñ?Ð°Ð²Ð¾"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¸Ð²"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð»ÐµÐ²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "Ð?ÐµÐ¶Ð´Ñ? Ñ?Ñ?Ñ?Ð¾Ðº:"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "Ð¦Ð²ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°Ð²Ñ?Ð¸Ñ?Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¾."
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½ Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐµ Â«Ð?Ð¾Ð¸Ñ?Ðº Ð¿Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°Ð¼Â»."
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr "Ð?ÐµÑ? Ñ?Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹."
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ñ?Ñ? Ð¼Ð°Ñ?ÐºÑ?, Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°Ð²Ñ?Ð¸Ñ?Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¾."
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "Ð?ÐµÑ?"
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?."
+
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+msgid "Couldn't open addressbook."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ñ?Ñ? ÐºÐ½Ð¸Ð³Ñ?."
+
+#: ../src/merge-evolution.c:348
+msgid "Couldn't list available fields."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÑ?Ð¸Ñ?Ð»Ð¸Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ðµ Ð¿Ð¾Ð»Ñ?."
+
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ."
+
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
+
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð· Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÐ¼Ð¾Ð¹ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸ Evolution"
+
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr ""
+
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
+
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð´Ð°Ð½Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
+
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "Ð?/Ð?"
+
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Ð?Ñ?Ð±Ñ?Ð°Ð½Ð¾"
+
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ñ?/Ð?Ð¾Ð»Ðµ"
+
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ"
+
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+msgid "Fixed"
+msgstr ""
+
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð²Ñ?Ð±Ð¾Ñ?Ð°"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
+
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "Ð?Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
+
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð°"
+
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ°"
+
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?Ð»Ð»Ð¸Ð¿Ñ?Ð°"
+
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð¾ Ð»Ð¸Ð½Ð¸Ð¸"
+
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
+
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?ÐµÐºÑ?Ñ?Ð°"
+
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ñ?Ð¸Ð¿Ð° Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ðµ Ð¿Ð¾Ð»Ðµ"
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+msgid "No Fill"
+msgstr "Ð?ÐµÐ· Ð·Ð°Ð»Ð¸Ð²ÐºÐ¸"
+
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
+msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
+
+#: ../src/object-editor-image-page.c:283
+msgid "All Images"
+msgstr "Ð?Ñ?Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
+
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr "%s (*.%s)"
+
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+msgid "No Line"
+msgstr "Ð?ÐµÐ· Ð¾Ð±Ð²Ð¾Ð´ÐºÐ¸"
+
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? gLabels"
+
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr "_Ð ÐµÐ¶Ð¸Ð¼ Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð¸Ñ?"
 
-#: ../src/stock.c:73
+#: ../src/stock.c:71
 msgid "_Text"
 msgstr "_Ð¢ÐµÐºÑ?Ñ?"
 
-#: ../src/stock.c:74
+#: ../src/stock.c:72
 msgid "_Line"
 msgstr "_Ð?Ð¸Ð½Ð¸Ñ?"
 
-#: ../src/stock.c:75
+#: ../src/stock.c:73
 msgid "_Box"
 msgstr "_Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸Ðº"
 
-#: ../src/stock.c:76
+#: ../src/stock.c:74
 msgid "_Ellipse"
 msgstr "_ÐÐ»Ð»Ð¸Ð¿Ñ?"
 
-#: ../src/stock.c:77
+#: ../src/stock.c:75
 msgid "_Image"
 msgstr "_Ð?Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: ../src/stock.c:78
+#: ../src/stock.c:76
 msgid "Bar_code"
 msgstr "_Ð¨Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
 
-#: ../src/stock.c:79
+#: ../src/stock.c:77
 msgid "_Merge Properties"
 msgstr "Ð?Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð»ÐµÐ¹ Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
 
-#: ../src/stock.c:80
+#: ../src/stock.c:78
 msgid "Object _Properties"
 msgstr "_Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð°"
 
-#: ../src/stock.c:81
+#: ../src/stock.c:79
 msgid "Bring to _Front"
 msgstr "Ð?Ð° _Ð¿ÐµÑ?ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
 
-#: ../src/stock.c:82
+#: ../src/stock.c:80
 msgid "Send to _Back"
 msgstr "Ð?Ð° _Ð·Ð°Ð´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
 
-#: ../src/stock.c:83
+#: ../src/stock.c:81
 msgid "Rotate _Left"
 msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð½Ð°_Ð»ÐµÐ²Ð¾"
 
-#: ../src/stock.c:84
+#: ../src/stock.c:82
 msgid "Rotate _Right"
 msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð½Ð°_Ð¿Ñ?Ð°Ð²Ð¾"
 
-#: ../src/stock.c:85
+#: ../src/stock.c:83
 msgid "Flip _Horizontally"
 msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? _Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ð¾"
 
-#: ../src/stock.c:86
+#: ../src/stock.c:84
 msgid "Flip _Vertically"
 msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? _Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ð¾"
 
-#: ../src/stock.c:87
+#: ../src/stock.c:85
 msgid "_Lefts"
 msgstr "Ð¡_Ð»ÐµÐ²Ð°"
 
-#: ../src/stock.c:88
+#: ../src/stock.c:86
 msgid "_Rights"
 msgstr "Ð¡_Ð¿Ñ?Ð°Ð²Ð°"
 
-#: ../src/stock.c:89
+#: ../src/stock.c:87
 msgid "_Centers"
 msgstr "Ð?Ð¾ _Ñ?ÐµÐ½Ñ?Ñ?Ñ?"
 
-#: ../src/stock.c:90
+#: ../src/stock.c:88
 msgid "_Tops"
 msgstr "Ð?Ð¾ _Ð²ÐµÑ?Ñ?Ñ?"
 
-#: ../src/stock.c:91
+#: ../src/stock.c:89
 msgid "Bottoms"
 msgstr "Ð?Ð¾ Ð½Ð¸Ð·Ñ?"
 
-#: ../src/stock.c:92
+#: ../src/stock.c:90
 msgid "Centers"
 msgstr "Ð?Ð¾ Ñ?ÐµÐ½Ñ?Ñ?Ñ?"
 
-#: ../src/stock.c:93 ../src/stock.c:94
+#: ../src/stock.c:91 ../src/stock.c:92
 msgid "Label Ce_nter"
 msgstr "_Ð¦ÐµÐ½Ñ?Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
-#: ../src/stock.c:95 ../data/builder/property-bar.glade.h:3
-msgid "Fill color"
-msgstr "Ð¦Ð²ÐµÑ? Ð·Ð°Ð»Ð¸Ð²ÐºÐ¸"
-
-#: ../src/stock.c:96 ../data/builder/property-bar.glade.h:8
-msgid "Line color"
-msgstr "Ð¦Ð²ÐµÑ? Ð»Ð¸Ð½Ð¸Ð¸"
-
-#: ../src/stock.c:97 ../src/stock.c:99
+#: ../src/stock.c:95 ../src/stock.c:97
 msgid "Linked"
 msgstr "Ð?Ñ?Ð¸ÐºÑ?ÐµÐ¿Ð»ÐµÐ½Ð¾"
 
-#: ../src/stock.c:98 ../src/stock.c:100
+#: ../src/stock.c:96 ../src/stock.c:98
 msgid "Not Linked"
 msgstr "Ð?Ðµ Ð¿Ñ?Ð¸ÐºÑ?ÐµÐ¿Ð»ÐµÐ½Ð¾"
 
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "Ð?Ð¸Ð·Ð°Ð¹Ð½ÐµÑ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² gLabels"
+
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ?"
+
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "Ð?Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¸ Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ"
+
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
+
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ¸"
+
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ¸"
+
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ð¼ÐµÑ?ÐºÐ¸ (Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?)"
+
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ð¼ÐµÑ?ÐºÐ¸ (CD/DVD)"
+
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "Ð?Ð¾Ð»Ð¸Ñ?ÐµÑ?Ñ?Ð²Ð¾ Ñ?Ð¾Ñ?Ð¼"
+
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ñ?"
+
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "Ð?Ñ?Ð¾Ñ?Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑ?Ñ?ÐµÐ½Ð¾"
+
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Ð?Ð¸Ð·Ð°Ð¹Ð½ÐµÑ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² gLabels"
+
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
+msgstr ""
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -341,382 +1482,290 @@ msgstr "Ð?_Ñ?Ñ?Ð¾Ð´"
 msgid "Quit the program"
 msgstr "Ð?Ð°Ð²ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ñ? Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð¾Ð¹"
 
-#: ../src/ui.c:180
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ?"
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+#, fuzzy
+msgid "Redo"
+msgstr "Ð?Ñ?Ð°Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Ð?Ñ?Ñ?ÐµÐ·Ð°Ñ?Ñ?"
 
-#: ../src/ui.c:182
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Ð?Ñ?Ñ?ÐµÐ·Ð°Ñ?Ñ? Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ"
 
-#: ../src/ui.c:187
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
-#: ../src/ui.c:189
+#: ../src/ui.c:203
 msgid "Copy the selection"
 msgstr "Ð¡ÐºÐ¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ"
 
-#: ../src/ui.c:194
-msgid "Paste"
-msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ?"
-
-#: ../src/ui.c:196
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¸Ð· Ð±Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../src/ui.c:201
-msgid "Delete"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ?"
-
-#: ../src/ui.c:203
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð²Ñ?Ð±Ñ?Ð°Ð½Ð½Ñ?Ðµ Ð¾Ð±Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/ui.c:208
+#: ../src/ui.c:222
 msgid "Select All"
 msgstr "Ð?Ñ?Ð´ÐµÐ»Ð¸Ñ?Ñ? Ð²Ñ?Ðµ"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:224
 msgid "Select all objects"
 msgstr "Ð?Ñ?Ð´ÐµÐ»Ð¸Ñ?Ñ? Ð²Ñ?Ðµ Ð¾Ð±Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/ui.c:215
+#: ../src/ui.c:229
 msgid "Un-select All"
 msgstr "Ð¡Ð½Ñ?Ñ?Ñ? Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "Ð¡Ð½Ñ?Ñ?Ñ? Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ?Ð¾ Ð²Ñ?ÐµÑ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð¾Ð²"
 
-#: ../src/ui.c:222
+#: ../src/ui.c:236
 msgid "Preferences"
 msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?"
 
-#: ../src/ui.c:224
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ñ?"
 
-#: ../src/ui.c:231
+#: ../src/ui.c:245
 msgid "Zoom in"
 msgstr "Ð?Ñ?Ð¸Ð±Ð»Ð¸Ð·Ð¸Ñ?Ñ?"
 
-#: ../src/ui.c:233
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "Ð£Ð¼ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?Ð°Ð±"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:252
 msgid "Zoom out"
 msgstr "Ð?Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ?"
 
-#: ../src/ui.c:240
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr "Ð£Ð²ÐµÐ»Ð¸Ñ?Ð¸Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?Ð°Ð±"
 
-#: ../src/ui.c:245
+#: ../src/ui.c:259
 msgid "Zoom 1 to 1"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð°Ð± 1:1"
 
-#: ../src/ui.c:247
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?Ð°Ð± 1:1"
 
-#: ../src/ui.c:252
+#: ../src/ui.c:266
 msgid "Zoom to fit"
 msgstr "Ð£Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ñ?ÐµÐ»Ð¸ÐºÐ¾Ð¼ Ð² Ð¾ÐºÐ½Ðµ"
 
-#: ../src/ui.c:254
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¼Ð°Ñ?Ñ?Ñ?Ð°Ð±, Ñ?Ñ?Ð¾Ð±Ñ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ Ð±Ñ?Ð»Ð¾ Ð²Ð¸Ð´Ð½Ð¾ Ð¿Ð¾Ð»Ð½Ð¾Ñ?Ñ?Ñ?Ñ?"
 
-#: ../src/ui.c:261
+#: ../src/ui.c:275
 msgid "Select Mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð²Ñ?Ð±Ð¾Ñ?Ð°"
 
-#: ../src/ui.c:263
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ?, Ð¿ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../src/ui.c:268 ../src/view-text.c:494
-#: ../data/builder/object-editor.glade.h:32
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Ð¢ÐµÐºÑ?Ñ?"
 
-#: ../src/ui.c:270
-msgid "Create text object"
-msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
-
-#: ../src/ui.c:275
+#: ../src/ui.c:289
 msgid "Box"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸Ðº"
 
-#: ../src/ui.c:277
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸Ðº"
 
-#: ../src/ui.c:282 ../data/builder/object-editor.glade.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Ð?Ð±Ð²Ð¾Ð´ÐºÐ°"
 
-#: ../src/ui.c:284
-msgid "Create line object"
-msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?"
-
-#: ../src/ui.c:289
+#: ../src/ui.c:303
 msgid "Ellipse"
 msgstr "ÐÐ»Ð»Ð¸Ð¿Ñ?"
 
-#: ../src/ui.c:291
+#: ../src/ui.c:305
 msgid "Create ellipse/circle object"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð»Ð»Ð¸Ð¿Ñ?/ÐºÑ?Ñ?Ð³"
 
-#: ../src/ui.c:296 ../data/builder/object-editor.glade.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Ð?Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: ../src/ui.c:298
-msgid "Create image object"
-msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ñ?Ð¾Ð²Ð¾Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
-
-#: ../src/ui.c:303
+#: ../src/ui.c:317
 msgid "Barcode"
 msgstr "Ð¨Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
 
-#: ../src/ui.c:305
-msgid "Create barcode object"
-msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
-
-#: ../src/ui.c:310
-msgid "Bring to front"
-msgstr "Ð?Ð° Ð¿ÐµÑ?ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
-
-#: ../src/ui.c:312
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr "Ð?ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? Ð½Ð° Ð¿ÐµÑ?ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
 
-#: ../src/ui.c:317
-msgid "Send to back"
-msgstr "Ð?Ð° Ð·Ð°Ð´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
-
-#: ../src/ui.c:319
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr "Ð?ÐµÑ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? Ð½Ð° Ð·Ð°Ð´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
 
-#: ../src/ui.c:324
-msgid "Rotate left"
-msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð»ÐµÐ²Ð¾"
-
-#: ../src/ui.c:326
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? Ð½Ð° 90 Ð³Ñ?Ð°Ð´Ñ?Ñ?Ð¾Ð² Ð¿Ñ?Ð¾Ñ?Ð¸Ð² Ñ?Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ñ?Ñ?Ñ?ÐµÐ»ÐºÐ¸"
 
-#: ../src/ui.c:331
-msgid "Rotate right"
-msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð¿Ñ?Ð°Ð²Ð¾"
-
-#: ../src/ui.c:333
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? Ð½Ð° 90 Ð³Ñ?Ð°Ð´Ñ?Ñ?Ð¾Ð² Ð¿Ð¾ Ñ?Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ñ?Ñ?Ñ?ÐµÐ»ÐºÐµ"
 
-#: ../src/ui.c:338
-msgid "Flip horizontally"
-msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ð¾"
-
-#: ../src/ui.c:340
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ð¾"
 
-#: ../src/ui.c:345
-msgid "Flip vertically"
-msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ð¾"
-
-#: ../src/ui.c:347
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ? Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ð¾"
 
-#: ../src/ui.c:352
-msgid "Align left"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð»ÐµÐ²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
-
-#: ../src/ui.c:354
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ð»ÐµÐ²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
 
-#: ../src/ui.c:359
-msgid "Align right"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð¿Ñ?Ð°Ð²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
-
-#: ../src/ui.c:361
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ð¿Ñ?Ð°Ð²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
 
-#: ../src/ui.c:366
-msgid "Align horizontal center"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
-
-#: ../src/ui.c:368
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
 
-#: ../src/ui.c:373
-msgid "Align tops"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð½ÐµÐ¼Ñ? ÐºÑ?Ð°Ñ?"
-
-#: ../src/ui.c:375
+#: ../src/ui.c:389
 msgid "Align objects to top edges"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð½Ð¸Ð¼ ÐºÑ?Ð°Ñ?Ð¼"
 
-#: ../src/ui.c:380
-msgid "Align bottoms"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð½Ð¸Ð¶Ð½ÐµÐ¼Ñ? ÐºÑ?Ð°Ñ?"
-
-#: ../src/ui.c:382
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ð½Ð¸Ð¶Ð½Ð¸Ð¼ ÐºÑ?Ð°Ñ?Ð¼"
 
-#: ../src/ui.c:387
-msgid "Align vertical center"
-msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
-
-#: ../src/ui.c:389
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
 
-#: ../src/ui.c:394
-msgid "Center horizontally"
-msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð¸"
-
-#: ../src/ui.c:396
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr "Ð¦ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ñ?ÐµÐ½Ñ?Ñ?Ñ? Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ð¾Ð¹ Ð¼ÐµÑ?ÐºÐ¸"
 
-#: ../src/ui.c:401
-msgid "Center vertically"
-msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð¸"
-
-#: ../src/ui.c:403
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr "Ð¦ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾ Ñ?ÐµÐ½Ñ?Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ð¾Ð¹ Ð¼ÐµÑ?ÐºÐ¸"
 
-#: ../src/ui.c:408
-msgid "Merge properties"
-msgstr "Ð?Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ?Ñ? Ð¿Ð¾Ð»Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
-
-#: ../src/ui.c:410
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð»ÐµÐ¹ Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
 
-#: ../src/ui.c:417
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr "Ð¡Ð¾Ð´ÐµÑ?Ð¶Ð°Ð½Ð¸Ðµ"
 
-#: ../src/ui.c:419
+#: ../src/ui.c:433
 msgid "Open glabels manual"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ? Ð¿Ð¾ gLabels"
 
-#: ../src/ui.c:424
+#: ../src/ui.c:438
 msgid "About..."
 msgstr "Ð? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ðµ..."
 
-#: ../src/ui.c:426
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr "Ð? gLabels"
 
-#: ../src/ui.c:436
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr "Ð?Ð°Ð½ÐµÐ»Ñ? Ñ?Ð²Ð¾Ð¹Ñ?Ñ?Ð²"
 
-#: ../src/ui.c:438
+#: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ñ?Ñ?Ñ? Ð¿Ð°Ð½ÐµÐ»Ð¸ Ñ?Ð²Ð¾Ð¹Ñ?Ñ?Ð² Ð² Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ð¾ÐºÐ½Ðµ"
 
-#: ../src/ui.c:444
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr "Ð¡ÐµÑ?ÐºÐ°"
 
-#: ../src/ui.c:446
+#: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ñ?Ñ?Ñ? Ñ?ÐµÑ?ÐºÐ¸ Ð² Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ð¾ÐºÐ½Ðµ"
 
-#: ../src/ui.c:452
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ?ÐºÐ°"
 
-#: ../src/ui.c:454
+#: ../src/ui.c:468
 msgid "Change the visibility of markup lines in the current window"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ñ?Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ð¸ Ñ?Ð°Ð·Ð¼ÐµÑ?ÐºÐ¸ Ð² Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ð¾ÐºÐ½Ðµ"
 
-#: ../src/ui.c:465
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ñ?Ð²Ð°Ñ?Ñ? Ð¿Ð°Ð½ÐµÐ»Ñ? Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð¾Ð²"
 
-#: ../src/ui.c:467
+#: ../src/ui.c:481
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ñ?Ñ?Ñ? Ð³Ð»Ð°Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð¾Ð² Ð² Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ð¾ÐºÐ½Ðµ"
 
-#: ../src/ui.c:473
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr "Ð?Ð°Ð½ÐµÐ»Ñ? Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../src/ui.c:475
+#: ../src/ui.c:489
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ð¸Ð¼Ð¾Ñ?Ñ?Ñ? Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½Ñ?Ñ?Ñ?Ñ?Ð¼ÐµÐ½Ñ?Ð¾Ð² Ð´Ð»Ñ? Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð² Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ð¾ÐºÐ½Ðµ"
 
-#: ../src/ui-property-bar.c:279 ../src/prefs-dialog.c:328
-#: ../src/object-editor-bc-page.c:93 ../src/object-editor-text-page.c:93
-#: ../src/object-editor-shadow-page.c:93
-msgid "Default"
-msgstr "Ð?Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
-
-#: ../src/ui-property-bar.c:291 ../src/prefs-dialog.c:334
-#: ../src/object-editor-fill-page.c:79
-msgid "No Fill"
-msgstr "Ð?ÐµÐ· Ð·Ð°Ð»Ð¸Ð²ÐºÐ¸"
-
-#: ../src/ui-property-bar.c:303 ../src/prefs-dialog.c:331
-#: ../src/object-editor-line-page.c:81
-msgid "No Line"
-msgstr "Ð?ÐµÐ· Ð¾Ð±Ð²Ð¾Ð´ÐºÐ¸"
-
-#: ../src/ui-sidebar.c:152
-msgid "Object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð°"
-
-#: ../src/ui-commands.c:1064
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "Ð? Ñ?Ð°Ð·Ñ?Ð°Ð±Ð¾Ñ?ÐºÐµ gLabels Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ð²Ð¾Ð²Ð°Ð»Ð¸:"
 
-#: ../src/ui-commands.c:1070
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 "Ð?Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð°Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾Ð± Ñ?Ñ?Ð°Ñ?Ñ?Ð½Ð¸ÐºÐ°Ñ?\n"
 "Ð¸Ð·Ð»Ð¾Ð¶ÐµÐ½Ð° Ð² Ñ?Ð°Ð¹Ð»Ðµ AUTHORS, Ð° Ñ?Ð°ÐºÐ¶Ðµ"
 
-#: ../src/ui-commands.c:1071
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
 msgstr "Ð½Ð° Ñ?Ð°Ð¹Ñ?Ðµ http://glabels.sourceforge.net/";
 
-#: ../src/ui-commands.c:1083
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr "Ð?Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð° Ð´Ð»Ñ? Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ð² Ð¸ Ð²Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐµÐº.\n"
 
-#: ../src/ui-commands.c:1087
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr ""
 "Ð?Ð¸Ñ?Ð°Ð»Ð¸Ð¹ Ð?Ð¸Ð¿Ð°Ñ?Ð¾Ð² <lav altlinux ru>, 2002-2005\n"
 "Ð?Ð»ÐµÐºÑ?Ð°Ð½Ð´Ñ? Ð?Ñ?Ð¾ÐºÑ?Ð´Ð¸Ð½ <alexandre prokoudine gmail com>, 2008"
 
-#: ../src/ui-commands.c:1090
+#: ../src/ui-commands.c:1161
+#, fuzzy
 msgid ""
-"Glabels is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
-"the GNU General Public License for more details.\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 msgstr ""
 "Glabels Ñ?Ð²Ð»Ñ?ÐµÑ?Ñ?Ñ? Ñ?Ð²Ð¾Ð±Ð¾Ð´Ð½Ñ?Ð¼ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð½Ñ?Ð¼ Ð¾Ð±ÐµÑ?Ð¿ÐµÑ?ÐµÐ½Ð¸ÐµÐ¼;\n"
 "Ð²Ñ? Ð²Ð¿Ñ?Ð°Ð²Ðµ Ñ?Ð°Ñ?Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ñ? ÐµÑ? Ð¸/Ð¸Ð»Ð¸ Ð¼Ð¾Ð´Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð² Ñ?Ð¾Ð¾Ñ?Ð²ÐµÑ?Ñ?Ñ?Ð²Ð¸Ð¸\n"
@@ -731,746 +1780,170 @@ msgstr ""
 "Ð¦Ð?Ð?Ð¯Ð¥. Ð?Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾Ð¹ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ñ?Ñ?ÐµÑ?Ñ?\n"
 "Ñ?Ð¾ Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¾Ð¹ Ð?Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½Ð½Ð¾Ð¹ Ð?Ð¸Ñ?ÐµÐ½Ð·Ð¸ÐµÐ¹ GNU.\n"
 
-#: ../src/ui-commands.c:1116
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "glabels"
 
-#: ../src/file.c:91
-msgid "New Label or Card"
-msgstr "Ð?Ð¾Ð²Ð°Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ° Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ°"
-
-#: ../src/file.c:191
-msgid "Label properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
-
-#: ../src/file.c:292 ../src/file.c:578
-msgid "All files"
-msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
-
-#: ../src/file.c:297 ../src/file.c:583
-msgid "gLabels documents"
-msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ñ? gLabels"
-
-#: ../src/file.c:343 ../src/file.c:640
-msgid "Empty file name selection"
-msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ Ð²Ñ?Ð±Ð¾Ñ? Ñ?Ð°Ð¹Ð»Ð°"
-
-#: ../src/file.c:346 ../src/file.c:362
-msgid "Please select a file or supply a valid file name"
-msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð²Ð²ÐµÐ´Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
-
-#: ../src/file.c:359
-msgid "File does not exist"
-msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
-
-#: ../src/file.c:433
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð»  \"%s\""
-
-#: ../src/file.c:436
-msgid "Not a supported file format"
-msgstr "Ð¤Ð°Ð¹Ð» Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð°"
-
-#: ../src/file.c:513 ../src/file.c:690
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\""
-
-#: ../src/file.c:517 ../src/file.c:694
-msgid "Error encountered during save.  The file is still not saved."
-msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Ñ?Ð°Ð¹Ð»Ð°.  Ð¤Ð°Ð¹Ð» Ð²Ñ?Ñ? ÐµÑ?Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ð½."
-
-#: ../src/file.c:556
-#, c-format
-msgid "Save \"%s\" as"
-msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? \"%s\" ÐºÐ°Ðº"
-
-#: ../src/file.c:643
-msgid "Please supply a valid file name"
-msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° gLabels!"
 
-#: ../src/file.c:664
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ð¸Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\"?"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(Ð½ÐµÑ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ? Ð¼Ð°ÐºÐµÑ?Ð¾Ð²) - gLabels"
 
-#: ../src/file.c:668
-msgid "File already exists."
-msgstr "Ð¤Ð°Ð¹Ð» Ñ?Ð¶Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?."
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾)"
 
-#: ../src/file.c:764
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð² Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ðµ \"%s\" Ð¿ÐµÑ?ÐµÐ´ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð¸ÐµÐ¼?"
-
-#: ../src/file.c:768
-msgid "Your changes will be lost if you don't save them."
-msgstr "Ð?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð´Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÑ?Ñ?Ð½Ñ?, ÐµÑ?Ð»Ð¸ Ð²Ñ? Ð¸Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ."
-
-#: ../src/file.c:771
-msgid "Close without saving"
-msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ? Ð±ÐµÐ· Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ?"
-
-#. Should not happen
-#: ../src/prefs.c:159 ../src/prefs.c:166
-#: ../data/builder/object-editor.glade.h:43
-#: ../data/builder/prefs-dialog.glade.h:22
-msgid "points"
-msgstr "Ð¿Ñ?Ð½ÐºÑ?Ð¾Ð²"
-
-#: ../src/prefs.c:161 ../data/builder/object-editor.glade.h:42
-#: ../data/builder/template-designer.glade.h:64
-msgid "inches"
-msgstr "Ð´Ñ?Ð¹Ð¼Ð¾Ð²"
-
-#: ../src/prefs.c:163
-msgid "mm"
-msgstr "Ð¼Ð¼"
-
-#: ../src/prefs-dialog.c:167 ../data/builder/prefs-dialog.glade.h:21
-msgid "gLabels Preferences"
-msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? gLabels"
-
-#. Build editor.
-#: ../src/view-box.c:175
-msgid "Box object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ°"
-
-#. Build editor.
-#: ../src/view-ellipse.c:175
-msgid "Ellipse object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?Ð»Ð»Ð¸Ð¿Ñ?Ð°"
-
-#. Build editor.
-#: ../src/view-line.c:174
-msgid "Line object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð¾ Ð»Ð¸Ð½Ð¸Ð¸"
-
-#. Build editor.
-#: ../src/view-image.c:174
-msgid "Image object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
-
-#. Build editor.
-#: ../src/view-text.c:178
-msgid "Text object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?ÐµÐºÑ?Ñ?Ð°"
-
-#. Build editor.
-#: ../src/view-barcode.c:174
-msgid "Barcode object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ñ?Ð¸Ð¿Ð° Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
-
-#: ../src/object-editor-image-page.c:267
-msgid "All Files"
-msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
-
-#: ../src/object-editor-image-page.c:272
-msgid "All Images"
-msgstr "Ð?Ñ?Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
+msgid "Bad root node = \"%s\""
+msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ ÐºÐ¾Ñ?Ð½ÐµÐ²Ð¾Ð¹ Ñ?Ð·ÐµÐ» = \"%s\""
 
-#: ../src/object-editor-image-page.c:287
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/merge-properties-dialog.c:271
-msgid "Merge Properties"
-msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
-
-#: ../src/merge-properties-dialog.c:297 ../src/merge-properties-dialog.c:405
-msgid "Select merge-database source"
-msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð´Ð°Ð½Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
-
-#: ../src/merge-properties-dialog.c:306 ../src/merge-properties-dialog.c:425
-msgid "N/A"
-msgstr "Ð?/Ð?"
-
-#: ../src/merge-properties-dialog.c:332
-msgid "Select"
-msgstr "Ð?Ñ?Ð±Ñ?Ð°Ð½Ð¾"
-
-#: ../src/merge-properties-dialog.c:340
-msgid "Record/Field"
-msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ñ?/Ð?Ð¾Ð»Ðµ"
-
-#: ../src/merge-properties-dialog.c:348
-#: ../data/builder/object-editor.glade.h:10
-msgid "Data"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ"
-
-#: ../src/merge-properties-dialog.c:418
-msgid "Fixed"
-msgstr ""
-
-#. ===================================================================
-#: ../src/print-op.c:242 ../src/wdgt-print-copies.c:171
-#: ../data/templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸"
-
-#: ../src/template-designer.c:411
-msgid "gLabels Template Designer"
-msgstr "Ð?Ð¸Ð·Ð°Ð¹Ð½ÐµÑ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² gLabels"
-
-#: ../src/template-designer.c:481
-msgid "Welcome"
-msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ?"
-
-#: ../src/template-designer.c:534
-msgid "Name and Description"
-msgstr "Ð?Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¸ Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ"
-
-#: ../src/template-designer.c:595
-msgid "Page Size"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
-
-#: ../src/template-designer.c:675
-msgid "Label or Card Shape"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ¸"
-
-#: ../src/template-designer.c:735
-#, fuzzy
-msgid "Label or Card Size"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ¸"
-
-#: ../src/template-designer.c:844
-#, fuzzy
-msgid "Label Size (round)"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ð¼ÐµÑ?ÐºÐ¸ (Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?)"
-
-#: ../src/template-designer.c:935
-msgid "Label Size (CD/DVD)"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ð¼ÐµÑ?ÐºÐ¸ (CD/DVD)"
-
-#: ../src/template-designer.c:1036
-msgid "Number of Layouts"
-msgstr "Ð?Ð¾Ð»Ð¸Ñ?ÐµÑ?Ñ?Ð²Ð¾ Ñ?Ð¾Ñ?Ð¼"
-
-#: ../src/template-designer.c:1110
-msgid "Layout(s)"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ñ?"
-
-#: ../src/template-designer.c:1229
-msgid "Design Completed"
-msgstr "Ð?Ñ?Ð¾Ñ?Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑ?Ñ?ÐµÐ½Ð¾"
-
-#: ../src/template-designer.c:1396
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
-msgstr ""
-
-#: ../src/bc.c:68
-msgid "POSTNET (any)"
-msgstr "POSTNET (Ð»Ñ?Ð±Ð¾Ð¹)"
-
-#: ../src/bc.c:71
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ð¸Ð½Ð´ÐµÐºÑ?)"
-
-#: ../src/bc.c:74
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP+4)"
-
-#: ../src/bc.c:77
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
-
-#: ../src/bc.c:80
-msgid "CEPNET"
-msgstr "CEPNET"
-
-#: ../src/bc.c:83
-msgid "EAN (any)"
-msgstr "EAN (Ð»Ñ?Ð±Ð¾Ð¹)"
-
-#: ../src/bc.c:86
-msgid "EAN-8"
-msgstr "EAN-8"
-
-#: ../src/bc.c:89
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
-
-#: ../src/bc.c:92
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
-
-#: ../src/bc.c:95
-msgid "EAN-13"
-msgstr "EAN-13"
-
-#: ../src/bc.c:98
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
-
-#: ../src/bc.c:101
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
-
-#: ../src/bc.c:104
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A or UPC-E)"
-
-#: ../src/bc.c:107
-msgid "UPC-A"
-msgstr "UPC-A"
-
-#: ../src/bc.c:110
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
-
-#: ../src/bc.c:113
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
-
-#: ../src/bc.c:116
-msgid "UPC-E"
-msgstr "UPC-E"
-
-#: ../src/bc.c:119
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
-
-#: ../src/bc.c:122
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
-
-#: ../src/bc.c:125
-msgid "ISBN"
-msgstr "ISBN"
-
-#: ../src/bc.c:128
-msgid "ISBN +5"
-msgstr "ISBN +5"
-
-#: ../src/bc.c:131
-msgid "Code 39"
-msgstr "Code 39"
-
-#: ../src/bc.c:134
-msgid "Code 128"
-msgstr "Code 128"
-
-#: ../src/bc.c:137
-msgid "Code 128C"
-msgstr "Code 128C"
-
-#: ../src/bc.c:140
-msgid "Code 128B"
-msgstr "Code 128B"
-
-#: ../src/bc.c:143
-msgid "Interleaved 2 of 5"
-msgstr "Interleaved 2 of 5"
-
-#: ../src/bc.c:146
-msgid "Codabar"
-msgstr "Codabar"
-
-#: ../src/bc.c:149
-msgid "MSI"
-msgstr "MSI"
-
-#: ../src/bc.c:152
-msgid "Plessey"
-msgstr "Plessey"
-
-#: ../src/bc.c:155
-msgid "IEC16022 (DataMatrix)"
-msgstr "IEC16022 (DataMatrix)"
-
-#: ../src/bc.c:158
-msgid "IEC18004 (QRCode)"
-msgstr "IEC18004 (QRCode)"
-
-#: ../src/label.c:531
-msgid "Untitled"
-msgstr "Ð?ÐµÐ· Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ?"
-
-#: ../src/label-barcode.c:426
-msgid "Barcode data empty"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´Ð° Ð½Ðµ Ð²Ð²ÐµÐ´ÐµÐ½Ñ?"
-
-#: ../src/label-barcode.c:430
-msgid "Invalid barcode data"
-msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´Ð°"
+msgid "bad node =  \"%s\""
+msgstr "Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» =  \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:226
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð°Ð·Ð±Ð¾Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ð° XML"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Ð?ÐµÑ? ÐºÐ¾Ñ?Ð½Ñ? Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ? Ð¸Ð¼Ð¿Ð¾Ñ?Ñ? Ð¸Ð· Ñ?Ð°Ð¹Ð»Ð° gLabels Ð²ÐµÑ?Ñ?Ð¸Ð¸ 0.1"
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ? Ð¸Ð¼Ð¿Ð¾Ñ?Ñ? Ð¸Ð· Ñ?Ð°Ð¹Ð»Ð° gLabels Ð²ÐµÑ?Ñ?Ð¸Ð¸ 0.4"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:301
 #, fuzzy, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ? Ð½ÐµÐ²ÐµÑ?Ð½Ð¾Ð³Ð¾ Ñ?Ð¸Ð¿Ð°, Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾Ðµ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ð¸Ð¼Ñ?Ð½ glabels"
 
-#: ../src/xml-label.c:319 ../src/xml-label-04.c:79
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ ÐºÐ¾Ñ?Ð½ÐµÐ²Ð¾Ð¹ Ñ?Ð·ÐµÐ» = \"%s\""
-
-#: ../src/xml-label.c:356
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» Ð² Ñ?Ð·Ð»Ðµ Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°=  \"%s\""
 
-#: ../src/xml-label.c:401 ../src/xml-label-04.c:127
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» =  \"%s\""
-
-#: ../src/xml-label.c:840
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» Ð² Ñ?Ð·Ð»Ðµ Ð´Ð°Ð½Ð½Ñ?Ñ?=  \"%s\""
 
-#: ../src/xml-label.c:1077 ../libglabels/xml-template.c:670
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ \"%s\""
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?ÐµÐ¾Ð±Ñ?Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? UTF8."
 
-#: ../src/xml-label.c:1084
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "Ð?ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ¸ Ð¿Ñ?Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Ñ?Ð°Ð¹Ð»Ð° XML."
 
-#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378
-msgid "None"
-msgstr "Ð?ÐµÑ?"
-
-#: ../src/merge-init.c:59
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ð·Ð°Ð¿Ñ?Ñ?Ð°Ñ?Â» (CSV)"
-
-#: ../src/merge-init.c:66
-msgid "Text file with colon delimeters"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ð´Ð²Ð¾ÐµÑ?Ð¾Ñ?Ð¸ÐµÂ»"
-
-#: ../src/merge-init.c:73
-msgid "Text file with tab delimeters"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ñ?Ð¸Ð¼Ð²Ð¾Ð» Ñ?Ð°Ð±Ñ?Ð»Ñ?Ñ?Ð¸Ð¸Â»"
-
-#: ../src/merge-init.c:82
-msgid "Data from default Evolution Addressbook"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð· Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÐ¼Ð¾Ð¹ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸ Evolution"
-
-#: ../src/merge-init.c:88
-msgid "Data from a file containing VCards"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð· Ñ?Ð°Ð¹Ð»Ð°, Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð°Ñ?ÐµÐ³Ð¾ VCard"
-
-#: ../src/merge-evolution.c:309
-msgid "Couldn't construct query"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?."
-
-#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326
-msgid "Couldn't open addressbook."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ñ?Ñ? ÐºÐ½Ð¸Ð³Ñ?."
-
-#: ../src/merge-evolution.c:341
-msgid "Couldn't list available fields."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÑ?Ð¸Ñ?Ð»Ð¸Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ðµ Ð¿Ð¾Ð»Ñ?."
-
-#: ../src/merge-evolution.c:377
-msgid "Couldn't get contacts."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ."
-
-#: ../src/color-combo.c:210
-msgid "Default Color"
-msgstr "Ð¦Ð²ÐµÑ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
-
-#: ../src/color-combo-menu.c:86
-msgid "Dark Red"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-ÐºÑ?Ð°Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:87
-msgid "Brown"
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½ÐµÐ²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:88
-msgid "Dark Goldenrod"
-msgstr "Ð¢ÐµÐ¼Ð½Ñ?Ð¹ Ð·Ð¾Ð»Ð¾Ñ?Ð°Ñ?Ð½Ð¸Ðº"
-
-#: ../src/color-combo-menu.c:89
-msgid "Dark Green"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:90
-msgid "Dark Cyan"
-msgstr "Ð¢ÐµÐ¼Ð½Ð¾-Ñ?Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:91
-msgid "Navy Blue"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ñ?Ð¸Ð½Ð¸Ð¹"
-
-#: ../src/color-combo-menu.c:92
-msgid "Dark Violet"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ñ?Ð¸Ð¾Ð»ÐµÑ?Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:94
-msgid "Red"
-msgstr "Ð?Ñ?Ð°Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:95
-msgid "Orange"
-msgstr "Ð?Ñ?Ð°Ð½Ð¶ÐµÐ²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:96
-msgid "Dark Yellow"
-msgstr "Ð¢ÐµÐ¼Ð½Ð¾-Ð¶ÐµÐ»Ñ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:97
-msgid "Medium green"
-msgstr "Ð¢Ñ?Ñ?ÐºÐ»Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:98
-msgid "Turquoise"
-msgstr "Ð?Ð¸Ñ?Ñ?Ð·Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:99
-msgid "Blue"
-msgstr "Ð¡Ð¸Ð½Ð¸Ð¹"
-
-#: ../src/color-combo-menu.c:100
-msgid "Purple"
-msgstr "Ð?Ñ?Ñ?Ð¿Ñ?Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:102
-msgid "Salmon"
-msgstr "Ð¡Ð¾Ð¼Ð¾Ð½"
-
-#: ../src/color-combo-menu.c:103
-msgid "Gold"
-msgstr "Ð?Ð¾Ð»Ð¾Ñ?Ð¾Ð¹"
-
-#: ../src/color-combo-menu.c:104
-msgid "Yellow"
-msgstr "Ð?Ñ?Ð»Ñ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:105
-msgid "Green"
-msgstr "Ð?ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:106
-msgid "Cyan"
-msgstr "Ð¦Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:107
-msgid "SkyBlue"
-msgstr "Ð?ÐµÐ±ÐµÑ?Ð½Ð¾-Ñ?Ð¸Ð½Ð¸Ð¹"
-
-#: ../src/color-combo-menu.c:108
-msgid "Violet"
-msgstr "Ð¤Ð¸Ð¾Ð»ÐµÑ?Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:110
-msgid "Pink"
-msgstr "Ð Ð¾Ð·Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:111
-msgid "Khaki"
-msgstr "Ð¥Ð°ÐºÐ¸"
-
-#: ../src/color-combo-menu.c:112
-msgid "Light Yellow"
-msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð¶Ñ?Ð»Ñ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:113
-msgid "Light Green"
-msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:114
-msgid "Light Cyan"
-msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ñ?Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:115
-msgid "Slate Gray"
-msgstr "Ð?Ñ?Ð¿Ð¸Ð´Ð½Ð¾-Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:116
-msgid "Thistle"
-msgstr "Ð§ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ñ?"
-
-#: ../src/color-combo-menu.c:118
-msgid "White"
-msgstr "Ð?ÐµÐ»Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:119
-#, c-format
-msgid "10% Gray"
-msgstr "10% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:120
-#, c-format
-msgid "25% Gray"
-msgstr "25% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:121
-#, c-format
-msgid "40% Gray"
-msgstr "40% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:122
-#, c-format
-msgid "50% Gray"
-msgstr "50% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:123
-#, c-format
-msgid "60% Gray"
-msgstr "60% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:124
-msgid "Black"
-msgstr "Ð§Ñ?Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:252 ../src/color-combo-menu.c:369
-msgid "Custom Color"
-msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ?:"
-
-#: ../src/color-combo-menu.c:317
-#, c-format
-msgid "Custom Color #%u"
-msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ? #%u"
-
-#: ../src/wdgt-print-copies.c:153
-msgid "Sheets:"
-msgstr "Ð?Ð¸Ñ?Ñ?Ð¾Ð²:"
-
-#: ../src/wdgt-print-copies.c:173
-msgid "from:"
-msgstr "Ñ?:"
-
-#: ../src/wdgt-print-copies.c:179
-msgid "to:"
-msgstr "Ð¿Ð¾:"
-
-#: ../src/wdgt-print-merge.c:154
-msgid "Start on label"
-msgstr "Ð?Ð°Ñ?Ð°Ñ?Ñ? Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
-
-#: ../src/wdgt-print-merge.c:161
-msgid "on 1st sheet"
-msgstr "Ð½Ð° Ð¿ÐµÑ?Ð²Ð¾Ð¼ Ð»Ð¸Ñ?Ñ?Ðµ"
-
-#: ../src/wdgt-print-merge.c:170
-msgid "Copies:"
-msgstr "Ð?Ð¾Ð¿Ð¸Ð¹:"
-
-#: ../src/wdgt-print-merge.c:176
-msgid "Collate"
-msgstr "Ð¡Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ñ?"
-
-#: ../src/wdgt-media-select.c:290 ../src/wdgt-media-select.c:294
-#: ../src/wdgt-media-select.c:299 ../src/wdgt-media-select.c:308
-#: ../src/wdgt-media-select.c:311 ../src/wdgt-media-select.c:404
-#: ../src/wdgt-media-select.c:611 ../src/wdgt-media-select.c:620
-msgid "Any"
-msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
-
-#: ../src/wdgt-media-select.c:645
-#, c-format
-msgid "%d per sheet"
-msgstr "%d Ð½Ð° Ð»Ð¸Ñ?Ñ?"
-
-#: ../src/wdgt-media-select.c:675
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-#: ../src/wdgt-media-select.c:680
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-#: ../src/wdgt-media-select.c:691 ../src/wdgt-media-select.c:705
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?"
-
-#: ../src/wdgt-media-select.c:695 ../src/wdgt-media-select.c:709
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?"
-
-#: ../src/wdgt-media-select.c:783
-msgid "No recent templates found."
-msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°Ð²Ñ?Ð¸Ñ?Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¾."
-
-#: ../src/wdgt-media-select.c:784
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½ Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐµ Â«Ð?Ð¾Ð¸Ñ?Ðº Ð¿Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°Ð¼Â»."
-
-#: ../src/wdgt-media-select.c:863
-msgid "No match."
-msgstr "Ð?ÐµÑ? Ñ?Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹."
-
-#: ../src/wdgt-media-select.c:864
-msgid "Try selecting a different brand, page size or category."
-msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ñ?Ñ? Ð¼Ð°Ñ?ÐºÑ?, Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
-
-#: ../src/wdgt-rotate-label.c:129
-msgid "Normal"
-msgstr "Ð?Ð±Ñ?Ñ?Ð½Ð¾Ðµ"
-
-#: ../src/wdgt-rotate-label.c:130
-msgid "Rotated"
-msgstr "Ð¡ Ð¿Ð¾Ð²Ð¾Ñ?Ð¾Ñ?Ð¾Ð¼"
-
-#: ../src/critical-error-handler.c:73
-msgid "gLabels Fatal Error!"
-msgstr "Ð¤Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ° gLabels!"
-
-#: ../src/warning-handler.c:73
-msgid "gLabels Error!"
-msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° gLabels!"
-
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:118
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¾Ð¹"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:131
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "Ð?Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¾ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¼"
 
-#: ../libglabels/db.c:482
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1538
+#: ../libglabels/db.c:2164
 #, fuzzy, c-format
-msgid "Generic %s full page template"
+msgid "%s full page label"
 msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð°Ñ? %s Ð¿Ð¾Ð»Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°"
 
-#: ../libglabels/xml-template.c:227
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d (%d Ð½Ð° Ð»Ð¸Ñ?Ñ?)"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr "%d Ð½Ð° Ð»Ð¸Ñ?Ñ?"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "Ð¿Ñ?Ð½ÐºÑ?Ð¾Ð²"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "Ð´Ñ?Ð¹Ð¼Ð¾Ð²"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "Ð¼Ð¼"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
+
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr ""
 
@@ -1487,390 +1960,403 @@ msgstr ""
 msgid "Unknown page size id or name \"%s\""
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ \"%s\""
 
-#: ../libglabels/xml-template.c:615
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
+
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 
-#: ../libglabels/xml-template.c:625
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr "Ð?Ñ?Ñ?Ð¸Ð±Ñ?Ñ? Ð¸Ð¼ÐµÐ½Ð¸ Ñ?Ð°ÐºÐ¶Ðµ Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ñ?ÐµÑ?."
 
-#: ../data/builder/merge-properties-dialog.glade.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>Ð?Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ? Ð¸ Ð²Ñ?Ð±Ð¾Ñ? Ð·Ð°Ð¿Ð¸Ñ?ÐµÐ¹</b>"
-
-#: ../data/builder/merge-properties-dialog.glade.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Ð?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº</b>"
-
-#: ../data/builder/merge-properties-dialog.glade.h:3
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "Ð Ð°Ñ?Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>Ð?Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ? Ð¸ Ð²Ñ?Ð±Ð¾Ñ? Ð·Ð°Ð¿Ð¸Ñ?ÐµÐ¹</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Ð?Ñ?Ð´ÐµÐ»Ð¸Ñ?Ñ? Ð²Ñ?Ñ?"
 
-#: ../data/builder/merge-properties-dialog.glade.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Ð?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Ð¡Ð½Ñ?Ñ?Ñ? Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ"
 
-#: ../data/builder/merge-properties-dialog.glade.h:7
-#: ../data/builder/object-editor.glade.h:39
-msgid "dialog1"
-msgstr "dialog1"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr "Ð?Ð°Ñ?ÐºÐ°:"
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "Ð²Ñ?Ð±Ð¾Ñ?Ð¾Ñ?Ð½Ð¾"
+
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?:"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Ð?Ñ?Ð´ÐµÐ»Ð¸Ñ?Ñ? Ð²Ñ?Ñ?"
+
+#: ../data/ui/new-label-dialog.ui.h:1
+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:27
+msgid "Description:"
+msgstr "Ð?Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ:"
 
-#: ../data/builder/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>Ð Ð°Ñ?Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸</b>"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?:"
 
-#: ../data/builder/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>Ð¢Ð¸Ð¿ Ð½Ð¾Ñ?Ð¸Ñ?ÐµÐ»Ñ?</b>"
+#: ../data/ui/new-label-dialog.ui.h:5
+msgid "Normal"
+msgstr "Ð?Ð±Ñ?Ñ?Ð½Ð¾Ðµ"
 
-#: ../data/builder/object-editor.glade.h:2
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "Ð§Ð°Ñ?Ñ?Ñ? â??:"
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+msgid "Rotated"
+msgstr "Ð¡ Ð¿Ð¾Ð²Ð¾Ñ?Ð¾Ñ?Ð¾Ð¼"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:2
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/builder/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/builder/object-editor.glade.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Xxx Ñ?Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð°</span>"
-
-#: ../data/builder/object-editor.glade.h:5
-#: ../data/builder/prefs-dialog.glade.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐºÐ°:"
 
-#: ../data/builder/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "Ð?Ñ?Ð¸ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¸ Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸ Ñ?ÐµÐºÑ?Ñ? Ð¾Ð±Ñ?ÐµÐ·Ð°ÐµÐ¼"
 
-#: ../data/builder/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Ð£Ð³Ð¾Ð»:"
 
-#: ../data/builder/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Ð?Ð¾Ð½Ñ?Ñ?Ð¾Ð»Ñ?Ð½Ð°Ñ? Ñ?Ñ?Ð¼Ð¼Ð°"
 
-#: ../data/builder/object-editor.glade.h:9
-#: ../data/builder/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "Ð¦Ð²ÐµÑ?:"
 
-#: ../data/builder/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ñ?ÐµÐ½Ñ?"
 
-#: ../data/builder/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Ð¡ÐµÐ¼ÐµÐ¹Ñ?Ñ?Ð²Ð¾:"
 
-#: ../data/builder/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Ð¤Ð°Ð¹Ð»:"
 
-#: ../data/builder/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "Ð?Ð°Ð»Ð¸Ð²ÐºÐ°"
 
-#: ../data/builder/object-editor.glade.h:15
-#: ../data/builder/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Ð?Ñ?Ñ?Ð¾Ñ?Ð°:"
 
-#: ../data/builder/object-editor.glade.h:17
-msgid "Insert merge field"
-msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ð¾Ðµ Ð¿Ð¾Ð»Ðµ"
-
-#: ../data/builder/object-editor.glade.h:18
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "Ð?Ð»Ñ?Ñ?:"
 
-#: ../data/builder/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "Ð?Ð»Ð¸Ð½Ð°:"
 
-#: ../data/builder/object-editor.glade.h:21
-#: ../data/builder/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "Ð?ÐµÐ¶Ð´Ñ? Ñ?Ñ?Ñ?Ð¾Ðº:"
 
-#: ../data/builder/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "Ð?Ð¾Ð´:"
 
-#: ../data/builder/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "Ð?ÐµÐ¿Ñ?Ð¾Ð·Ñ?Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?:"
 
-#: ../data/builder/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Ð Ð°Ñ?Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: ../data/builder/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
 
-#: ../data/builder/object-editor.glade.h:26
-msgid "Select A File"
-msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð»"
-
-#: ../data/builder/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Ð¢ÐµÐ½Ñ?"
 
-#: ../data/builder/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ?"
 
-#: ../data/builder/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ?:"
 
-#: ../data/builder/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Ð¡Ñ?Ð¸Ð»Ñ?"
 
-#: ../data/builder/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Ð¡Ñ?Ð¸Ð»Ñ?:"
 
-#: ../data/builder/object-editor.glade.h:33
-#: ../data/builder/prefs-dialog.glade.h:20
-#: ../data/builder/template-designer.glade.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð°:"
 
-#: ../data/builder/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "Ð¡Ð¼ÐµÑ?ÐµÐ½Ð¸Ðµ Ð¿Ð¾ X:"
 
-#: ../data/builder/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "Ð¡Ð¼ÐµÑ?ÐµÐ½Ð¸Ðµ Ð¿Ð¾ Y:"
 
-#: ../data/builder/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "Ð³Ñ?Ð°Ð´Ñ?Ñ?Ð¾Ð²"
 
-#: ../data/builder/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:35
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "Ð¦Ð¸Ñ?Ñ?:"
 
-#: ../data/builder/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?:"
 
-#: ../data/builder/prefs-dialog.glade.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/builder/prefs-dialog.glade.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Ð Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Ð?Ð°Ð»Ð¸Ð²ÐºÐ°</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Ð?Ð±Ð²Ð¾Ð´ÐºÐ°</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Ð¢ÐµÐºÑ?Ñ?</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Ð?Ð´Ð¸Ð½Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð¸Ñ?</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "Ð¨Ñ?Ð¸Ñ?Ñ?:"
 
-#: ../data/builder/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/builder/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Ð?Ñ?Ð¹Ð¼Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "Ð?ÐµÑ?Ñ?Ð½Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "Ð?Ð¸Ð»Ð»Ð¸Ð¼ÐµÑ?Ñ?Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð¾Ð² Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Ð?Ñ?Ð½ÐºÑ?Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÐ¼Ñ?Ðµ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ñ?Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð½Ð¾Ð²Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð¾Ð² "
 
-#: ../data/builder/prefs-dialog.glade.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ?Ðµ Ð¼ÐµÑ?Ñ?Ð½Ñ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?"
 
-#. Most popular (at top of list)
-#: ../data/builder/prefs-dialog.glade.h:19
-#: ../data/templates/paper-sizes.xml.h:29
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
-#: ../data/builder/print-custom-widget.glade.h:1
-msgid "<b>Options</b>"
-msgstr "<b>Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?</b>"
-
-#: ../data/builder/print-custom-widget.glade.h:2
-msgid "<b>Print control (Merge)</b>"
-msgstr "<b>Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿ÐµÑ?Ð°Ñ?Ñ?Ñ? (Ð¾Ð±Ñ?ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ)</b>"
-
-#: ../data/builder/print-custom-widget.glade.h:3
-msgid "<b>Print control (Simple)</b>"
-msgstr "<b>Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿ÐµÑ?Ð°Ñ?Ñ?Ñ? (Ð¿Ñ?Ð¾Ñ?Ñ?Ð°Ñ?)</b>"
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Ð?ÐµÐ· Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ?"
 
-#: ../data/builder/property-bar.glade.h:1
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Ð?Ð¸Ñ?Ð½Ñ?Ð¹"
 
-#: ../data/builder/property-bar.glade.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ñ?ÐµÐ½Ñ?Ñ?Ñ?"
 
-#: ../data/builder/property-bar.glade.h:4
-msgid "Font family"
-msgstr "Ð?Ð°Ñ?Ð½Ð¸Ñ?Ñ?Ñ?Ð°"
-
-#: ../data/builder/property-bar.glade.h:5
-msgid "Font size"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ð¸Ñ?Ñ?Ð°"
-
-#: ../data/builder/property-bar.glade.h:6
-msgid "Italic"
-msgstr "Ð?Ñ?Ñ?Ñ?Ð¸Ð²"
-
-#: ../data/builder/property-bar.glade.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ñ?Ð»ÐµÐ²Ð°"
 
-#: ../data/builder/property-bar.glade.h:9
-msgid "Line width"
-msgstr "Ð¢Ð¾Ð»Ñ?Ð¸Ð½Ð° Ð»Ð¸Ð½Ð¸Ð¸"
-
-#: ../data/builder/property-bar.glade.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ñ?Ð¿Ñ?Ð°Ð²Ð°"
 
-#: ../data/builder/property-bar.glade.h:11
-msgid "Text Color"
-msgstr "Ð¦Ð²ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
-
-#: ../data/builder/template-designer.glade.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(Ð½Ð°Ð¿Ñ?Ð¸Ð¼ÐµÑ?, Â«Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸,Â» Â«Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸,Â» ...)"
 
-#: ../data/builder/template-designer.glade.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(Ð½Ð°Ð¿Ñ?Ð¸Ð¼ÐµÑ?, 8163A)"
 
-#: ../data/builder/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(Ð½Ð°Ð¿Ñ?Ð¸Ð¼ÐµÑ?, Avery, Acme, ...)"
 
-#: ../data/builder/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. Ð?Ð°Ñ?Ñ?Ð¶Ð½Ñ?Ð¹ Ñ?Ð°Ð´Ð¸Ñ?Ñ?:"
 
-#: ../data/builder/template-designer.glade.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. Ð Ð°Ð´Ð¸Ñ?Ñ?:"
 
-#: ../data/builder/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Ð¨Ð¸Ñ?Ð¸Ð½Ð°:"
 
-#: ../data/builder/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. Ð?Ñ?Ñ?Ð¾Ñ?Ð°:"
 
-#: ../data/builder/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. Ð?Ð½Ñ?Ñ?Ñ?ÐµÐ½Ð½Ð¸Ð¹ Ñ?Ð°Ð´Ð¸Ñ?Ñ?:"
 
-#: ../data/builder/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. Ð?Ñ?Ñ?Ñ?Ð¾Ðµ Ð¿Ð¾Ð»Ðµ (Ð½Ð° Ð½Ñ?Ð¼ Ð¼Ð¾Ð¶Ð½Ð¾ Ð±Ñ?Ð´ÐµÑ? Ð¿ÐµÑ?Ð°Ñ?Ñ?):"
 
-#: ../data/builder/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ð´Ð»Ñ? Ð¾Ð±Ñ?ÐµÐ·ÐºÐ¸:"
 
-#: ../data/builder/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Ð?Ð¾Ð»Ðµ"
 
-#: ../data/builder/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. Ð?Ð°ÐºÑ?Ñ?Ð³Ð»ÐµÐ½Ð¸Ðµ (Ñ?Ð°Ð´Ð¸Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸Ð½Ñ?):"
 
-#: ../data/builder/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. Ð?Ñ?Ñ?Ð¾Ñ?Ð° Ð¾Ð±Ñ?ÐµÐ·ÐºÐ¸:"
 
-#: ../data/builder/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. Ð?Ñ?Ñ?Ñ?Ð¾Ðµ Ð³Ð¾Ñ?Ð¸Ð·. Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ (Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾):"
 
-#: ../data/builder/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. Ð?Ñ?Ñ?Ñ?Ð¾Ðµ Ð²ÐµÑ?Ñ?. Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ (Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾):"
 
-#: ../data/builder/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. Ð?Ñ?Ñ?Ñ?Ð¾Ðµ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ (Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾):"
 
-#: ../data/builder/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Ð?Ð¾Ð»Ðµ"
 
-#: ../data/builder/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ?ÐµÐ»Ñ? Ð¸Ð»Ð¸ Ñ?Ð¾Ñ?Ð³Ð¾Ð²Ð°Ñ? Ð¼Ð°Ñ?ÐºÐ°:"
 
-#: ../data/builder/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD (Ð²ÐºÐ»Ñ?Ñ?Ð°Ñ? CD Ñ?Ð°Ð·Ð¼ÐµÑ?Ð¾Ð¼ Ñ? Ð²Ð¸Ð·Ð¸Ñ?ÐºÑ?)"
 
-#: ../data/builder/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1888,23 +2374,19 @@ msgstr ""
 "Ð?Ñ? Ñ?Ð°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð½Ð°Ð¶Ð°Ñ?Ñ? ÐºÐ½Ð¾Ð¿ÐºÑ? Â«Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ?Â», Ñ?Ñ?Ð¾Ð±Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ñ?,\n"
 "Ð»Ð¸Ð±Ð¾ ÐºÐ½Ð¾Ð¿ÐºÑ? Â«Ð?Ð°Ð·Ð°Ð´Â», Ñ?Ñ?Ð¾Ð±Ñ? Ð¿Ñ?Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ?Ñ? Ñ?ÐµÐ´Ð°ÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ."
 
-#: ../data/builder/template-designer.glade.h:27
-msgid "Description:"
-msgstr "Ð?Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ:"
-
-#: ../data/builder/template-designer.glade.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "Ð Ð°Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Ð¾Ñ? Ð»ÐµÐ²Ð¾Ð³Ð¾ Ñ?Ð³Ð»Ð° (x0):"
 
-#: ../data/builder/template-designer.glade.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "Ð Ð°Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Ð¾Ñ? Ð²ÐµÑ?Ñ?Ð½ÐµÐ³Ð¾ Ñ?Ð³Ð»Ð° (y0)"
 
-#: ../data/builder/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "Ð?Ð½Ñ?ÐµÑ?Ð²Ð°Ð» Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð¸ (dx):"
 
-#: ../data/builder/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1919,52 +2401,43 @@ msgstr ""
 "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¾Ð´Ð¸Ð½ Ð¼Ð°ÐºÐµÑ?, ÐºÐ°Ðº Ð² Ð¿ÐµÑ?Ð²Ð¾Ð¼ Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ðµ.\n"
 "Ð?Ñ?Ð¾Ñ?Ð¾Ð¹ Ð¿Ñ?Ð¸Ð¼ÐµÑ? Ð¸Ð»Ð»Ñ?Ñ?Ñ?Ñ?Ð¸Ñ?Ñ?ÐµÑ? Ñ?Ð»Ñ?Ñ?Ð°Ð¹, ÐºÐ¾Ð³Ð´Ð° Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ?Ð¸Ð¼ÐµÐ½Ñ?Ñ?Ñ? Ð´Ð²Ð° Ð¼Ð°ÐºÐµÑ?Ð°."
 
-#: ../data/builder/template-designer.glade.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "Ð?Ð°ÐºÐµÑ? â??1"
 
-#: ../data/builder/template-designer.glade.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "Ð?Ð°ÐºÐµÑ? â??2"
 
-#: ../data/builder/template-designer.glade.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "Ð?Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð¸ (nx):"
 
-#: ../data/builder/template-designer.glade.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "Ð?Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð¸ (ny):"
 
-#: ../data/builder/template-designer.glade.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "Ð?Ð¾Ð»Ð¸Ñ?ÐµÑ?Ñ?Ð²Ð¾ Ð¼Ð°ÐºÐµÑ?Ð¾Ð²:"
 
-#: ../data/builder/template-designer.glade.h:42
-#: ../data/builder/wdgt-media-select.glade.h:3
-msgid "Page size:"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?:"
-
-#: ../data/builder/template-designer.glade.h:43
-msgid "Part #:"
-msgstr "Ð§Ð°Ñ?Ñ?Ñ? â??:"
-
-#: ../data/builder/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ?Ðµ Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?Ñ?Ñ? Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¾Ð½Ð½Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð´Ð»Ñ? Ð±Ð»Ð°Ð½ÐºÐ°."
 
-#: ../data/builder/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ð»ÐµÐ´Ñ?Ñ?Ñ?Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Ð¾Ð± Ð¾Ñ?Ð¾Ñ?Ð¼Ð»ÐµÐ½Ð¸Ð¸."
 
-#: ../data/builder/template-designer.glade.h:46
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð³ÐµÐ¾Ð¼ÐµÑ?Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ðµ Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ? Ð¾Ð´Ð¸Ð½Ð¾Ñ?Ð½Ð¾Ð¹ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð² Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð°Ð±Ð»Ð¾Ð½Ðµ."
 
-#: ../data/builder/template-designer.glade.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
@@ -1972,27 +2445,27 @@ msgstr ""
 "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð³ÐµÐ¾Ð¼ÐµÑ?Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ðµ Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ? Ð¾Ð´Ð¸Ð½Ð¾Ñ?Ð½Ð¾Ð¹ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ¸ Ð² Ð²Ð°Ñ?ÐµÐ¼ "
 "Ñ?Ð°Ð±Ð»Ð¾Ð½Ðµ."
 
-#: ../data/builder/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ñ?Ð½Ð¾Ð²Ð½Ñ?Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸."
 
-#: ../data/builder/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð´Ð»Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°."
 
-#: ../data/builder/template-designer.glade.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Ð?Ð°Ð¿ÐµÑ?Ð°Ñ?Ð°Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¾Ð²Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
 
-#: ../data/builder/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸Ðº Ð¸Ð»Ð¸ ÐºÐ²Ð°Ð´Ñ?Ð°Ñ? (Ð¼Ð¾Ð¶ÐµÑ? Ð¸Ð¼ÐµÑ?Ñ? Ñ?ÐºÑ?Ñ?Ð³Ð»Ñ?Ð½Ð½Ñ?Ðµ ÐºÑ?Ð°Ñ?)"
 
-#: ../data/builder/template-designer.glade.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "Ð?Ñ?Ñ?Ð³"
 
-#: ../data/builder/template-designer.glade.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -2000,7 +2473,7 @@ msgstr ""
 "Ð?Ð»Ñ? Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°\n"
 "Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð´Ð²Ðµ Ñ?Ð¾Ñ?Ð¼Ñ?."
 
-#: ../data/builder/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2008,11 +2481,11 @@ msgstr ""
 "Ð?Ð»Ñ? Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð° Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ?\n"
 "Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¾Ð´Ð½Ð° Ñ?Ð¾Ñ?Ð¼Ð°."
 
-#: ../data/builder/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "Ð?Ð½Ñ?ÐµÑ?Ð²Ð°Ð» Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð¸ (dy):"
 
-#: ../data/builder/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2023,199 +2496,227 @@ msgstr ""
 "ÐÑ?Ð¾Ñ? Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð±Ñ?Ð´ÐµÑ? Ñ?Ð¾Ð¿Ñ?Ð¾Ð²Ð¾Ð¶Ð´Ð°Ñ?Ñ? Ð²Ð°Ñ? Ð² Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð²Ð°Ñ?ÐµÐ³Ð¾ Ñ?Ð¾Ð±Ñ?Ñ?Ð²ÐµÐ½Ð½Ð¾Ð³Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð° "
 "gLabels."
 
-#: ../data/builder/template-designer.glade.h:62
-msgid "cd_size_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "Ð¡Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ñ?"
 
-#: ../data/builder/template-designer.glade.h:63
-msgid "finish_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "Copies"
+msgstr "Ð?Ð¾Ð¿Ð¸Ð¹"
 
-#: ../data/builder/template-designer.glade.h:65
-msgid "layout_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "Ð?Ð¾Ð¿Ð¸Ð¹:"
 
-#: ../data/builder/template-designer.glade.h:66
-msgid "name_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¾Ð±Ñ?ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸ÐµÐ¼"
 
-#: ../data/builder/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?</b>"
 
-#: ../data/builder/template-designer.glade.h:68
-msgid "pg_size_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "Ð?Ð¸Ñ?Ñ?Ð¾Ð²:"
 
-#: ../data/builder/template-designer.glade.h:69
-msgid "rect_size_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "Ð?Ð°Ñ?Ð°Ñ?Ñ? Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
-#: ../data/builder/template-designer.glade.h:70
-msgid "round_size_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "Ñ?:"
 
-#: ../data/builder/template-designer.glade.h:71
-msgid "shape_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "Ð½Ð° Ð¿ÐµÑ?Ð²Ð¾Ð¼ Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../data/builder/template-designer.glade.h:72
-msgid "start_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "Ð¿Ð¾:"
 
-#: ../data/builder/wdgt-media-select.glade.h:1
-msgid "Brand:"
-msgstr "Ð?Ð°Ñ?ÐºÐ°:"
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº, Ð²Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐµÐº Ð¸ Ð²ÐºÐ»Ð°Ð´Ñ?Ñ?ÐµÐ¹ Ð´Ð»Ñ? Ð´Ð¸Ñ?ÐºÐ¾Ð²"
 
-#: ../data/builder/wdgt-media-select.glade.h:2
-msgid "Category:"
-msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "Ð?Ð¸Ð·Ð°Ð¹Ð½ÐµÑ? Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº gLabels"
 
-#: ../data/builder/wdgt-media-select.glade.h:4
-msgid "Recent templates"
-msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ñ?Ð°Ð±Ð»Ð¾Ð½Ñ?"
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "Ð¤Ð°Ð¹Ð» Ð¿Ñ?Ð¾ÐµÐºÑ?Ð° gLabels"
 
-#: ../data/builder/wdgt-media-select.glade.h:5
-msgid "Search all templates"
-msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ð¿Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°Ð¼"
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
 
 #. Other ISO A series sizes
-#: ../data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0"
 
-#: ../data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1"
 
-#: ../data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10"
 
-#: ../data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2"
 
-#: ../data/templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3"
 
-#: ../data/templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4"
 
-#: ../data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5"
 
-#: ../data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6"
 
-#: ../data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7"
 
-#: ../data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8"
 
-#: ../data/templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9"
 
 #. ISO B series sizes
-#: ../data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0"
 
-#: ../data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1"
 
-#: ../data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10"
 
-#: ../data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2"
 
-#: ../data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3"
 
-#: ../data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4"
 
-#: ../data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5"
 
-#: ../data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6"
 
-#: ../data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7"
 
-#: ../data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8"
 
-#: ../data/templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9"
 
-#: ../data/templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "US Executive"
 
 #. Other US paper sizes
-#: ../data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "US Legal"
 
-#: ../data/templates/categories.xml.h:1
+#: ../templates/categories.xml.h:1
 msgid "Any card"
 msgstr "Ð?Ñ?Ð±Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
 
-#: ../data/templates/categories.xml.h:2
+#: ../templates/categories.xml.h:2
 msgid "Any label"
 msgstr "Ð?Ñ?Ð±Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
-#: ../data/templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
 
-#: ../data/templates/categories.xml.h:4
+#: ../templates/categories.xml.h:4
 msgid "CD/DVD or other media"
 msgstr "CD/DVD Ð¸ Ð¿Ñ?Ð¾Ñ?Ð¸Ðµ Ð½Ð¾Ñ?Ð¸Ñ?ÐµÐ»Ð¸"
 
-#: ../data/templates/categories.xml.h:5
+#: ../templates/categories.xml.h:5
 msgid "Mailing/shipping products"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÑ?Ð¿Ð¾Ð½Ð´ÐµÐ½Ñ?Ð¸Ñ?"
 
-#: ../data/templates/categories.xml.h:6
+#: ../templates/categories.xml.h:6
 msgid "Rectangular labels"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
-#: ../data/templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "Ð?Ñ?Ñ?Ð³Ð»Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
-#: ../data/templates/categories.xml.h:8
+#: ../templates/categories.xml.h:8
 msgid "Square labels"
 msgstr "Ð?Ð²Ð°Ð´Ñ?Ð°Ñ?Ð½Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:2
-#: ../data/templates/avery-iso-templates.xml.h:2
-#: ../data/templates/dymo-other-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:2
-#: ../data/templates/zweckform-iso-templates.xml.h:2
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ° Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼"
 
@@ -2224,191 +2725,207 @@ msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ° Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼"
 #. ===================================================================
 #. ********************************************************************
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:4
-#: ../data/templates/avery-iso-templates.xml.h:8
-#: ../data/templates/misc-us-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:12
-#: ../data/templates/zweckform-iso-templates.xml.h:6
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
 
 #. ===================================================================
 #. ===============================================================
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:6
-#: ../data/templates/avery-iso-templates.xml.h:14
-#: ../data/templates/misc-us-templates.xml.h:8
-#: ../data/templates/misc-iso-templates.xml.h:16
-#: ../data/templates/zweckform-iso-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð´Ð»Ñ? CD/DVD"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð´Ð»Ñ? CD/DVD (Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° Ð´Ð¸Ñ?Ðº)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:10
+#: ../templates/avery-us-templates.xml.h:10
 msgid "CD/DVD Labels (Spine Labels)"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° CD/DVD"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:12
-#: ../data/templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° Ð´Ð¸Ñ?ÐºÐµÑ?Ñ?"
 
 #. the LSK labels can be torn in half down the center
-#: ../data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:14
 #, fuzzy
 msgid "Divider Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð´Ð»Ñ? CD"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+msgid "File Folder Labels"
+msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð´Ð»Ñ? Ð¿Ð°Ð¿Ð¾Ðº"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr "Ð?Ð°Ð¿Ð¾Ð»Ð½Ñ?ÐµÐ¼Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:18
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð½Ð° Ð²Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 msgid "ID Labels"
 msgstr "Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¾Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 #, fuzzy
 msgid "Index Cards"
 msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ñ? Ð±Ð¾Ð»Ñ?Ñ?Ð¸Ð¼ Ð·Ð°ÐºÑ?Ñ?Ð³Ð»ÐµÐ½Ð¸ÐµÐ¼"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:26
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "Ð?Ð¼ÐµÐ½Ð½Ð¾Ð¹ Ð±ÐµÐ¹Ð´Ð¶Ð¸Ðº"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ðµ Ð¾Ñ?ÐºÑ?Ñ?Ñ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:30
-#: ../data/templates/dymo-other-templates.xml.h:12
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ° Ð´Ð»Ñ? Ð¾Ð±Ñ?Ð°Ñ?Ð½Ð¾Ð³Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð°"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:32
-#: ../data/templates/misc-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "Ð?Ñ?Ñ?Ð³Ð»Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:34
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "Ð¦ÐµÐ½Ð½Ð¸ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:36
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ñ?ÐºÐ¸Ðµ ÐºÑ?Ñ?Ð³Ð»Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:38
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:42
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "Ð?Ð¸Ñ?ÐµÐ²Ñ?Ðµ Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° Ð²Ð¸Ð´ÐµÐ¾ÐºÐ°Ñ?Ñ?ÐµÑ?Ñ?"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:44
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr "Ð¢Ð¾Ñ?Ñ?ÐµÐ²Ñ?Ðµ Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° Ð²Ð¸Ð´ÐµÐ¾ÐºÐ°Ñ?Ñ?ÐµÑ?Ñ?"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:4
 msgid "Address labels"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð½Ñ?Ðµ Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:6
 #, fuzzy
 msgid "Allround labels"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ñ?ÐºÐ¸Ðµ ÐºÑ?Ñ?Ð³Ð»Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:10
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "CD Booklet"
 msgstr "Ð?ÐºÐ»Ð°Ð´Ñ?Ñ? Ð² CD"
 
 #. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:12
 msgid "CD Inlet"
 msgstr "Ð?Ñ?ÐºÐ»ÐµÑ? Ð´Ð»Ñ? CD"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:18
+#: ../templates/avery-iso-templates.xml.h:18
 msgid "Diskette labels"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° Ð´Ð¸Ñ?ÐºÐµÑ?Ñ?"
 
 #. ===============================================================
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:20
-#: ../data/templates/misc-us-templates.xml.h:18
-#: ../data/templates/misc-iso-templates.xml.h:36
-#: ../data/templates/zweckform-iso-templates.xml.h:16
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:22
+#: ../templates/avery-iso-templates.xml.h:22
 msgid "Mailing labels"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ðµ Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:24
+#: ../templates/avery-iso-templates.xml.h:24
 msgid "Mini Address Labels"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ñ?ÐºÐ¸Ðµ Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:26
+#: ../templates/avery-iso-templates.xml.h:26
 #, fuzzy
 msgid "Mini Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð´Ð»Ñ? Ð?Ð¸Ð½Ð¸-CD"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:28
+#: ../templates/avery-iso-templates.xml.h:28
 msgid "Shipping labels"
 msgstr "Ð¦ÐµÐ½Ð½Ð¸ÐºÐ¸"
 
-#. ===================================================================
-#: ../data/templates/avery-other-templates.xml.h:2
-msgid "File Folder Labels"
-msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð´Ð»Ñ? Ð¿Ð°Ð¿Ð¾Ðº"
-
-#: ../data/templates/brother-other-templates.xml.h:1
+#: ../templates/brother-other-templates.xml.h:1
 msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr ""
 
-#: ../data/templates/brother-other-templates.xml.h:2
+#: ../templates/brother-other-templates.xml.h:2
 #, fuzzy
 msgid "Shipping Labels 62mm x 100mm"
 msgstr "Ð¦ÐµÐ½Ð½Ð¸ÐºÐ¸"
@@ -2430,292 +2947,453 @@ msgstr "Ð¦ÐµÐ½Ð½Ð¸ÐºÐ¸"
 #. *********************************************************************
 #. *********************************************************************
 #.
-#: ../data/templates/brother-other-templates.xml.h:20
+#: ../templates/brother-other-templates.xml.h:20
 #, fuzzy
 msgid "Standard Address Labels 29mm x 90mm"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ° Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:2
 msgid "3.5in Diskette"
 msgstr "Ð?Ð¸Ñ?ÐºÐµÑ?Ð° 3,5 Ð´Ñ?Ð¹Ð¼Ð°"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:6
 msgid "File Folder"
 msgstr "Ð?Ð°Ð¿ÐºÐ° Ð´Ð»Ñ? Ñ?Ð°Ð¹Ð»Ð¾Ð²"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:8
+#: ../templates/dymo-other-templates.xml.h:8
 msgid "Hanging Folder"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:10
+#: ../templates/dymo-other-templates.xml.h:10
 msgid "Large Address Labels"
 msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ð¸Ðµ Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:14
 #, fuzzy
 msgid "Shipping Address Labels"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ñ?ÐºÐ¸Ðµ Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:2
+#: ../templates/misc-us-templates.xml.h:2
 msgid "Business Card CD"
 msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ð°Ñ? ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ° Ð½Ð° CD"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:6
+#: ../templates/misc-us-templates.xml.h:6
 msgid "CD Template Rectangles"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ñ?Ð¹ Ñ?Ð°Ð±Ð»Ð¾Ð½ Ð´Ð»Ñ? CD"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:10
+#: ../templates/misc-us-templates.xml.h:10
 msgid "CD/DVD Labels (Face Only)"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð´Ð»Ñ? CD/DVD (Ð»Ð¸Ñ?ÐµÐ²Ð°Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð°)"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:12
-#: ../data/templates/misc-iso-templates.xml.h:18
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "CD/DVD Labels (face only)"
 msgstr "Ð?ÐºÐ»Ð°Ð´Ñ?Ñ?Ð¸ CD/DVD (Ð»Ð¸Ñ?ÐµÐ²Ð°Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð°)"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:14
 msgid "Cassette Labels"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° ÐºÐ°Ñ?Ñ?ÐµÑ?Ñ?"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:16
+#: ../templates/misc-us-templates.xml.h:16
 msgid "DLT Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð½Ð° DLT"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "Ð?ÐºÐ»Ð°Ð´Ñ?Ñ? Ð² CD"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð´Ð»Ñ? Microtube"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:22
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð´Ð»Ñ? Ð?Ð¸Ð½Ð¸-CD"
 
-#: ../data/templates/misc-us-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:25
 #, fuzzy
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr "CD CD"
 
-#: ../data/templates/misc-us-templates.xml.h:24
+#: ../templates/misc-us-templates.xml.h:26
 #, fuzzy
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "CD"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:26
-#: ../data/templates/misc-iso-templates.xml.h:42
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
 #, fuzzy
 msgid "PRO CD Labels 2-up (face only)"
 msgstr "CD"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:30
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr "Ð¢Ð¾Ð½ÐºÐ¸Ðµ ÐºÐ¾Ñ?Ð¾Ð±ÐºÐ¸ Ð´Ð»Ñ? CD (Ð¿Ñ?Ð°Ð²Ð°Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð° Ð²Ð²ÐµÑ?Ñ?Ñ?)"
 
-#: ../data/templates/misc-us-templates.xml.h:31
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr "Ð¢Ð¾Ð½ÐºÐ¸Ðµ ÐºÐ¾Ñ?Ð¾Ð±ÐºÐ¸ Ð´Ð»Ñ? CD (ÐºÐ²ÐµÑ?Ñ? Ð½Ð¾Ð³Ð°Ð¼Ð¸)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:4
-#: ../data/templates/zweckform-iso-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Allround Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:6
+#: ../templates/misc-iso-templates.xml.h:6
 #, fuzzy
 msgid "Arch File Labels"
 msgstr "Ð¤Ð°Ð¹Ð»"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:8
 #, fuzzy
 msgid "Arch File Labels (large)"
 msgstr "Ð¤Ð°Ð¹Ð» Ð±Ð¾Ð»Ñ?Ñ?Ð¾Ð¹"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:10
+#: ../templates/misc-iso-templates.xml.h:10
 #, fuzzy
 msgid "Arch File Labels (small)"
 msgstr "Ð¤Ð°Ð¹Ð» Ð¼Ð°Ð»ÐµÐ½Ñ?ÐºÐ¸Ð¹"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:14
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð´Ð»Ñ? CD"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¾Ð³Ð¾ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° Ð´Ð»Ñ? CD/DVD (Ð»Ð¸Ñ?ÐµÐ²Ð°Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð°)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:22
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð´Ð»Ñ? Ð´Ð¸Ñ?ÐºÐµÑ? (Ð»Ð¸Ñ?ÐµÐ²Ð°Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð°)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "EPSON Photo Stickers 16"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "Ð?Ð°Ð³Ð½Ð¸Ñ?Ð½Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?Ñ? Ð´Ð»Ñ? Ñ?Ð¾Ð»Ð¾Ð´Ð¸Ð»Ñ?Ð½Ð¸ÐºÐ°"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:30
 msgid "General Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¾Ð±Ñ?ÐµÐ³Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ?"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:38
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:40
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:44
-#: ../data/templates/zweckform-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Rectangular Labels"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ñ?Ðµ Ð¼ÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¾Ð±Ñ?ÐµÐ³Ð¾ Ð½Ð°Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ?"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° Ð²Ð¸Ð´ÐµÐ¾ÐºÐ°Ñ?Ñ?ÐµÑ?Ñ? (Ð»Ð¸Ñ?ÐµÐ²Ð°Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð°)"
 
 #. ===================================================================
-#: ../data/templates/misc-other-templates.xml.h:2
+#: ../templates/misc-other-templates.xml.h:2
 #, fuzzy
 msgid "Multi-Purpose Labels"
 msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð´Ð»Ñ? Microtube"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:10
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ° Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Ð?Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ Ð½Ð° Ð´Ð¸Ñ?ÐºÐµÑ?Ñ?"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Ð?Ð°Ð»ÐµÐ½Ñ?ÐºÐ¸Ðµ ÐºÑ?Ñ?Ð³Ð»Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Ð?Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Ð? gLabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "Ð?Ð²Ð°Ð´Ñ?Ð°Ñ?Ð½Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "Ð?Ð²Ð°Ð´Ñ?Ð°Ñ?Ð½Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ?Ð¸Ðµ Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð²Ð°Ñ?Ñ?Ð¸Ðµ Ð¼ÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:12
 #, fuzzy
 msgid "File Back Labels"
 msgstr "Ð?Ð°Ð¿Ð¾Ð»Ð½Ñ?ÐµÐ¼Ñ?Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:14
+#: ../templates/zweckform-iso-templates.xml.h:14
 #, fuzzy
 msgid "Lever Arch File Labels"
 msgstr "Ð¤Ð°Ð¹Ð»"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:20
 #, fuzzy
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr "x"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:22
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "Ð?Ð¸Ð´ÐµÐ¾Ð½Ð°ÐºÐ»ÐµÐ¹ÐºÐ¸ (Ð¾Ð±Ð¾Ñ?Ð¾Ñ?Ð½Ð°Ñ? Ñ?Ñ?Ð¾Ñ?Ð¾Ð½Ð°)"
 
-#: ../data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº, Ð²Ð¸Ð·Ð¸Ñ?Ð½Ñ?Ñ? ÐºÐ°Ñ?Ñ?Ð¾Ñ?ÐµÐº Ð¸ Ð²ÐºÐ»Ð°Ð´Ñ?Ñ?ÐµÐ¹ Ð´Ð»Ñ? Ð´Ð¸Ñ?ÐºÐ¾Ð²"
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ð·Ð°Ð¿Ñ?Ñ?Ð°Ñ?Â» (CSV)"
 
-#: ../data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "Ð?Ð¸Ð·Ð°Ð¹Ð½ÐµÑ? Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº gLabels"
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ð´Ð²Ð¾ÐµÑ?Ð¾Ñ?Ð¸ÐµÂ»"
 
-#: ../data/mime/glabels.keys.in.h:1 ../data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "Ð¤Ð°Ð¹Ð» Ð¿Ñ?Ð¾ÐµÐºÑ?Ð° gLabels"
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ñ?Ð¸Ð¼Ð²Ð¾Ð» Ñ?Ð°Ð±Ñ?Ð»Ñ?Ñ?Ð¸Ð¸Â»"
 
-#: ../barcode-0.98/compat/getopt.c:583
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
+#~ msgid "Data from a file containing VCards"
+#~ msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð· Ñ?Ð°Ð¹Ð»Ð°, Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð°Ñ?ÐµÐ³Ð¾ VCard"
 
-#: ../barcode-0.98/compat/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
 
-#: ../barcode-0.98/compat/getopt.c:612
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
 
-#: ../barcode-0.98/compat/getopt.c:629
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?"
 
-#. --option
-#: ../barcode-0.98/compat/getopt.c:658
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ»Ñ?Ñ? `--%s'\n"
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>Ð Ð°Ñ?Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸</b>"
 
-#. +option or -option
-#: ../barcode-0.98/compat/getopt.c:662
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ»Ñ?Ñ? `%c%s'\n"
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>Ð¢Ð¸Ð¿ Ð½Ð¾Ñ?Ð¸Ñ?ÐµÐ»Ñ?</b>"
 
-#. 1003.2 specifies the format of this message.
-#: ../barcode-0.98/compat/getopt.c:688
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
 
-#: ../barcode-0.98/compat/getopt.c:691
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ð¹ ÐºÐ»Ñ?Ñ? -- %c\n"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Xxx Ñ?Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð°</span>"
 
-#: ../barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
+#~ msgid "Select A File"
+#~ msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð»"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Ð Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Ð?Ð°Ð»Ð¸Ð²ÐºÐ°</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Ð?Ð±Ð²Ð¾Ð´ÐºÐ°</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Ð¢ÐµÐºÑ?Ñ?</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Ð?Ð´Ð¸Ð½Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð¸Ñ?</span>"
+
+#~ msgid "<b>Print control (Merge)</b>"
+#~ msgstr "<b>Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿ÐµÑ?Ð°Ñ?Ñ?Ñ? (Ð¾Ð±Ñ?ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ)</b>"
+
+#~ msgid "<b>Print control (Simple)</b>"
+#~ msgstr "<b>Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿ÐµÑ?Ð°Ñ?Ñ?Ñ? (Ð¿Ñ?Ð¾Ñ?Ñ?Ð°Ñ?)</b>"
+
+#~ msgid "Text Color"
+#~ msgstr "Ð¦Ð²ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
+
+#~ msgid "Search all templates"
+#~ msgstr "Ð?Ð¾Ð¸Ñ?Ðº Ð¿Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°Ð¼"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ»Ñ?Ñ? `--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ ÐºÐ»Ñ?Ñ? `%c%s'\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: Ð½ÐµÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ñ?Ð¹ ÐºÐ»Ñ?Ñ? -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 
 #~ msgid "- gLabels label designer"
 #~ msgstr "â?? Ð´Ð¸Ð·Ð°Ð¹Ð½ÐµÑ? Ñ?Ñ?Ð¸ÐºÐµÑ?Ð¾Ðº gLabels"
@@ -2735,9 +3413,6 @@ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 #~ msgid "Show tooltips for drawing toolbar"
 #~ msgstr "Ð?Ð¾ÐºÐ°Ð·Ñ?Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ð´Ñ?ÐºÐ°Ð·ÐºÐ¸ Ð² Ð¿Ð°Ð½ÐµÐ»Ð¸ Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#~ msgid "custom"
-#~ msgstr "Ð²Ñ?Ð±Ð¾Ñ?Ð¾Ñ?Ð½Ð¾"
-
 #~ msgid "Choose Custom Color"
 #~ msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¸Ð¹ Ñ?Ð²ÐµÑ?"
 
@@ -2816,9 +3491,6 @@ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 #~ msgid "dark purple"
 #~ msgstr "Ñ?Ñ?Ð¼Ð½Ð¾-Ð¿Ñ?Ñ?Ð¿Ñ?Ñ?Ð½Ñ?Ð¹"
 
-#~ msgid "Text color"
-#~ msgstr "Ð¦Ð²ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
-
 #~ msgid "         "
 #~ msgstr "         "
 
@@ -2861,27 +3533,12 @@ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 #~ msgid "P_rinter"
 #~ msgstr "Ð?_Ñ?Ð¸Ð½Ñ?ÐµÑ?"
 
-#~ msgid "Copies"
-#~ msgstr "Ð?Ð¾Ð¿Ð¸Ð¹"
-
-#~ msgid "Document merge control"
-#~ msgstr "Ð£Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¾Ð±Ñ?ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸ÐµÐ¼"
-
 #~ msgid "Print preview"
 #~ msgstr "Ð?Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?ÐµÑ?Ñ?"
 
 #~ msgid "Importing from glabels 1.91 format"
 #~ msgstr "Ð?Ð¼Ð¿Ð¾Ñ?Ñ?Ð¸Ñ?Ñ?ÐµÐ¼ Ð¸Ð· Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° glabels Ð²ÐµÑ?Ñ?Ð¸Ð¸ 1.91"
 
-#~ msgid "Label size:"
-#~ msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸:"
-
-#~ msgid "Layout:"
-#~ msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?:"
-
-#~ msgid "%d x %d  (%d per sheet)"
-#~ msgstr "%d x %d (%d Ð½Ð° Ð»Ð¸Ñ?Ñ?)"
-
 #~ msgid "No paper files found!"
 #~ msgstr "Ð?Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ? Ñ?Ð°Ð¹Ð»Ñ? Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ñ? Ð±Ñ?Ð¼Ð°Ð³Ð¸!"
 
@@ -2956,9 +3613,6 @@ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 #~ msgid "U_n-select All"
 #~ msgstr "_Ð¡Ð½Ñ?Ñ?Ñ? Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ?Ð¾ Ð²Ñ?ÐµÐ³Ð¾"
 
-#~ msgid "Undo"
-#~ msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ?"
-
 #~ msgid "Undo the last action"
 #~ msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð½ÐµÐµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
diff --git a/po/sl.po b/po/sl.po
index 61fa8a3..ec5c0ca 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,3225 +1,3487 @@
 # Slovenian translation for glabels.
 # Copyright (C) 2009 glabels's COPYRIGHT HOLDER
 # This file is distributed under the same license as the glabels package.
-#
+# 
 # Andrej Å½nidarÅ¡iÄ? <andrej znidarsic gmail com>, 2009 - 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: glabels master\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2010-07-03 03:15+0000\n"
-"PO-Revision-Date: 2010-07-03 11:22+0100\n"
-"Last-Translator: Andrej Å½nidarÅ¡iÄ? <andrej znidarsic gmail com>\n"
-"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../src/bc.c:66
-msgid "POSTNET (any)"
-msgstr "POSTNET (any)"
-
-#: ../src/bc.c:69
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (ZIP only)"
-
-#: ../src/bc.c:72
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP+4)"
-
-#: ../src/bc.c:75
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
-
-#: ../src/bc.c:80
-msgid "CEPNET"
-msgstr "CEPNET"
-
-#: ../src/bc.c:83
-msgid "EAN (any)"
-msgstr "EAN (katerakoli)"
-
-#: ../src/bc.c:86
-msgid "EAN-8"
-msgstr "EAN-8"
-
-#: ../src/bc.c:89
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
-
-#: ../src/bc.c:92
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
-
-#: ../src/bc.c:95
-msgid "EAN-13"
-msgstr "EAN-13"
-
-#: ../src/bc.c:98
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
-
-#: ../src/bc.c:101
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
-
-#: ../src/bc.c:104
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A or UPC-E)"
-
-#: ../src/bc.c:107
-msgid "UPC-A"
-msgstr "UPC-A"
-
-#: ../src/bc.c:110
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
-
-#: ../src/bc.c:113
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
-
-#: ../src/bc.c:116
-msgid "UPC-E"
-msgstr "UPC-E"
-
-#: ../src/bc.c:119
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
-
-#: ../src/bc.c:122
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
-
-#: ../src/bc.c:125
-msgid "ISBN"
-msgstr "ISBN"
-
-#: ../src/bc.c:128
-msgid "ISBN +5"
-msgstr "ISBN +5"
-
-#: ../src/bc.c:131
-msgid "Code 39"
-msgstr "Koda 39"
-
-#: ../src/bc.c:134
-msgid "Code 128"
-msgstr "Koda 128"
-
-#: ../src/bc.c:137
-msgid "Code 128C"
-msgstr "Koda 128C"
-
-#: ../src/bc.c:140
-msgid "Code 128B"
-msgstr "Koda 128B"
-
-#: ../src/bc.c:143
-msgid "Interleaved 2 of 5"
-msgstr "Prepleteno 2 od 5"
-
-#: ../src/bc.c:146
-msgid "Codabar"
-msgstr "Å tevilka Ä?rtne kode"
-
-#: ../src/bc.c:149
-msgid "MSI"
-msgstr "MSI"
-
-#: ../src/bc.c:152
-msgid "Plessey"
-msgstr "Plessey"
-
-#: ../src/bc.c:155
-msgid "Code 93"
-msgstr "Koda 93"
-
-#: ../src/bc.c:162
-msgid "GS1-128"
-msgstr "GS1-128"
-
-#: ../src/bc.c:169
-msgid "IEC16022 (DataMatrix)"
-msgstr "IEC16022 (Podatkovna matrika)"
-
-#: ../src/bc.c:176
-msgid "IEC18004 (QRCode)"
-msgstr "IEC18004 (QRKoda)"
-
-#: ../src/color-combo-button.c:198
-#: ../src/color-combo.c:178
-msgid "Default Color"
-msgstr "Privzeta barva"
-
-#: ../src/color-combo-menu.c:83
-msgid "Dark Red"
-msgstr "Temno rdeÄ?a"
-
-#: ../src/color-combo-menu.c:84
-msgid "Brown"
-msgstr "Rjava"
-
-#: ../src/color-combo-menu.c:85
-msgid "Dark Goldenrod"
-msgstr "Temna zlata palica"
-
-#: ../src/color-combo-menu.c:86
-msgid "Dark Green"
-msgstr "Temno zelena"
-
-#: ../src/color-combo-menu.c:87
-msgid "Dark Cyan"
-msgstr "Temno sinja"
-
-#: ../src/color-combo-menu.c:88
-msgid "Navy Blue"
-msgstr "Mornarsko modra"
-
-#: ../src/color-combo-menu.c:89
-msgid "Dark Violet"
-msgstr "Temno vijoliÄ?na"
-
-#: ../src/color-combo-menu.c:91
-msgid "Red"
-msgstr "RdeÄ?a"
-
-#: ../src/color-combo-menu.c:92
-msgid "Orange"
-msgstr "OranÅ¾na"
-
-#: ../src/color-combo-menu.c:93
-msgid "Dark Yellow"
-msgstr "Temno rumena"
-
-#: ../src/color-combo-menu.c:94
-msgid "Medium green"
-msgstr "Srednja zelena"
-
-#: ../src/color-combo-menu.c:95
-msgid "Turquoise"
-msgstr "Turkizna"
-
-#: ../src/color-combo-menu.c:96
-msgid "Blue"
-msgstr "Modra"
-
-#: ../src/color-combo-menu.c:97
-msgid "Purple"
-msgstr "Å krlatna"
-
-#: ../src/color-combo-menu.c:99
-msgid "Salmon"
-msgstr "Lososova"
-
-#: ../src/color-combo-menu.c:100
-msgid "Gold"
-msgstr "Zlata"
-
-#: ../src/color-combo-menu.c:101
-msgid "Yellow"
-msgstr "Rumena"
-
-#: ../src/color-combo-menu.c:102
-msgid "Green"
-msgstr "Zelena"
-
-#: ../src/color-combo-menu.c:103
-msgid "Cyan"
-msgstr "Sinja"
-
-#: ../src/color-combo-menu.c:104
-msgid "SkyBlue"
-msgstr "NebeÅ¡ko modra"
-
-#: ../src/color-combo-menu.c:105
-msgid "Violet"
-msgstr "VijoliÄ?na"
-
-#: ../src/color-combo-menu.c:107
-msgid "Pink"
-msgstr "Roza"
-
-#: ../src/color-combo-menu.c:108
-msgid "Khaki"
-msgstr "Kakijeva"
-
-#: ../src/color-combo-menu.c:109
-msgid "Light Yellow"
-msgstr "Svetlo rumena"
-
-#: ../src/color-combo-menu.c:110
-msgid "Light Green"
-msgstr "Svetlo zelena"
-
-#: ../src/color-combo-menu.c:111
-msgid "Light Cyan"
-msgstr "Svetlo sinja"
-
-#: ../src/color-combo-menu.c:112
-msgid "Slate Gray"
-msgstr "SkrilavÄ?no siva"
-
-#: ../src/color-combo-menu.c:113
-msgid "Thistle"
-msgstr "Osatna"
-
-#: ../src/color-combo-menu.c:115
-msgid "White"
-msgstr "Bela"
-
-#: ../src/color-combo-menu.c:117
-#, no-c-format
-msgid "10% Gray"
-msgstr "10% siva"
-
-#: ../src/color-combo-menu.c:119
-#, no-c-format
-msgid "25% Gray"
-msgstr "25% siva"
-
-#: ../src/color-combo-menu.c:121
-#, no-c-format
-msgid "40% Gray"
-msgstr "40% siva"
-
-#: ../src/color-combo-menu.c:123
-#, no-c-format
-msgid "50% Gray"
-msgstr "50% siva"
-
-#: ../src/color-combo-menu.c:125
-#, no-c-format
-msgid "60% Gray"
-msgstr "60% siva"
-
-#: ../src/color-combo-menu.c:126
-msgid "Black"
-msgstr "Ä?rna"
-
-#: ../src/color-combo-menu.c:254
-#: ../src/color-combo-menu.c:373
-msgid "Custom Color"
-msgstr "Barva po meri"
-
-#: ../src/color-combo-menu.c:319
-#, c-format
-msgid "Custom Color #%u"
-msgstr "Barva po meri #%u"
-
-#: ../src/critical-error-handler.c:70
-msgid "gLabels Fatal Error!"
-msgstr "Usodna napaka gLables!"
-
-#: ../src/file.c:84
-msgid "New Label or Card"
-msgstr "Nova nalepka ali vizitka"
-
-#: ../src/file.c:175
-#: ../src/label.c:587
-#: ../src/label.c:631
-msgid "Label properties"
-msgstr "Lastnosti nalepke"
-
-#: ../src/file.c:267
-#: ../src/file.c:557
-msgid "All files"
-msgstr "Vse datoteke"
-
-#: ../src/file.c:272
-#: ../src/file.c:562
-msgid "gLabels documents"
-msgstr "Dokumenti gLabels"
-
-#: ../src/file.c:319
-#: ../src/file.c:620
-msgid "Empty file name selection"
-msgstr "Prazen izbor imena datoteke"
-
-#: ../src/file.c:322
-#: ../src/file.c:338
-msgid "Please select a file or supply a valid file name"
-msgstr "Izberite datoteko ali vpiÅ¡ite veljavno ime datoteke"
-
-#: ../src/file.c:335
-msgid "File does not exist"
-msgstr "Datoteka ne obstaja"
-
-#: ../src/file.c:410
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "Datoteke \"%s\" ni mogoÄ?e odpreti"
-
-#: ../src/file.c:413
-msgid "Not a supported file format"
-msgstr "Ni podprt zapis datoteke"
-
-#: ../src/file.c:491
-#: ../src/file.c:670
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "Datoteke \"%s\" ni mogoÄ?e shraniti"
-
-#: ../src/file.c:495
-#: ../src/file.c:674
-msgid "Error encountered during save.  The file is still not saved."
-msgstr "Med shranjevanjem je priÅ¡lo do napake. Datoteka Å¡e vedno ni shranjena."
-
-#: ../src/file.c:535
-#, c-format
-msgid "Save \"%s\" as"
-msgstr "Shrani \"%s\" kot"
-
-#: ../src/file.c:623
-msgid "Please supply a valid file name"
-msgstr "Vnesite veljavno ime datoteke"
-
-#: ../src/file.c:644
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "Ali naj bo datoteka \"%s\" prepisana?"
-
-#: ../src/file.c:648
-msgid "File already exists."
-msgstr "Datoteka Å¾e obstaja."
-
-#: ../src/file.c:744
-#, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "Ali Å¾elite pred zapiranjem shraniti spremembe v dokumentu \"%s\"?"
-
-#: ../src/file.c:748
-msgid "Your changes will be lost if you don't save them."
-msgstr "V primeru, da sprememb na shranite, bodo trajno izgubljene."
-
-#: ../src/file.c:751
-msgid "Close without saving"
-msgstr "Zapri brez shranjevanja"
-
-#: ../src/font-combo-menu.c:137
-msgid "Recent fonts"
-msgstr "Nedavne pisave"
-
-#: ../src/font-combo-menu.c:152
-msgid "Proportional fonts"
-msgstr "Sorazmerne pisave"
-
-#: ../src/font-combo-menu.c:160
-msgid "Fixed-width fonts"
-msgstr "Pisave stalne Å¡irine"
-
-#: ../src/font-combo-menu.c:168
-msgid "All fonts"
-msgstr "Vse pisave"
-
-#.
-#. * Allow text samples to be localized.
-#. *
-#. * FIXME: if we could extract enough meta information from the fonts
-#. * themselves, perhaps rather than setting these globally for the
-#. * current locale, they could be unique to each font family.
-#.
-#: ../src/font-combo-menu-item.c:132
-msgctxt "Short sample text"
-msgid "Aa"
-msgstr "Aa"
-
-#: ../src/font-combo-menu-item.c:134
-msgctxt "Lower case sample text"
-msgid "abcdefghijklmnopqrstuvwxyz"
-msgstr "abcÄ?defghijklmnoprsÅ¡tuvzÅ¾"
-
-#: ../src/font-combo-menu-item.c:136
-msgctxt "Upper case sample text"
-msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-msgstr "ABCÄ?DEFGHIJKLMNOPRSÅ TUVZÅ½"
-
-#: ../src/font-combo-menu-item.c:138
-msgctxt "Numbers and special characters sample text"
-msgid "0123456789 .:,;(*!?)"
-msgstr "0123456789 .:,;(*!?)"
-
-#: ../src/font-combo-menu-item.c:157
-msgid "Sample text"
-msgstr "VzorÄ?no besedilo"
-
-#: ../src/glabels-batch.c:52
-msgid "set output filename (default=\"output.pdf\")"
-msgstr "nastavi odvodno ime datoteke (privzeto=\"output.pdf\")"
-
-#: ../src/glabels-batch.c:52
-#: ../src/glabels-batch.c:66
-msgid "filename"
-msgstr "ime datoteke"
-
-#: ../src/glabels-batch.c:54
-msgid "number of sheets (default=1)"
-msgstr "Å¡tevilo delovnih listov (privzeto=1)"
-
-#: ../src/glabels-batch.c:54
-msgid "sheets"
-msgstr "delovni listi"
-
-#: ../src/glabels-batch.c:56
-msgid "number of copies (default=1)"
-msgstr "Å¡tevilo kopij (privzeto=1)"
-
-#: ../src/glabels-batch.c:56
-msgid "copies"
-msgstr "kopije"
-
-#: ../src/glabels-batch.c:58
-msgid "first label on first sheet (default=1)"
-msgstr "prva nalepka na prvem delovnem listu (privzeto=1)"
-
-#: ../src/glabels-batch.c:58
-msgid "first"
-msgstr "prva"
-
-#: ../src/glabels-batch.c:60
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:13
-msgid "print outlines (to test printer alignment)"
-msgstr "natisni orise (za preizkus poravnave tiskalnika)"
-
-#: ../src/glabels-batch.c:62
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:12
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "natisni obrnjeno (to je zrcalna slika)"
-
-#: ../src/glabels-batch.c:64
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:11
-msgid "print crop marks"
-msgstr "natisni oznake obrezave"
-
-#: ../src/glabels-batch.c:66
-msgid "input file for merging"
-msgstr "vhodna datoteka za zdruÅ¾evanje"
-
-#: ../src/glabels-batch.c:68
-#: ../src/glabels.c:64
-msgid "[FILE...]"
-msgstr "[DATOTEKA...]"
-
-#: ../src/glabels-batch.c:98
-msgid "Print files created with gLabels."
-msgstr "Tiskanje datotek ustvarjenih z gLables."
-
-#: ../src/glabels-batch.c:106
-#: ../src/glabels.c:89
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"ZaÅ¾enite '%s --help' za ogled celotnega seznama razpoloÅ¾ljivih moÅ¾nosti ukazne vrstice.\n"
-
-#: ../src/glabels-batch.c:149
-#, c-format
-msgid "cannot perform document merge with glabels file %s\n"
-msgstr "zdruÅ¾evanja dokumenta z glabels datoteko %s ni mogoÄ?e izvesti\n"
-
-#: ../src/glabels-batch.c:184
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "Datoteke glables %s ni mogoÄ?e odpreti\n"
-
-#: ../src/glabels.c:81
-msgid "Launch gLabels label and business card designer."
-msgstr "Zagon snovalnika nalepk in poslovnih vizitk gLabels. "
-
-#: ../src/label-barcode.c:154
-#: ../src/ui.c:319
-msgid "Create barcode object"
-msgstr "Ustvarjanje predmeta Ä?rtne kode"
-
-#: ../src/label-barcode.c:227
-#: ../src/label-barcode.c:389
-msgid "Barcode data"
-msgstr "Podatki Ä?rtne kode"
-
-#: ../src/label-barcode.c:263
-msgid "Barcode property"
-msgstr "Lastnost Ä?rtne kode"
-
-#: ../src/label-barcode.c:483
-msgid "Barcode data empty"
-msgstr "Podatki Ä?rtne kode so prazni"
-
-#: ../src/label-barcode.c:487
-msgid "Invalid barcode data"
-msgstr "Neveljavni podatki Ä?rtne kode"
-
-#: ../src/label-box.c:156
-msgid "Create box object"
-msgstr "Ustvari okvir"
-
-#: ../src/label-box.c:230
-#: ../src/label-ellipse.c:232
-#: ../src/stock.c:93
-#: ../data/ui/property-bar.ui.h:3
-msgid "Fill color"
-msgstr "Barva polnila"
-
-#: ../src/label-box.c:261
-#: ../src/label-ellipse.c:261
-#: ../src/label-line.c:212
-#: ../src/stock.c:94
-#: ../data/ui/property-bar.ui.h:8
-msgid "Line color"
-msgstr "Barva Ä?rte"
-
-#: ../src/label-box.c:289
-#: ../src/label-ellipse.c:290
-#: ../src/label-line.c:241
-#: ../data/ui/property-bar.ui.h:9
-msgid "Line width"
-msgstr "Å irine vrstice"
-
-#: ../src/label.c:402
-msgid "Untitled"
-msgstr "Brez naslova"
-
-#: ../src/label.c:705
-#: ../src/ui.c:422
-msgid "Merge properties"
-msgstr "Lastnosti zdruÅ¾evanja"
-
-#: ../src/label.c:1197
-#: ../src/ui.c:215
-msgid "Delete"
-msgstr "IzbriÅ¡i"
-
-#: ../src/label.c:1230
-#: ../src/ui.c:324
-msgid "Bring to front"
-msgstr "Prinesi v ospredje"
-
-#: ../src/label.c:1266
-#: ../src/ui.c:331
-msgid "Send to back"
-msgstr "PoÅ¡lji nazaj"
-
-#: ../src/label.c:1307
-msgid "Rotate"
-msgstr "Zavrti"
-
-#: ../src/label.c:1342
-#: ../src/ui.c:338
-msgid "Rotate left"
-msgstr "Zavrti levo"
-
-#: ../src/label.c:1375
-#: ../src/ui.c:345
-msgid "Rotate right"
-msgstr "Zavrti desno"
-
-#: ../src/label.c:1410
-#: ../src/ui.c:352
-msgid "Flip horizontally"
-msgstr "Zrcali vodoravno"
-
-#: ../src/label.c:1445
-#: ../src/ui.c:359
-msgid "Flip vertically"
-msgstr "Zrcali navpiÄ?no"
-
-#: ../src/label.c:1485
-#: ../src/ui.c:366
-msgid "Align left"
-msgstr "Poravnava levo"
-
-#: ../src/label.c:1542
-#: ../src/ui.c:373
-msgid "Align right"
-msgstr "Poravnava desno"
-
-#: ../src/label.c:1603
-#: ../src/ui.c:380
-msgid "Align horizontal center"
-msgstr "Poravnava vodoravne sredine"
-
-#: ../src/label.c:1679
-#: ../src/ui.c:387
-msgid "Align tops"
-msgstr "Poravnava vrhov"
-
-#: ../src/label.c:1736
-#: ../src/ui.c:394
-msgid "Align bottoms"
-msgstr "Poravnava dnov"
-
-#: ../src/label.c:1797
-#: ../src/ui.c:401
-msgid "Align vertical center"
-msgstr "Poravnava navpiÄ?ne sredine"
-
-#: ../src/label.c:1875
-#: ../src/ui.c:408
-msgid "Center horizontally"
-msgstr "Sredini vodoravno"
-
-#: ../src/label.c:1922
-#: ../src/ui.c:415
-msgid "Center vertically"
-msgstr "Sredini navpiÄ?no"
-
-#: ../src/label.c:2610
-#: ../src/label.c:2652
-#: ../src/label.c:2678
-#: ../src/ui.c:208
-msgid "Paste"
-msgstr "Prilepi"
-
-#: ../src/label-ellipse.c:160
-msgid "Create ellipse object"
-msgstr "Ustvarjanje elipso"
-
-#: ../src/label-image.c:199
-#: ../src/ui.c:312
-msgid "Create image object"
-msgstr "Ustvarjanje slikovnega predmeta"
-
-#: ../src/label-image.c:332
-#: ../src/label-image.c:473
-msgid "Set image"
-msgstr "Nastavi sliko"
-
-#: ../src/label-line.c:147
-#: ../src/ui.c:298
-msgid "Create line object"
-msgstr "Ustvarjanje Ä?rte"
-
-#: ../src/label-object.c:383
-#: ../src/label-object.c:416
-msgid "Move"
-msgstr "Premakni"
-
-#: ../src/label-object.c:467
-msgid "Resize"
-msgstr "Spremeni velikost"
-
-#: ../src/label-object.c:1185
-msgid "Shadow state"
-msgstr "Stanje sence"
-
-#: ../src/label-object.c:1228
-msgid "Shadow offset"
-msgstr "Odmik sence"
-
-#: ../src/label-object.c:1276
-msgid "Shadow color"
-msgstr "Barva sence"
-
-#: ../src/label-object.c:1319
-msgid "Shadow opacity"
-msgstr "Prekrivnost sence"
-
-#: ../src/label-text.c:279
-#: ../src/ui.c:284
-msgid "Create text object"
-msgstr "Ustvarjanje besedilnega predmeta"
-
-#: ../src/label-text.c:451
-msgid "Typing"
-msgstr "Tipkanje"
-
-#: ../src/label-text.c:584
-#: ../data/ui/property-bar.ui.h:4
-msgid "Font family"
-msgstr "DruÅ¾ina pisav"
-
-#: ../src/label-text.c:622
-#: ../data/ui/property-bar.ui.h:5
-msgid "Font size"
-msgstr "Velikost pisave"
-
-#: ../src/label-text.c:655
-msgid "Font weight"
-msgstr "TeÅ¾a pisave"
-
-#: ../src/label-text.c:688
-#: ../data/ui/property-bar.ui.h:6
-msgid "Italic"
-msgstr "LeÅ¾eÄ?e"
-
-#: ../src/label-text.c:721
-msgid "Align text"
-msgstr "Poravnaj besedilo"
-
-#: ../src/label-text.c:754
-msgid "Line spacing"
-msgstr "Razmik med vrsticami"
-
-#: ../src/label-text.c:787
-#: ../data/ui/property-bar.ui.h:11
-msgid "Text color"
-msgstr "Barva besedila"
-
-#: ../src/label-text.c:931
-msgid "Auto shrink"
-msgstr "Samodejno skrÄ?i"
-
-#: ../src/media-select.c:349
-#: ../src/media-select.c:353
-#: ../src/media-select.c:502
-#: ../src/media-select.c:701
-msgctxt "Brand"
-msgid "Any"
-msgstr "Vse"
-
-#: ../src/media-select.c:358
-#: ../src/media-select.c:871
-msgctxt "Page size"
-msgid "Any"
-msgstr "Vse"
-
-#: ../src/media-select.c:367
-#: ../src/media-select.c:370
-#: ../src/media-select.c:880
-msgctxt "Category"
-msgid "Any"
-msgstr "Vse"
-
-#: ../src/media-select.c:968
-msgid "No recent templates found."
-msgstr "Nedavnih predlog ni mogoÄ?e najti."
-
-#: ../src/media-select.c:970
-msgid "Try selecting a template in the \"Search all\" tab."
-msgstr "Poskusite izbrati predlogo v zavihku  \"IÅ¡Ä?i vse predloge\"."
-
-#. Translators: "No match" means that for the given template search criteria, there
-#. * were no matches found.
-#: ../src/media-select.c:1061
-msgid "No match."
-msgstr "Ni skladanja."
-
-#: ../src/media-select.c:1063
-msgid "Try selecting a different brand, page size or category."
-msgstr "Poskusite z izbiro druge znamke, velikosti strani ali kategorije."
-
-#: ../src/media-select.c:1157
-msgid "No custom templates found."
-msgstr "Predlog po meri ni mogoÄ?e najti."
-
-#: ../src/media-select.c:1159
-msgid "You may create new templates or try searching for pre-defined templates in the \"Search all\" tab."
-msgstr "Ustvarite lahko nove predloge ali poskusite z iskanje pred-doloÄ?enih predlog v zavihku \"IÅ¡Ä?i vse\"."
-
-#. Translators: "None" here means that no document-merge source or
-#. * method has been selected.
-#: ../src/merge.c:171
-#: ../src/merge.c:212
-#: ../src/merge.c:376
-#: ../src/merge.c:379
-msgid "None"
-msgstr "Brez"
-
-#: ../src/merge-evolution.c:316
-msgid "Couldn't construct query"
-msgstr "Poizvedbe ni mogoÄ?e izgraditi"
-
-#: ../src/merge-evolution.c:322
-#: ../src/merge-evolution.c:333
-msgid "Couldn't open addressbook."
-msgstr "Imenika ni mogoÄ?e odpreti."
-
-#: ../src/merge-evolution.c:348
-msgid "Couldn't list available fields."
-msgstr "Dostopnih polj ni mogoÄ?e razvrstiti."
-
-#: ../src/merge-evolution.c:384
-msgid "Couldn't get contacts."
-msgstr "Stikov ni mogoÄ?e dobiti."
-
-#: ../src/merge-init.c:57
-msgid "Text: Comma Separated Values (CSV)"
-msgstr "Besedilo: Z vejico loÄ?ene vrednosti (CSV)"
-
-#: ../src/merge-init.c:64
-msgid "Text: Comma Separated Values (CSV) with keys on line 1"
-msgstr "Besedilo: z vejico loÄ?ene vrednosti (CSV) s kljuÄ?i v prvi vrstici"
-
-#: ../src/merge-init.c:72
-msgid "Text: Tab Separated Values (TSV)"
-msgstr "Besedilo: s tabulatorjem loÄ?ene vrednosti (TSV)"
-
-#: ../src/merge-init.c:79
-msgid "Text: Tab Separated Values (TSV) with keys on line 1"
-msgstr "Besedilo: s tabulatorjem loÄ?ene vrednosti (TSV) s kljuÄ?i v prvi vrstici"
-
-#: ../src/merge-init.c:87
-msgid "Text: Colon separated values"
-msgstr "Besedilo: z dvopiÄ?jem loÄ?ene vrednosti"
-
-#: ../src/merge-init.c:94
-msgid "Text: Colon separated values with keys on line 1"
-msgstr "Besedilo: z dvopiÄ?jem loÄ?ene vrednosti s kljuÄ?i v prvi vrstici"
-
-#: ../src/merge-init.c:102
-msgid "Text: Semicolon separated values"
-msgstr "Besedilo: S podpiÄ?jem loÄ?ene vrednosti"
-
-#: ../src/merge-init.c:109
-msgid "Text: Semicolon separated values with keys on line 1"
-msgstr "Besedilo: z podpiÄ?jem loÄ?ene vrednosti s kljuÄ?i v prvi vrstici"
-
-#: ../src/merge-init.c:119
-msgid "Evolution Addressbook"
-msgstr "Imenik Evolution"
-
-#: ../src/merge-init.c:125
-msgid "VCards"
-msgstr "Vizitke VCard"
-
-#: ../src/merge-properties-dialog.c:282
-msgid "Merge Properties"
-msgstr "Lastnosti zdruÅ¾evanja"
-
-#: ../src/merge-properties-dialog.c:308
-#: ../src/merge-properties-dialog.c:424
-msgid "Select merge-database source"
-msgstr "Izbor vira podatkovne zbirke za zdruÅ¾evanje"
-
-#: ../src/merge-properties-dialog.c:319
-#: ../src/merge-properties-dialog.c:450
-msgid "N/A"
-msgstr "N/A"
-
-#: ../src/merge-properties-dialog.c:345
-msgid "Select"
-msgstr "Izberi"
-
-#: ../src/merge-properties-dialog.c:352
-msgid "Record/Field"
-msgstr "Posnemi/polje"
-
-#: ../src/merge-properties-dialog.c:360
-#: ../data/ui/object-editor.ui.h:9
-msgid "Data"
-msgstr "Podatki"
-
-#. Translators: "Fixed" here means that for the given document-merge method, there are
-#. * no further choices to further define the source of data.  E.g. if you select the
-#. * evolution-data-server, there are no further choices -- the source is "Fixed."
-#.
-#: ../src/merge-properties-dialog.c:443
-msgid "Fixed"
-msgstr "Nespremenljivo"
-
-#. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1074
-msgid "Up"
-msgstr "Navzgor"
-
-#: ../src/new-label-dialog.c:203
-msgid "Select Product"
-msgstr "Izberite izdelek"
-
-#: ../src/new-label-dialog.c:215
-msgid "Choose Orientation"
-msgstr "Izberite usmerite"
-
-#: ../src/new-label-dialog.c:229
-msgid "Review"
-msgstr "Pregled"
-
-#: ../src/object-editor-bc-page.c:93
-#: ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97
-#: ../src/prefs-dialog.c:339
-#: ../src/ui-property-bar.c:280
-msgid "Default"
-msgstr "Privzeto"
-
-#: ../src/object-editor.c:159
-#: ../src/object-editor.c:460
-msgid "Object properties"
-msgstr "Lastnosti predmeta"
-
-#: ../src/object-editor.c:309
-msgid "Box object properties"
-msgstr "Lastnosti okvirja"
-
-#: ../src/object-editor.c:328
-msgid "Ellipse object properties"
-msgstr "Lastnosti elipse"
-
-#: ../src/object-editor.c:347
-msgid "Line object properties"
-msgstr "Lastnosti Ä?rte"
-
-#: ../src/object-editor.c:364
-msgid "Image object properties"
-msgstr "Lastnosti slike"
-
-#: ../src/object-editor.c:381
-msgid "Text object properties"
-msgstr "Lastnosti besedila"
-
-#: ../src/object-editor.c:403
-msgid "Barcode object properties"
-msgstr "Lastnosti Ä?rtne kode"
-
-#: ../src/object-editor-edit-page.c:76
-msgid "Insert merge field"
-msgstr "Vstavi polje zdruÅ¾evanja"
-
-#: ../src/object-editor-fill-page.c:79
-#: ../src/prefs-dialog.c:345
-#: ../src/ui-property-bar.c:292
-msgid "No Fill"
-msgstr "Brez polnila"
-
-#: ../src/object-editor-image-page.c:278
-msgid "All Files"
-msgstr "Vse datoteke"
-
-#: ../src/object-editor-image-page.c:283
-msgid "All Images"
-msgstr "Vse slike"
-
-#: ../src/object-editor-image-page.c:298
-#, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/object-editor-line-page.c:79
-#: ../src/prefs-dialog.c:342
-#: ../src/ui-property-bar.c:304
-msgid "No Line"
-msgstr "Brez Ä?rte"
-
-#: ../src/prefs-dialog.c:172
-#: ../data/ui/prefs-dialog.ui.h:21
-msgid "gLabels Preferences"
-msgstr "Nastavitve programa"
-
-#. ===================================================================
-#: ../src/print-op.c:205
-#: ../src/print-op-dialog.c:217
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
-#: ../templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "Nalepke"
-
-#: ../src/stock.c:70
-msgid "_Select Mode"
-msgstr "_NaÄ?in izbora"
-
-#: ../src/stock.c:71
-msgid "_Text"
-msgstr "_Besedilo"
-
-#: ../src/stock.c:72
-msgid "_Line"
-msgstr "Ä?_rta"
-
-#: ../src/stock.c:73
-msgid "_Box"
-msgstr "_Okvir"
-
-#: ../src/stock.c:74
-msgid "_Ellipse"
-msgstr "_Elipsa"
-
-#: ../src/stock.c:75
-msgid "_Image"
-msgstr "Sl_ika"
-
-#: ../src/stock.c:76
-msgid "Bar_code"
-msgstr "Ä?rtna _koda"
-
-#: ../src/stock.c:77
-msgid "_Merge Properties"
-msgstr "_ZdruÅ¾i lastnosti"
-
-#: ../src/stock.c:78
-msgid "Object _Properties"
-msgstr "Lastnosti _predmeta"
-
-#: ../src/stock.c:79
-msgid "Bring to _Front"
-msgstr "Prinesi v _ospredje"
-
-#: ../src/stock.c:80
-msgid "Send to _Back"
-msgstr "PoÅ¡lji _nazaj"
-
-#: ../src/stock.c:81
-msgid "Rotate _Left"
-msgstr "Zavrti _levo"
-
-#: ../src/stock.c:82
-msgid "Rotate _Right"
-msgstr "Zavrti _desno"
-
-#: ../src/stock.c:83
-msgid "Flip _Horizontally"
-msgstr "Zrcali _vodoravno"
-
-#: ../src/stock.c:84
-msgid "Flip _Vertically"
-msgstr "Zrcali _navpiÄ?no"
-
-#: ../src/stock.c:85
-msgid "_Lefts"
-msgstr "_Levo"
-
-#: ../src/stock.c:86
-msgid "_Rights"
-msgstr "_Desno"
-
-#: ../src/stock.c:87
-msgid "_Centers"
-msgstr "_SrediÅ¡Ä?a"
-
-#: ../src/stock.c:88
-msgid "_Tops"
-msgstr "_Vrhovi"
-
-#: ../src/stock.c:89
-msgid "Bottoms"
-msgstr "Dna"
-
-#: ../src/stock.c:90
-msgid "Centers"
-msgstr "SrediÅ¡Ä?a"
-
-#: ../src/stock.c:91
-#: ../src/stock.c:92
-msgid "Label Ce_nter"
-msgstr "Sre_diÅ¡Ä?e nalepke"
-
-#: ../src/stock.c:95
-#: ../src/stock.c:97
-msgid "Linked"
-msgstr "Povezano"
-
-#: ../src/stock.c:96
-#: ../src/stock.c:98
-msgid "Not Linked"
-msgstr "Nepovezano"
-
-#: ../src/template-designer.c:404
-msgid "New gLabels Template"
-msgstr "Nova predloga gLabels"
-
-#: ../src/template-designer.c:461
-msgid "Welcome"
-msgstr "DobrodoÅ¡li"
-
-#: ../src/template-designer.c:500
-msgid "Name and Description"
-msgstr "Ime in opis"
-
-#: ../src/template-designer.c:548
-msgid "Page Size"
-msgstr "Velikost strani"
-
-#: ../src/template-designer.c:614
-msgid "Label or Card Shape"
-msgstr "Oblika vizitke ali nalepke"
-
-#: ../src/template-designer.c:661
-msgid "Label or Card Size"
-msgstr "Velikost vizitke ali nalepke"
-
-#: ../src/template-designer.c:760
-msgid "Label Size (round)"
-msgstr "Velikost nalepke (okrogla)"
-
-#: ../src/template-designer.c:841
-msgid "Label Size (CD/DVD)"
-msgstr "Velikost nalepke (CD/DVD)"
-
-#: ../src/template-designer.c:932
-msgid "Number of Layouts"
-msgstr "Å tevilo razporeditev"
-
-#: ../src/template-designer.c:1000
-msgid "Layout(s)"
-msgstr "Razporeditev"
-
-#: ../src/template-designer.c:1105
-msgid "Design Completed"
-msgstr "Snovanje je konÄ?ano"
-
-#: ../src/template-designer.c:1133
-msgid "Edit gLabels Template"
-msgstr "Uredi predlogo gLabels"
-
-#: ../src/template-designer.c:1422
-msgid "<span foreground='red' weight='bold'>Brand and part# match an existing template!</span>"
-msgstr "<span foreground='red' weight='bold'>Znamka in Å¡tevilka dela se skladata z obstojeÄ?o predlogo!</span>"
-
-#. Menu entries.
-#: ../src/ui.c:93
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../src/ui.c:94
-msgid "Open Recent _Files"
-msgstr "Odpri nedavne _datoteke"
-
-#: ../src/ui.c:95
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../src/ui.c:96
-msgid "_View"
-msgstr "_Pogled"
-
-#: ../src/ui.c:97
-msgid "Customize Main Toolbar"
-msgstr "Prilagodi glavno orodno vrstico"
-
-#: ../src/ui.c:98
-msgid "Customize Drawing Toolbar"
-msgstr "Prilagodi orodno vrstico risanja"
-
-#: ../src/ui.c:99
-msgid "Customize Properties Toolbar"
-msgstr "Prilagodi orodno vrstico lastnosti"
-
-#: ../src/ui.c:100
-msgid "_Objects"
-msgstr "P_redmeti"
-
-#: ../src/ui.c:101
-msgid "_Create"
-msgstr "_Ustvari"
-
-#: ../src/ui.c:102
-msgid "_Order"
-msgstr "_Razvrsti"
-
-#: ../src/ui.c:103
-msgid "_Rotate/Flip"
-msgstr "_Zavrti/zrcali"
-
-#: ../src/ui.c:104
-msgid "Align _Horizontal"
-msgstr "_Vodoravna poravnava"
-
-#: ../src/ui.c:105
-msgid "Align _Vertical"
-msgstr "_NavpiÄ?na poravnava"
-
-#: ../src/ui.c:106
-msgid "_Help"
-msgstr "Pomo_Ä?"
-
-#. Popup entries.
-#: ../src/ui.c:109
-#: ../src/ui.c:110
-msgid "Context Menu"
-msgstr "Vsebinski meni"
-
-#: ../src/ui.c:115
-msgid "_New"
-msgstr "_Novo"
-
-#: ../src/ui.c:117
-msgid "Create a new file"
-msgstr "Ustvarjanje nove datoteke"
-
-#: ../src/ui.c:122
-msgid "_Open..."
-msgstr "_Odpri ..."
-
-#: ../src/ui.c:124
-msgid "Open a file"
-msgstr "Odpiranje datoteke"
-
-#: ../src/ui.c:129
-msgid "_Save"
-msgstr "_Shrani"
-
-#: ../src/ui.c:131
-msgid "Save current file"
-msgstr "Shranjevanje trenutne datoteke"
-
-#: ../src/ui.c:136
-msgid "Save _As..."
-msgstr "Shrani _kot ..."
-
-#: ../src/ui.c:138
-msgid "Save the current file to a different name"
-msgstr "Shranjevanje trenutne datoteke z drugim imenom"
-
-#: ../src/ui.c:143
-msgid "_Print..."
-msgstr "Na_tisni ..."
-
-#: ../src/ui.c:145
-msgid "Print the current file"
-msgstr "Tiskanje trenutne datoteke"
-
-#: ../src/ui.c:150
-msgid "Properties..."
-msgstr "Lastnosti ..."
-
-#: ../src/ui.c:152
-msgid "Modify document properties"
-msgstr "Spreminjanje lastnosti dokumenta"
-
-#: ../src/ui.c:157
-msgid "Template _Designer..."
-msgstr "_Snovalnik predlog ..."
-
-#: ../src/ui.c:159
-msgid "Create a custom template"
-msgstr "Ustvarjanje predloge po meri"
-
-#: ../src/ui.c:164
-msgid "_Close"
-msgstr "_Zapri"
-
-#: ../src/ui.c:166
-msgid "Close the current file"
-msgstr "Zapri trenutno datoteko"
-
-#: ../src/ui.c:171
-msgid "_Quit"
-msgstr "_KonÄ?aj"
-
-#: ../src/ui.c:173
-msgid "Quit the program"
-msgstr "KonÄ?anje programa"
-
-#: ../src/ui.c:180
-#: ../src/ui.c:182
-#: ../src/ui.c:967
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: ../src/ui.c:187
-#: ../src/ui.c:189
-#: ../src/ui.c:974
-msgid "Redo"
-msgstr "Uveljavi"
-
-#: ../src/ui.c:194
-msgid "Cut"
-msgstr "IzreÅ¾i"
-
-#: ../src/ui.c:196
-msgid "Cut the selection"
-msgstr "Izrez izbora"
-
-#: ../src/ui.c:201
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: ../src/ui.c:203
-msgid "Copy the selection"
-msgstr "Kopiranje izbora"
-
-#: ../src/ui.c:210
-msgid "Paste the clipboard"
-msgstr "Prilepi iz odloÅ¾iÅ¡Ä?a"
-
-#: ../src/ui.c:217
-msgid "Delete the selected objects"
-msgstr "IzbriÅ¡i izbrane predmete"
-
-#: ../src/ui.c:222
-msgid "Select All"
-msgstr "Izberi vse"
-
-#: ../src/ui.c:224
-msgid "Select all objects"
-msgstr "Izbor vseh predmetov"
-
-#: ../src/ui.c:229
-msgid "Un-select All"
-msgstr "Odstrani izbor vsega"
-
-#: ../src/ui.c:231
-msgid "Remove all selections"
-msgstr "Odstrani vse izbore"
-
-#: ../src/ui.c:236
-msgid "Preferences"
-msgstr "Nastavitve"
-
-#: ../src/ui.c:238
-msgid "Configure the application"
-msgstr "Nastavitev programa"
-
-#: ../src/ui.c:245
-msgid "Zoom in"
-msgstr "PribliÅ¾aj"
-
-#: ../src/ui.c:247
-msgid "Increase magnification"
-msgstr "PribliÅ¾aj predmet"
-
-#: ../src/ui.c:252
-msgid "Zoom out"
-msgstr "Oddalji"
-
-#: ../src/ui.c:254
-msgid "Decrease magnification"
-msgstr "Oddalji predmet"
-
-#: ../src/ui.c:259
-msgid "Zoom 1 to 1"
-msgstr "Velikost 1:1"
-
-#: ../src/ui.c:261
-msgid "Restore scale to 100%"
-msgstr "Obnavljanje velikosti na 100%"
-
-#: ../src/ui.c:266
-msgid "Zoom to fit"
-msgstr "Prilagodi oknu"
-
-#: ../src/ui.c:268
-msgid "Set scale to fit window"
-msgstr "Prilagajanje velikost oknu"
-
-#: ../src/ui.c:275
-msgid "Select Mode"
-msgstr "NaÄ?in izbiranja"
-
-#: ../src/ui.c:277
-msgid "Select, move and modify objects"
-msgstr "Izbor, premikanje in spreminjanje predmetov"
-
-#: ../src/ui.c:282
-#: ../src/view-text.c:102
-#: ../data/ui/object-editor.ui.h:29
-msgid "Text"
-msgstr "Besedilo"
-
-#: ../src/ui.c:289
-msgid "Box"
-msgstr "Okvir"
-
-#: ../src/ui.c:291
-msgid "Create box/rectangle object"
-msgstr "Ustvarjanje okvirja/pravokotnika"
-
-#: ../src/ui.c:296
-#: ../data/ui/object-editor.ui.h:18
-msgid "Line"
-msgstr "Ä?rta"
-
-#: ../src/ui.c:303
-msgid "Ellipse"
-msgstr "Elipsa"
-
-#: ../src/ui.c:305
-msgid "Create ellipse/circle object"
-msgstr "Ustvarjanje elipse/kroga"
-
-#: ../src/ui.c:310
-#: ../data/ui/object-editor.ui.h:15
-msgid "Image"
-msgstr "Slika"
-
-#: ../src/ui.c:317
-msgid "Barcode"
-msgstr "Ä?rtna koda"
-
-#: ../src/ui.c:326
-msgid "Raise object to top"
-msgstr "Vzdigni predmet na vrh"
-
-#: ../src/ui.c:333
-msgid "Lower object to bottom"
-msgstr "Spusti predmet na dno"
-
-#: ../src/ui.c:340
-msgid "Rotate object 90 degrees counter-clockwise"
-msgstr "Vrtenje predmeta 90 stopinj v levo"
-
-#: ../src/ui.c:347
-msgid "Rotate object 90 degrees clockwise"
-msgstr "Vrtenje predmeta 90 stopinj v desno"
-
-#: ../src/ui.c:354
-msgid "Flip object horizontally"
-msgstr "Zrcaljenje predmeta vodoravno"
-
-#: ../src/ui.c:361
-msgid "Flip object vertically"
-msgstr "Zrcaljenje predmeta navpiÄ?no"
-
-#: ../src/ui.c:368
-msgid "Align objects to left edges"
-msgstr "Poravnava predmetov na levi rob"
-
-#: ../src/ui.c:375
-msgid "Align objects to right edges"
-msgstr "Poravnava predmetov na desni rob"
-
-#: ../src/ui.c:382
-msgid "Align objects to horizontal centers"
-msgstr "Poravnava predmetov na vodoravno srediÅ¡Ä?e"
-
-#: ../src/ui.c:389
-msgid "Align objects to top edges"
-msgstr "Poravnava predmetov na zgornji rob"
-
-#: ../src/ui.c:396
-msgid "Align objects to bottom edges"
-msgstr "Poravnava predmetov na spodni rob"
-
-#: ../src/ui.c:403
-msgid "Align objects to vertical centers"
-msgstr "Poravnava predmetov na navpiÄ?no srediÅ¡Ä?e"
-
-#: ../src/ui.c:410
-msgid "Center objects to horizontal label center"
-msgstr "Sredinjenje predmetov na vodoravno srediÅ¡Ä?e nalepke"
-
-#: ../src/ui.c:417
-msgid "Center objects to vertical label center"
-msgstr "Sredinjenje predmetov na navpiÄ?no srediÅ¡Ä?e nalepke"
-
-#: ../src/ui.c:424
-msgid "Edit merge properties"
-msgstr "Urejanje lastnosti zdruÅ¾evanja"
-
-#: ../src/ui.c:431
-msgid "Contents"
-msgstr "Vsebina"
-
-#: ../src/ui.c:433
-msgid "Open glabels manual"
-msgstr "Odpri priroÄ?nik glables"
-
-#: ../src/ui.c:438
-msgid "About..."
-msgstr "O programu ..."
-
-#: ../src/ui.c:440
-msgid "About glabels"
-msgstr "O glables"
-
-#: ../src/ui.c:450
-msgid "Property toolbar"
-msgstr "Orodna vrstica lastnosti"
-
-#: ../src/ui.c:452
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr "Sprememba vidnosti orodne vrstice lastnosti v trenutnem oknu"
-
-#: ../src/ui.c:458
-msgid "Grid"
-msgstr "MreÅ¾a"
-
-#: ../src/ui.c:460
-msgid "Change the visibility of the grid in the current window"
-msgstr "Sprememba vidnosti mreÅ¾e v trenutnem oknu"
-
-#: ../src/ui.c:466
-msgid "Markup"
-msgstr "OznaÄ?eno"
-
-#: ../src/ui.c:468
-msgid "Change the visibility of markup lines in the current window"
-msgstr "Sprememba vidnosti Ä?rt nalepke v trenutnem oknu"
-
-#: ../src/ui.c:479
-msgid "Main toolbar"
-msgstr "Glavna orodna vrstica"
-
-#: ../src/ui.c:481
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr "Sprememba vidnosti glavne orodne vrstice v trenutnem oknu"
-
-#: ../src/ui.c:487
-msgid "Drawing toolbar"
-msgstr "Orodna vrstica risanja"
-
-#: ../src/ui.c:489
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr "Sprememba vidnosti orodne vrstice risanja v trenutnem oknu"
-
-#: ../src/ui-commands.c:1135
-msgid "Glabels includes contributions from:"
-msgstr "Glabels vkljuÄ?uje prispevke od:"
-
-#: ../src/ui-commands.c:1141
-msgid "See the file AUTHORS for additional credits,"
-msgstr "Poglejte si datoteko AUTHORS za celotne zasluge,"
-
-#: ../src/ui-commands.c:1142
-msgid "or visit http://glabels.org/";
-msgstr "ali pa obiÅ¡Ä?ite http://glabels.org";
-
-#: ../src/ui-commands.c:1154
-msgid "A label and business card creation program.\n"
-msgstr "Program za snovanje nalepk in poslovnih vizitk.\n"
-
-#: ../src/ui-commands.c:1158
-msgid "translator-credits"
-msgstr "Andrej Å½nidarÅ¡iÄ? <andrej znidarsic gmail com>"
-
-#: ../src/ui-commands.c:1161
-msgid ""
-"gLabels is free software: you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation, either version 3 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"gLabels is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-msgstr ""
-"gLabels je prosto programje; lahko ga redistribuirate in/ali\n"
-"spreminjate pod pogoji GNU General Public Licence kot je objavljena\n"
-"s strani Free Software Foundation; ali razliÄ?ico 2 Licence ali (na vaÅ¡o Å¾eljo)\n"
-" katerakoli kasnejÅ¡a razliÄ?ica.\n"
-"\n"
-"Ta program je distribuiran v upanju da bo uporaben,\n"
-"toda BREZ KAKRÅ NIHKOLI ZAGOTOVIL; tudi brez impliciranih\n"
-"zagotovila za PRODAJO ali PRIMERNOST ZA DOLOÄ?EN NAMEN.\n"
-" Oglejte si GNU General Public Licence za veÄ? podrobnosti.\n"
-
-#: ../src/ui-commands.c:1190
-msgid "glabels"
-msgstr "glabels"
-
-#: ../src/warning-handler.c:69
-msgid "gLabels Error!"
-msgstr "Napaka gLables!"
-
-#: ../src/window.c:284
-msgid "(none) - gLabels"
-msgstr "(brez) - gLabels"
-
-#: ../src/window.c:485
-msgid "(modified)"
-msgstr " (spremenjeno)"
-
-#: ../src/xml-label-04.c:75
-#: ../src/xml-label.c:333
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Slabo korensko vozliÅ¡Ä?e = \"%s\""
-
-#: ../src/xml-label-04.c:123
-#: ../src/xml-label.c:416
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "slabo vozliÅ¡Ä?e = \"%s\""
-
-#: ../src/xml-label.c:199
-#: ../src/xml-label.c:237
-msgid "xmlParseFile error"
-msgstr "napaka xml datoteke razÄ?lenjevanja"
-
-#: ../src/xml-label.c:274
-msgid "No document root"
-msgstr "Ni korena dokumenta"
-
-#: ../src/xml-label.c:282
-msgid "Importing from glabels 0.1 format"
-msgstr "UvaÅ¾anje iz zapisa glables 0.1"
-
-#: ../src/xml-label.c:291
-msgid "Importing from glabels 0.4 format"
-msgstr "UvaÅ¾anje iz zapisa glables 0.4"
-
-#: ../src/xml-label.c:301
-#, c-format
-msgid "Unknown glabels Namespace -- Using %s"
-msgstr "Neznan imenski prostor glables -- uporaba %s"
-
-#: ../src/xml-label.c:370
-#, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "slabo vozliÅ¡Ä?e v vozliÅ¡Ä?u dokumenta = \"%s\""
-
-#: ../src/xml-label.c:868
-#, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "slabo vozliÅ¡Ä?e v podatkovnem vozliÅ¡Ä?u  = \"%s\""
-
-#: ../src/xml-label.c:944
-#, c-format
-msgid "Unknown embedded file format: \"%s\""
-msgstr "Neznana vkljuÄ?ena vrsta datoteke:  \"%s\""
-
-#: ../src/xml-label.c:1143
-#: ../libglabels/xml-template.c:802
-msgid "Utf8 conversion error."
-msgstr "Napaka pretvarjanja Utf8."
-
-#: ../src/xml-label.c:1150
-msgid "Problem saving xml file."
-msgstr "TeÅ¾ava med shranjevanjem xml datoteke."
-
-#. Create and append an "Other" entry.
-#. Translators: "Other" here means other page size.  Meaning a page size
-#. * other than the standard ones that libglabels knows about such as
-#. * "letter", "A4", etc.
-#: ../libglabels/db.c:270
-msgid "Other"
-msgstr "Ostalo"
-
-#. Create and append a "User defined" entry.
-#: ../libglabels/db.c:279
-msgid "User defined"
-msgstr "UporabniÅ¡ko doloÄ?eno"
-
-#: ../libglabels/db.c:665
-msgid "Unable to locate paper size definitions.  Libglabels may not be installed correctly!"
-msgstr "Definicij velikosti papirja ni mogoÄ?e najti. Libglabels morda ni pravilno nameÅ¡Ä?en!"
-
-#: ../libglabels/db.c:1057
-msgid "Unable to locate category definitions.  Libglabels may not be installed correctly!"
-msgstr "Definicij kategorije ni mogoÄ?e najti. Libglabels morda ni pravilno nameÅ¡Ä?en!"
-
-#: ../libglabels/db.c:2097
-msgid "Unable to locate any template files.  Libglabels may not be installed correctly!"
-msgstr "Datotek predlog ni mogoÄ?e najti. Libglabels morda ni pravilno nameÅ¡Ä?en!"
-
-#: ../libglabels/db.c:2164
-#, c-format
-msgid "%s full page label"
-msgstr "%s nalepka cele strani"
-
-#: ../libglabels/template.c:156
-#, c-format
-msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
-msgstr "Enakovredni del (\"%s\") za \"%s\", ni predhodno doloÄ?en."
-
-#: ../libglabels/template.c:722
-#: ../libglabels/template.c:726
-msgid "per sheet"
-msgstr "na list"
-
-#: ../libglabels/template.c:796
-#: ../libglabels/template.c:802
-#: ../libglabels/template.c:812
-#: ../libglabels/template.c:818
-msgid "diameter"
-msgstr "premer"
-
-#. The ids are identical to the absolute length units supported in
-#. the CSS2 Specification (Section 4.3.2)
-#. This table must be sorted exactly as the enumerations in lglUnits
-#. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65
-#: ../data/ui/object-editor.ui.h:40
-#: ../data/ui/prefs-dialog.ui.h:22
-msgid "points"
-msgstr "toÄ?ke"
-
-#. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66
-#: ../data/ui/object-editor.ui.h:39
-#: ../data/ui/template-designer.ui.h:62
-msgid "inches"
-msgstr "palcev"
-
-#. [LGL_UNITS_MM]
-#: ../libglabels/units.c:67
-msgid "mm"
-msgstr "mm"
-
-#. [LGL_UNITS_CM]
-#: ../libglabels/units.c:68
-msgid "cm"
-msgstr "cm"
-
-#. [LGL_UNITS_PICA]
-#: ../libglabels/units.c:69
-msgid "picas"
-msgstr "pic"
-
-#: ../libglabels/xml-template.c:223
-msgid "Missing name or brand/part attributes."
-msgstr "ManjkajoÄ?e ime ali atributa znamke/dela."
-
-#. This should always be an id, but just in case a name
-#. slips by!
-#: ../libglabels/xml-template.c:244
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
-msgstr "Neznan id velikosti strani \"%s\", poskuÅ¡anje kot ime"
-
-#: ../libglabels/xml-template.c:256
-#, c-format
-msgid "Unknown page size id or name \"%s\""
-msgstr "Neznan id velikosti strani ali ime \"%s\""
-
-#: ../libglabels/xml-template.c:275
-msgid "Forward references not supported."
-msgstr "Posredovanje sklicev ni podprto."
-
-#: ../libglabels/xml-template.c:747
-msgid "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
-msgstr "Zahtevan atribut \"znamka\" ali \"del\" manjka; poskuÅ¡anje s skrajÅ¡anim imenom. "
-
-#: ../libglabels/xml-template.c:757
-msgid "Name attribute also missing."
-msgstr "Atributi imena manjkajo."
-
-#.
-#. * Local Variables:       -- emacs
-#. * mode: C                -- emacs
-#. * c-basic-offset: 8      -- emacs
-#. * tab-width: 8           -- emacs
-#. * indent-tabs-mode: nil  -- emacs
-#. * End:                   -- emacs
-#.
-#: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>Posnemi izbiro/predogled</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "<b>Source</b>"
-msgstr "<b>Vir</b>"
-
-#: ../data/ui/merge-properties-dialog.ui.h:3
-msgid "Format:"
-msgstr "Zapis:"
-
-#: ../data/ui/merge-properties-dialog.ui.h:4
-msgid "Location:"
-msgstr "Mesto:"
-
-#: ../data/ui/merge-properties-dialog.ui.h:5
-msgid "Select all"
-msgstr "Izberi vse"
-
-#: ../data/ui/merge-properties-dialog.ui.h:6
-msgid "Unselect all"
-msgstr "PrekliÄ?i izbor vsega"
-
-#: ../data/ui/media-select.ui.h:1
-msgid "Brand:"
-msgstr "Znamka:"
-
-#: ../data/ui/media-select.ui.h:2
-msgid "Category:"
-msgstr "Kategorija:"
-
-#: ../data/ui/media-select.ui.h:3
-msgid "Custom"
-msgstr "Po meri"
-
-#: ../data/ui/media-select.ui.h:4
-#: ../data/ui/new-label-dialog.ui.h:6
-#: ../data/ui/template-designer.ui.h:42
-msgid "Page size:"
-msgstr "Velikost strani:"
-
-#: ../data/ui/media-select.ui.h:5
-msgid "Recent"
-msgstr "Nedavno"
-
-#: ../data/ui/media-select.ui.h:6
-msgid "Search all"
-msgstr "IÅ¡Ä?i vse"
-
-#: ../data/ui/new-label-dialog.ui.h:1
-msgid "Choose label or card product from hundreds of predefined templates or define your own."
-msgstr "Izberite nalepko ali kartico med stotinami pred-doloÄ?enimi predlogami ali doloÄ?ite svojo."
-
-#: ../data/ui/new-label-dialog.ui.h:2
-#: ../data/ui/template-designer.ui.h:27
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../data/ui/new-label-dialog.ui.h:3
-msgid "Label size:"
-msgstr "Velikost nalepke:"
-
-#: ../data/ui/new-label-dialog.ui.h:4
-msgid "Layout:"
-msgstr "Razpored:"
-
-#: ../data/ui/new-label-dialog.ui.h:5
-msgid "Normal"
-msgstr "ObiÄ?ajna"
-
-#: ../data/ui/new-label-dialog.ui.h:7
-#: ../data/ui/template-designer.ui.h:43
-msgid "Part #:"
-msgstr "Del Å¡t:"
-
-#: ../data/ui/new-label-dialog.ui.h:8
-msgid "Please review and confirm your selection."
-msgstr "Preglejte in potrdite svoj izbor."
-
-#: ../data/ui/new-label-dialog.ui.h:9
-msgid "Rotated"
-msgstr "Zarteno"
-
-#: ../data/ui/new-label-dialog.ui.h:10
-msgid "Select orientation of label content."
-msgstr "Izberite usmeritev vsebine nalepke."
-
-#: ../data/ui/new-label-dialog.ui.h:11
-msgid "Similar products:"
-msgstr "Podobni izdelki:"
-
-#: ../data/ui/new-label-dialog.ui.h:12
-msgid "Vendor:"
-msgstr "Ponudnik:"
-
-#: ../data/ui/object-editor.ui.h:2
-#, no-c-format
-msgid "%"
-msgstr "%"
-
-#: ../data/ui/object-editor.ui.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">lastnosti predmeta Xxx</span>"
-
-#: ../data/ui/object-editor.ui.h:4
-#: ../data/ui/prefs-dialog.ui.h:7
-msgid "Alignment:"
-msgstr "Poravnava:"
-
-#: ../data/ui/object-editor.ui.h:5
-msgid "Allow merge to automatically shrink text"
-msgstr "Dovoli samodejno skrÄ?enje besedila ob zdruÅ¾evanju"
-
-#: ../data/ui/object-editor.ui.h:6
-msgid "Angle:"
-msgstr "Kot:"
-
-#: ../data/ui/object-editor.ui.h:7
-msgid "Checksum"
-msgstr "Nadzorna vsota"
-
-#: ../data/ui/object-editor.ui.h:8
-#: ../data/ui/prefs-dialog.ui.h:8
-msgid "Color:"
-msgstr "Barva:"
-
-#: ../data/ui/object-editor.ui.h:10
-msgid "Enable shadow"
-msgstr "OmogoÄ?i senco"
-
-#: ../data/ui/object-editor.ui.h:11
-msgid "Family:"
-msgstr "DruÅ¾ina:"
-
-#: ../data/ui/object-editor.ui.h:12
-msgid "File:"
-msgstr "Datoteka:"
-
-#: ../data/ui/object-editor.ui.h:13
-msgid "Fill"
-msgstr "Polnilo"
-
-#: ../data/ui/object-editor.ui.h:14
-#: ../data/ui/template-designer.ui.h:30
-msgid "Height:"
-msgstr "ViÅ¡ina:"
-
-#: ../data/ui/object-editor.ui.h:16
-msgid "Key:"
-msgstr "KljuÄ?:"
-
-#: ../data/ui/object-editor.ui.h:17
-msgid "Length:"
-msgstr "DolÅ¾ina:"
-
-#: ../data/ui/object-editor.ui.h:19
-#: ../data/ui/prefs-dialog.ui.h:12
-msgid "Line Spacing:"
-msgstr "Razmik vrstic:"
-
-#: ../data/ui/object-editor.ui.h:20
-msgid "Literal:"
-msgstr "Dosledno:"
-
-#: ../data/ui/object-editor.ui.h:21
-msgid "Opacity:"
-msgstr "Prosojnost:"
-
-#: ../data/ui/object-editor.ui.h:22
-msgid "Position"
-msgstr "Lega"
-
-#: ../data/ui/object-editor.ui.h:23
-msgid "Reset image size"
-msgstr "Ponastavi velikost slike"
-
-#: ../data/ui/object-editor.ui.h:24
-msgid "Shadow"
-msgstr "Senca"
-
-#: ../data/ui/object-editor.ui.h:25
-msgid "Size"
-msgstr "Velikost"
-
-#: ../data/ui/object-editor.ui.h:26
-msgid "Size:"
-msgstr "Velikost:"
-
-#: ../data/ui/object-editor.ui.h:27
-msgid "Style"
-msgstr "Slog"
-
-#: ../data/ui/object-editor.ui.h:28
-msgid "Style:"
-msgstr "Slog:"
-
-#: ../data/ui/object-editor.ui.h:30
-#: ../data/ui/prefs-dialog.ui.h:20
-#: ../data/ui/template-designer.ui.h:61
-msgid "Width:"
-msgstr "Å irina:"
-
-#: ../data/ui/object-editor.ui.h:31
-msgid "X Offset:"
-msgstr "Odmik X osi:"
-
-#: ../data/ui/object-editor.ui.h:32
-msgid "X:"
-msgstr "X:"
-
-#: ../data/ui/object-editor.ui.h:33
-msgid "Y Offset:"
-msgstr "Odmik Y osi:"
-
-#: ../data/ui/object-editor.ui.h:34
-msgid "Y:"
-msgstr "Y:"
-
-#: ../data/ui/object-editor.ui.h:35
-msgid "degrees"
-msgstr "stopinje"
-
-#: ../data/ui/object-editor.ui.h:36
-msgid "dialog1"
-msgstr "pogovorno okno 1"
-
-#: ../data/ui/object-editor.ui.h:37
-msgid "digits:"
-msgstr "Å¡tevilke:"
-
-#: ../data/ui/object-editor.ui.h:38
-msgid "format:"
-msgstr "oblika:"
-
-#: ../data/ui/prefs-dialog.ui.h:1
-msgid "   "
-msgstr "   "
-
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Privzeta velikost strani</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Polnilo</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Ä?rta</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Besedilo</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Enote</span>"
-
-#: ../data/ui/prefs-dialog.ui.h:9
-msgid "Font:"
-msgstr "Pisava:"
-
-#: ../data/ui/prefs-dialog.ui.h:10
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: ../data/ui/prefs-dialog.ui.h:11
-msgid "Inches"
-msgstr "Palci"
-
-#: ../data/ui/prefs-dialog.ui.h:13
-msgid "Locale"
-msgstr "Jezikovna oznaka"
-
-#: ../data/ui/prefs-dialog.ui.h:14
-msgid "Millimeters"
-msgstr "Milimetri"
-
-#: ../data/ui/prefs-dialog.ui.h:15
-msgid "Object defaults"
-msgstr "Privzete vrednosti predmeta"
-
-#: ../data/ui/prefs-dialog.ui.h:16
-msgid "Points"
-msgstr "ToÄ?ke"
-
-#: ../data/ui/prefs-dialog.ui.h:17
-msgid "Select default properties for new objects."
-msgstr "Izbor privzeti lastnosti za nove predmete."
-
-#: ../data/ui/prefs-dialog.ui.h:18
-msgid "Select locale specific behavior."
-msgstr "Izberite z jezikovno oznako doloÄ?eno obnaÅ¡anje."
-
-#: ../data/ui/prefs-dialog.ui.h:19
-#: ../templates/paper-sizes.xml.h:35
-msgid "US Letter"
-msgstr "AmeriÅ¡ko pismo"
-
-#: ../data/ui/property-bar.ui.h:1
-msgid "Bold"
-msgstr "Krepko"
-
-#: ../data/ui/property-bar.ui.h:2
-msgid "Center align"
-msgstr "Poravnava na sredino"
-
-#: ../data/ui/property-bar.ui.h:7
-msgid "Left align"
-msgstr "Poravnava levo"
-
-#: ../data/ui/property-bar.ui.h:10
-msgid "Right align"
-msgstr "Poravnava desno"
-
-#: ../data/ui/template-designer.ui.h:1
-msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
-msgstr "(na primer \"PoÅ¡tne nalepke\", \"Poslovne vizitke\" ...)"
-
-#: ../data/ui/template-designer.ui.h:2
-msgid "(e.g., 8163A)"
-msgstr "(na primer 1000)"
-
-#: ../data/ui/template-designer.ui.h:3
-msgid "(e.g., Avery, Acme, ...)"
-msgstr "(na primer Mobitel, Simobil, ...)"
-
-#: ../data/ui/template-designer.ui.h:4
-msgid "1. Outer radius:"
-msgstr "1. Zunanji polmer:"
-
-#: ../data/ui/template-designer.ui.h:5
-msgid "1. Radius:"
-msgstr "1. Polmer:"
-
-#: ../data/ui/template-designer.ui.h:6
-msgid "1. Width:"
-msgstr "1. Å irina"
-
-#: ../data/ui/template-designer.ui.h:7
-msgid "2. Height:"
-msgstr "2. ViÅ¡ina:"
-
-#: ../data/ui/template-designer.ui.h:8
-msgid "2. Inner radius:"
-msgstr "2. Notranji polmer:"
-
-#: ../data/ui/template-designer.ui.h:9
-msgid "2. Waste (overprint allowed):"
-msgstr "2. Vmesni prostor:"
-
-#: ../data/ui/template-designer.ui.h:10
-msgid "3. Clipping width:"
-msgstr "3. Å irina odreza:"
-
-#: ../data/ui/template-designer.ui.h:11
-msgid "3. Margin"
-msgstr "3. Obroba"
-
-#: ../data/ui/template-designer.ui.h:12
-msgid "3. Round (radius of corner):"
-msgstr "3. Okroglo (polmer kota):"
-
-#: ../data/ui/template-designer.ui.h:13
-msgid "4. Clipping height:"
-msgstr "4. ViÅ¡ina odreza:"
-
-#: ../data/ui/template-designer.ui.h:14
-msgid "4. Horiz. waste (overprint allowed):"
-msgstr "5. Vodoravni vmesni prostor:"
-
-#: ../data/ui/template-designer.ui.h:15
-msgid "5. Vert. waste (overprint allowed):"
-msgstr "5. NavpiÄ?ni vmesni prostor:"
-
-#: ../data/ui/template-designer.ui.h:16
-msgid "5. Waste (overprint allowed):"
-msgstr "5. Vmesni prostor:"
-
-#: ../data/ui/template-designer.ui.h:17
-msgid "6. Margin"
-msgstr "6. Obroba"
-
-#: ../data/ui/template-designer.ui.h:18
-msgid "Brand/Manufacturer:"
-msgstr "Znamka/Izdelovalec:"
-
-#: ../data/ui/template-designer.ui.h:19
-msgid "CD/DVD (including credit card CDs)"
-msgstr "CD/DVD (vkljuÄ?ujoÄ? CD-je v obliki kreditnih kartic)"
-
-#: ../data/ui/template-designer.ui.h:20
-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."
-msgstr ""
-"Ä?estitamo!\n"
-"\n"
-"DokonÄ?ali ste snovanje predloge gLables.\n"
-"V primeru, da Å¾elite sprejeti in shraniti vaÅ¡e oblikovanje, kliknite \"Uporabi.\"\n"
-"\n"
-"V nasprotnem primeru lahko kliknete \"PrekliÄ?i\" in program konÄ?ate\n"
-"ali pa \"Nazaj\" za nadaljevanje oblikovanja."
-
-#: ../data/ui/template-designer.ui.h:28
-msgid "Distance from left edge (x0):"
-msgstr "Razdalja od levega roba (x0):"
-
-#: ../data/ui/template-designer.ui.h:29
-msgid "Distance from top edge (y0):"
-msgstr "Razdalja od zgornjega roba (y0):"
-
-#: ../data/ui/template-designer.ui.h:31
-msgid "Horizontal pitch (dx):"
-msgstr "Vodoravna razdalja (dx):"
-
-#: ../data/ui/template-designer.ui.h:32
-msgid ""
-"How many layouts will your template contain? \n"
-"\n"
-"A layout is a set of labels or cards that can be arranged in a simple grid.\n"
-"Most templates only need one layout, as in the first example.\n"
-"The second example illustrates when two layouts are needed."
-msgstr ""
-"Koliko razporeditev bo vsebovala vaÅ¡a predloga? \n"
-"\n"
-"Razporeditev je niz nalepk ali vizitk, ki je lahko urejen v preprosto mreÅ¾o.\n"
-"VeÄ?ina predlog potrebuje le eno razporeditev, kot na prvem primeru.\n"
-"Drugi primer vsebuje dve razporeditvi. "
-
-#: ../data/ui/template-designer.ui.h:37
-msgid "Layout #1"
-msgstr "Razporeditev Å¡t. 1"
-
-#: ../data/ui/template-designer.ui.h:38
-msgid "Layout #2"
-msgstr "Razporeditev Å¡t. 2"
-
-#: ../data/ui/template-designer.ui.h:39
-msgid "Number across (nx):"
-msgstr "Vodoravno Å¡tevilo (nx):"
-
-#: ../data/ui/template-designer.ui.h:40
-msgid "Number down (ny):"
-msgstr "NavpiÄ?no Å¡tevilo (ny):"
-
-#: ../data/ui/template-designer.ui.h:41
-msgid "Number of layouts:"
-msgstr "Å tevilo razporeditev:"
-
-#: ../data/ui/template-designer.ui.h:44
-msgid "Please enter the following identifying information about the template stationery."
-msgstr "Vnesite podrobnosti doloÄ?itve predloge pisalnih pripomoÄ?kov."
-
-#: ../data/ui/template-designer.ui.h:45
-msgid "Please enter the following layout information."
-msgstr "Vnesite sledeÄ?e podrobnosti razporeditve."
-
-#: ../data/ui/template-designer.ui.h:46
-msgid "Please enter the following size parameters of a single label in your template."
-msgstr "Vnesite sledeÄ?e parametre velikosti posamezne nalepke v vaÅ¡i predlogi."
-
-#: ../data/ui/template-designer.ui.h:47
-msgid "Please enter the following size parameters of a single label or card in your template."
-msgstr "Vnesite sledeÄ?e parametre velikosti posamezne nalepke ali poslovne vizitke v vaÅ¡i predlogi."
-
-#: ../data/ui/template-designer.ui.h:48
-msgid "Please select the basic shape of the labels or cards."
-msgstr "Izberite osnovno obliko nalepk ali vizitk."
-
-#: ../data/ui/template-designer.ui.h:49
-msgid "Please select the page size of the template stationery."
-msgstr "Izberite velikost strani predloge pisalnih pripomoÄ?kov."
-
-#: ../data/ui/template-designer.ui.h:50
-msgid "Print test sheet"
-msgstr "Natisni preizkusni list"
-
-#: ../data/ui/template-designer.ui.h:51
-msgid "Rectangular or square (can have rounded corners)"
-msgstr "Kvadrat ali pravokotnik (lahko ima zaokroÅ¾ene robove)"
-
-#: ../data/ui/template-designer.ui.h:52
-msgid "Round"
-msgstr "Krog"
-
-#: ../data/ui/template-designer.ui.h:53
-msgid ""
-"Templates needing\n"
-"two layouts."
-msgstr ""
-"Predloge z \n"
-"dvema razporeditvama."
-
-#: ../data/ui/template-designer.ui.h:55
-msgid ""
-"Templates needing only\n"
-"one layout."
-msgstr ""
-"Predloge z le\n"
-"eno razporeditvijo."
-
-#: ../data/ui/template-designer.ui.h:57
-msgid "Vertical pitch (dy):"
-msgstr "NavpiÄ?na razdalja (dy):"
-
-#: ../data/ui/template-designer.ui.h:58
-msgid ""
-"Welcome to the gLabels Template Designer.\n"
-"\n"
-"This dialog will assist you in the creation of a custom gLabels template."
-msgstr ""
-"DobrodoÅ¡li v snovalniku predlog gLabels.\n"
-"\n"
-"To pogovorno okno vam bo pomagalo pri ustvarjanju predloge gLables po meri."
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "<b>Copies</b>"
-msgstr "<b>Kopije</b>"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-msgid "<b>Merge Control</b>"
-msgstr "<b>Nadzor zdruÅ¾evanja</b>"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>MoÅ¾nosti</b>"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-msgid "Collate"
-msgstr "Zberi"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
-msgid "Copies:"
-msgstr "Kopije:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
-msgid "Sheets:"
-msgstr "Listi:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
-msgid "Start on label"
-msgstr "ZaÄ?ni na nalepki"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
-msgid "from:"
-msgstr "od:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
-msgid "on 1st sheet"
-msgstr "na prvem listu"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
-msgid "to:"
-msgstr "za:"
-
-#: ../data/desktop/glabels-3.0.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "Ustvarjanje nalepk, poslovnih vizitk in medijskih platnic"
-
-#: ../data/desktop/glabels-3.0.desktop.in.h:2
-msgid "gLabels Label Designer 3"
-msgstr "snovalnik nalepk gLabels 3"
-
-#: ../data/mime/glabels-3.0.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "Datoteka projekta gLabels"
-
-#. Envelopes
-#: ../templates/paper-sizes.xml.h:2
-msgid "#10 Envelope"
-msgstr "Ovojnica Å¡t. 10"
-
-#. Other ISO A series sizes
-#: ../templates/paper-sizes.xml.h:4
-msgid "A0"
-msgstr "A0"
-
-#: ../templates/paper-sizes.xml.h:5
-msgid "A1"
-msgstr "A1"
-
-#: ../templates/paper-sizes.xml.h:6
-msgid "A10"
-msgstr "A10"
-
-#: ../templates/paper-sizes.xml.h:7
-msgid "A2"
-msgstr "A2"
-
-#: ../templates/paper-sizes.xml.h:8
-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
-msgid "A5"
-msgstr "A5"
-
-#: ../templates/paper-sizes.xml.h:12
-msgid "A6"
-msgstr "A6"
-
-#: ../templates/paper-sizes.xml.h:13
-msgid "A7"
-msgstr "A7"
-
-#: ../templates/paper-sizes.xml.h:14
-msgid "A8"
-msgstr "A8"
-
-#: ../templates/paper-sizes.xml.h:15
-msgid "A9"
-msgstr "A9"
-
-#. ISO B series sizes
-#: ../templates/paper-sizes.xml.h:17
-msgid "B0"
-msgstr "B0"
-
-#: ../templates/paper-sizes.xml.h:18
-msgid "B1"
-msgstr "B1"
-
-#: ../templates/paper-sizes.xml.h:19
-msgid "B10"
-msgstr "B10"
-
-#: ../templates/paper-sizes.xml.h:20
-msgid "B2"
-msgstr "B2"
-
-#: ../templates/paper-sizes.xml.h:21
-msgid "B3"
-msgstr "B3"
-
-#: ../templates/paper-sizes.xml.h:22
-msgid "B4"
-msgstr "B4"
-
-#: ../templates/paper-sizes.xml.h:23
-msgid "B5"
-msgstr "B5"
-
-#: ../templates/paper-sizes.xml.h:24
-msgid "B6"
-msgstr "B6"
-
-#: ../templates/paper-sizes.xml.h:25
-msgid "B7"
-msgstr "B7"
-
-#: ../templates/paper-sizes.xml.h:26
-msgid "B8"
-msgstr "B8"
-
-#: ../templates/paper-sizes.xml.h:27
-msgid "B9"
-msgstr "B9"
-
-#: ../templates/paper-sizes.xml.h:28
-msgid "C5"
-msgstr "C5"
-
-#: ../templates/paper-sizes.xml.h:29
-msgid "C6"
-msgstr "C6"
-
-#: ../templates/paper-sizes.xml.h:30
-msgid "DL"
-msgstr "DL"
-
-#: ../templates/paper-sizes.xml.h:31
-msgid "Monarch Envelope"
-msgstr "Ovojnica Monarch"
-
-#: ../templates/paper-sizes.xml.h:32
-msgid "US Executive"
-msgstr "AmeriÅ¡ka izvrÅ¡ilna"
-
-#. Other US paper sizes
-#: ../templates/paper-sizes.xml.h:34
-msgid "US Legal"
-msgstr "AmeriÅ¡ka pravna"
-
-#: ../templates/categories.xml.h:1
-msgid "Any card"
-msgstr "Katerakoli vizika"
-
-#: ../templates/categories.xml.h:2
-msgid "Any label"
-msgstr "Katerakoli nalepka"
-
-#. ===================================================================
-#: ../templates/categories.xml.h:3
-#: ../templates/pearl-iso-templates.xml.h:8
-msgid "Business cards"
-msgstr "Poslovne nalepke"
-
-#: ../templates/categories.xml.h:4
-msgid "CD/DVD or other media"
-msgstr "CD/DVD ali drugi mediji"
-
-#: ../templates/categories.xml.h:5
-msgid "Mailing/shipping products"
-msgstr "PoÅ¡iljanje izdelkov po poÅ¡ti"
-
-#: ../templates/categories.xml.h:6
-msgid "Rectangular labels"
-msgstr "Pravokotne nalepke"
-
-#. ===================================================================
-#: ../templates/categories.xml.h:7
-#: ../templates/pearl-iso-templates.xml.h:46
-msgid "Round labels"
-msgstr "Okrogle nalepke"
-
-#: ../templates/categories.xml.h:8
-msgid "Square labels"
-msgstr "Kvadratne nalepke"
-
-#. ===================================================================
-#. ********************************************************************
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:2
-#: ../templates/avery-iso-templates.xml.h:2
-#: ../templates/dymo-other-templates.xml.h:4
-#: ../templates/maco-us-templates.xml.h:2
-#: ../templates/misc-iso-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 "Nalepke naslovov"
-
-#. ===================================================================
-#. ============================================================
-#. ===================================================================
-#. ********************************************************************
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:4
-#: ../templates/avery-iso-templates.xml.h:8
-#: ../templates/misc-us-templates.xml.h:4
-#: ../templates/misc-iso-templates.xml.h:12
-#: ../templates/zweckform-iso-templates.xml.h:6
-msgid "Business Cards"
-msgstr "Poslovne vizitke"
-
-#. ===================================================================
-#. ===============================================================
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:6
-#: ../templates/avery-iso-templates.xml.h:14
-#: ../templates/misc-us-templates.xml.h:8
-#: ../templates/misc-iso-templates.xml.h:16
-#: ../templates/pearl-iso-templates.xml.h:20
-#: ../templates/worldlabel-us-templates.xml.h:2
-#: ../templates/zweckform-iso-templates.xml.h:8
-msgid "CD/DVD Labels"
-msgstr "CD/DVD nalepke"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:8
-msgid "CD/DVD Labels (Disc Labels)"
-msgstr "CD/DVD nalepke (nalepke diska)"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:10
-msgid "CD/DVD Labels (Spine Labels)"
-msgstr "CD/DVD nalepke (nalepke robov)"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:12
-#: ../templates/avery-iso-templates.xml.h:16
-#: ../templates/worldlabel-us-templates.xml.h:3
-msgid "Diskette Labels"
-msgstr "Nalepke disket"
-
-#. the LSK labels can be torn in half down the center
-#: ../templates/avery-us-templates.xml.h:14
-msgid "Divider Labels"
-msgstr "Nalepke loÄ?ilnikov"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:16
-#: ../templates/avery-other-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:4
-msgid "File Folder Labels"
-msgstr "Nalepke map z datotekami"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:18
-#: ../templates/worldlabel-us-templates.xml.h:5
-msgid "Filing Labels"
-msgstr "Nalepke kartotek"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:20
-#: ../templates/worldlabel-us-templates.xml.h:6
-msgid "Full Sheet Labels"
-msgstr "Celostranske nalepke"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:22
-msgid "ID Labels"
-msgstr "ID nalepke"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:24
-msgid "Index Cards"
-msgstr "Kartice kazal"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:26
-msgid "Large Round Labels"
-msgstr "Velike okrogle nalepke"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:28
-msgid "Name Badge Labels"
-msgstr "Nalepke z imeni"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:30
-msgid "Post cards"
-msgstr "Razglednice"
-
-#. ===================================================================
-#. ********************************************************************
-#: ../templates/avery-us-templates.xml.h:32
-#: ../templates/dymo-other-templates.xml.h:12
-#: ../templates/worldlabel-us-templates.xml.h:8
-msgid "Return Address Labels"
-msgstr "Nalepke za naslov vraÄ?ila"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:34
-#: ../templates/maco-us-templates.xml.h:3
-#: ../templates/misc-us-templates.xml.h:30
-#: ../templates/worldlabel-us-templates.xml.h:9
-msgid "Round Labels"
-msgstr "Okrogle nalepke"
-
-#. ===================================================================
-#. ********************************************************************
-#: ../templates/avery-us-templates.xml.h:36
-#: ../templates/uline-us-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:10
-msgid "Shipping Labels"
-msgstr "Nalepke poÅ¡iljanja"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:38
-msgid "Small Round Labels"
-msgstr "Majhne okrogle nalepke"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:40
-msgid "Square Labels"
-msgstr "Kvadratne nalepke"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:42
-msgid "Tent Cards"
-msgstr "Karte za Å¡otorjenje"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:44
-#: ../templates/worldlabel-us-templates.xml.h:11
-msgid "Video Tape Face Labels"
-msgstr "Nalepke ploskev video kaset"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:46
-#: ../templates/worldlabel-us-templates.xml.h:12
-msgid "Video Tape Spine Labels"
-msgstr "Nalepke robov video kaset"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:4
-msgid "Address labels"
-msgstr "Nalepke naslovov"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:6
-msgid "Allround labels"
-msgstr "Vsestranske nalepke"
-
-#. ===============================================================
-#: ../templates/avery-iso-templates.xml.h:10
-msgid "CD Booklet"
-msgstr "CD polica"
-
-#. ===============================================================
-#: ../templates/avery-iso-templates.xml.h:12
-msgid "CD Inlet"
-msgstr "Robovi CD"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:18
-msgid "Diskette labels"
-msgstr "Nalepke disket"
-
-#. ===============================================================
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:20
-#: ../templates/misc-us-templates.xml.h:20
-#: ../templates/misc-iso-templates.xml.h:36
-#: ../templates/zweckform-iso-templates.xml.h:16
-msgid "Mailing Labels"
-msgstr "PoÅ¡tne nalepke"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:22
-msgid "Mailing labels"
-msgstr "PoÅ¡tne nalepke"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:24
-msgid "Mini Address Labels"
-msgstr "Mini nalepke naslovov"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:26
-msgid "Mini Labels"
-msgstr "Mini nalepke"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:28
-msgid "Shipping labels"
-msgstr "Nalepke poÅ¡iljanja"
-
-#: ../templates/brother-other-templates.xml.h:1
-msgid "Multi Purpose Labels 17mm x 54mm"
-msgstr "VeÄ?namenske nalepke 17mm x 54mm"
-
-#: ../templates/brother-other-templates.xml.h:2
-msgid "Shipping Labels 62mm x 100mm"
-msgstr "Nalepke poÅ¡iljanja 62mm x 100 mm"
-
-#.
-#. *********************************************************************
-#. *********************************************************************
-#. 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.
-#.
-#. One difference from typical templates is that the template size is
-#. not the actual media size - it is the size of the printable area,
-#. which is smaller than the media size.  This is because (at least with
-#. the Brother driver) coordinates are relative the corner of this area.
-#.
-#. *********************************************************************
-#. *********************************************************************
-#.
-#: ../templates/brother-other-templates.xml.h:20
-msgid "Standard Address Labels 29mm x 90mm"
-msgstr "Standardne nalepke naslovov 29mm x 90mm"
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:2
-msgid "3.5in Diskette"
-msgstr "3,5-palÄ?na disketa"
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:6
-msgid "File Folder"
-msgstr "Mapa z datotekami"
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:8
-msgid "Hanging Folder"
-msgstr "IzroÄ?na mapa"
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:10
-msgid "Large Address Labels"
-msgstr "Velike nalepke naslovov"
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:14
-msgid "Shipping Address Labels"
-msgstr "Nalepke naslova poÅ¡iljanja"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:2
-msgid "Business Card CD"
-msgstr "CD poslovne vizitke"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:6
-msgid "CD Template Rectangles"
-msgstr "Pravokotne CD predloge"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:10
-msgid "CD/DVD Labels (Face Only)"
-msgstr "CD/DVD nalepke (le ploskev)"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:12
-#: ../templates/misc-iso-templates.xml.h:18
-msgid "CD/DVD Labels (face only)"
-msgstr "CD/DVD nalepke (le ploskev)"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:14
-msgid "Cassette Labels"
-msgstr "Nalepke kaset"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:16
-msgid "DLT Labels"
-msgstr "Nalepke DLT"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:18
-msgid "Jewel Case Booklet"
-msgstr "KnjiÅ¾ica Å¡katlice z dragulji"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:22
-msgid "Microtube labels"
-msgstr "Nalepke Microtube"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:24
-msgid "Mini-CD Labels"
-msgstr "Nalepke mini CD-jev"
-
-#: ../templates/misc-us-templates.xml.h:25
-msgid "PRO CD Labels 2-up (CD spine only)"
-msgstr "PRO CD nalepke 2-up (le rob CD)"
-
-#: ../templates/misc-us-templates.xml.h:26
-msgid "PRO CD Labels 2-up (Face only)"
-msgstr "PRO CD nalepke 2-up (le ploskev)"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:28
-#: ../templates/misc-iso-templates.xml.h:42
-msgid "PRO CD Labels 2-up (face only)"
-msgstr "PRO CD nalepke 2-up (le ploskev)"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:32
-msgid "Slimline CD Case (rightside up)"
-msgstr "Ozko CD ohiÅ¡je (od desne navzgor)"
-
-#: ../templates/misc-us-templates.xml.h:33
-msgid "Slimline CD Case (upside down)"
-msgstr "Ozko CD ohiÅ¡je (od zgoraj navzdol)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:4
-#: ../templates/zweckform-iso-templates.xml.h:4
-msgid "Allround Labels"
-msgstr "RazliÄ?ne nalepke"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:6
-msgid "Arch File Labels"
-msgstr "Nalepke datotek arhiva"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:8
-msgid "Arch File Labels (large)"
-msgstr "Nalepke datotek arhiva (velike)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:10
-msgid "Arch File Labels (small)"
-msgstr "Nalepke datotek arhiva (majhne)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:14
-msgid "CD Labels"
-msgstr "CD nalepke"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:20
-msgid "CD/DVD Labels Standard Format (face only)"
-msgstr "ObiÄ?ajna oblika CD/DVD nalepk (le ploskev)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:22
-msgid "Diskette Labels (face only)"
-msgstr "Nalepke disket (le ploskev)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:24
-msgid "EPSON Photo Stickers 16"
-msgstr "Foto nalepke EPSON 16"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:26
-msgid "Etiketten"
-msgstr "Nalepke"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:28
-msgid "Fridge Magnet Stickers"
-msgstr "Nalepke magnetov za na hladilnik"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:30
-msgid "General Labels"
-msgstr "SploÅ¡ne nalepke"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:32
-msgid "Inkjet/Laser Labels 70x37mm"
-msgstr "Nalepke Ä?rnila/laserja 70x37mm"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:38
-msgid "Mailing Labels-2 columns"
-msgstr "PoÅ¡tne nalepke - 2 stolpca"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:40
-msgid "Mailing Labels-3 columns"
-msgstr "PoÅ¡tne nalepke - 3 stolpci"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:44
-#: ../templates/zweckform-iso-templates.xml.h:24
-msgid "Rectangular Labels"
-msgstr "Pravokotne nalepke"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:46
-msgid "Universal Labels"
-msgstr "SploÅ¡ne oznake"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:48
-msgid "Video Labels (face only)"
-msgstr "Video nalepke (le ploskev)"
-
-#. ===================================================================
-#: ../templates/misc-other-templates.xml.h:2
-msgid "Multi-Purpose Labels"
-msgstr "VeÄ?namenske nalepke"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:4
-msgid "Address Labels (STAMPIT)"
-msgstr "Nalepke naslovov (STAMPIT)"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:6
-msgid "Bottle labels"
-msgstr "Nalepke steklenic"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:10
-msgid "Business cards glossy, both sides printable"
-msgstr "BlesteÄ?e poslovne vizite, tisk na obeh straneh"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:12
-msgid "Business cards high glossy"
-msgstr "Visoko blesteÄ?e poslovne vizitke"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:14
-msgid "Business cards punched"
-msgstr "Preluknjane poslovne vizitke"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:16
-msgid "Business cards punched dull"
-msgstr "Preluknjane mraÄ?ne poslovne vizike "
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:18
-msgid "Business cards punched glossy"
-msgstr "Preluknjane blesteÄ?e poslovne vizitke"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:22
-msgid "Floppy disk labels"
-msgstr "Nalepke disket"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:24
-msgid "Foldable business cards"
-msgstr "Prepogljive poslovne vizitke"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:26
-msgid "Foldable business cards glossy/dull"
-msgstr "Prepogljive poslovne vizitke blesteÄ?e/mraÄ?ne"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:28
-msgid "Labels A4"
-msgstr "Nalepke A4"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:30
-msgid "Labels A5"
-msgstr "Nalepke A5"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:32
-msgid "Labels A6"
-msgstr "Nalepke A6"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:34
-msgid "Membership cards"
-msgstr "Ä?lanske kartice"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:36
-msgid "Membership cards, both sides printable"
-msgstr "Ä?lanske kartice, tisk na obeh straneh "
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:38
-msgid "Name plates"
-msgstr "Kartice z imeni"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:40
-msgid "Passport photo labels glossy"
-msgstr "BlesteÄ?e nalepke fotografij potnega lista"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:42
-msgid "Photo labels"
-msgstr "Nalepke fotografij"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:44
-msgid "Photo labels semiglossy"
-msgstr "Pol blesteÄ?e nalepke fotografij "
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:48
-msgid "SD card labels"
-msgstr "Nalepke kartic CD"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:50
-msgid "Self-adhesive film transparent"
-msgstr "Samolepilni prozoren film"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:52
-msgid "Self-adhesive film weatherproof"
-msgstr "Samolepilni vremensko odporni film"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:54
-msgid "Self-adhesive labels"
-msgstr "Samolepilne nalepke"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:56
-msgid "Self-adhesive window film"
-msgstr "Samolepilni okenski film"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:10
-msgid "Correction and Cover-up Labels"
-msgstr "Nalepke popravljanja in prekrivanja"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:12
-msgid "File Back Labels"
-msgstr "Nalepke predalnikov"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:14
-msgid "Lever Arch File Labels"
-msgstr "Nalepke arhivskih datotek"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:18
-msgid "Multi-purpose Stick+Lift Labels"
-msgstr "VeÄ?namenske odstranljive lepljive nalepke"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:20
-msgid "QSL-Karten Etiketten 70mm x 50,8mm"
-msgstr "Nalepke QSL-kart 70mm x 50,8 mm"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:22
-msgid "Rectangular Copier Labels"
-msgstr "Pravokotne kopirne nalepke"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:26
-msgid "Video Labels (back)"
-msgstr "Video nalepke (zadnja stran)"
-
-#~ msgid "- gLabels label designer"
-#~ msgstr "- snovalnik nalepk gLabels"
-#~ msgid "- batch process gLabels label files"
-#~ msgstr "- paketno obdelovanje datotek gLabels nalepk"
-#~ msgid "Show tooltips"
-#~ msgstr "PokaÅ¾i namige"
-#~ msgid "Show tooltips for property toolbar"
-#~ msgstr "PokaÅ¾i namige za orodno vrstico lastnosti"
-#~ msgid "Show tooltips for main toolbar"
-#~ msgstr "PokaÅ¾i namige za glavno orodno vrstico"
-#~ msgid "Show tooltips for drawing toolbar"
-#~ msgstr "PokaÅ¾i namige za orodno vrstico risanja"
-#~ msgid "xmlParseDoc error"
-#~ msgstr "napaka xmlParseDoc"
-#~ msgid "Text file with comma delimeters (CSV)"
-#~ msgstr "Besedila datoteka loÄ?ena z vejicami (CSV)"
-#~ msgid "Text file with colon delimeters"
-#~ msgstr "Besedila datoteka loÄ?ena s stolpci"
-#~ msgid "Text file with tab delimeters"
-#~ msgstr "Besedila datoteka loÄ?ena s tabulatorji"
-#~ msgid "Data from a file containing VCards"
-#~ msgstr "Podatki iz datoteke, ki vsebuje VCards"
-#~ msgid "%s x %s %s"
-#~ msgstr "%s x %s %s"
-#~ msgid "%.5g x %.5g %s"
-#~ msgstr "%.5g x %.5g %s"
-#~ msgid "%.5g %s diameter"
-#~ msgstr "%.5g %s premer"
-#~ msgid "Choose Custom Color"
-#~ msgstr "Izberite barvo po meri"
-#~ msgid "light brown"
-#~ msgstr "svetlo rjava"
-#~ msgid "brown gold"
-#~ msgstr "rjavo-zlata"
-#~ msgid "dark green #2"
-#~ msgstr "temno zelena 2"
-#~ msgid "navy"
-#~ msgstr "mornarska"
-#~ msgid "dark blue"
-#~ msgstr "temno modra"
-#~ msgid "purple #2"
-#~ msgstr "vijoliÄ?na 2"
-#~ msgid "very dark gray"
-#~ msgstr "zelo temno siva"
-#~ msgid "red-orange"
-#~ msgstr "rdeÄ?e-oranÅ¾na"
-#~ msgid "dull blue"
-#~ msgstr "mraÄ?no modra"
-#~ msgid "dull purple"
-#~ msgstr "mraÄ?no vijoliÄ?na"
-#~ msgid "dark grey"
-#~ msgstr "temno siva"
-#~ msgid "lime"
-#~ msgstr "rumeno-zelena"
-#~ msgid "dull blue #2"
-#~ msgstr "mraÄ?no modra 2"
-#~ msgid "sky blue #2"
-#~ msgstr "nebeÅ¡ko modra 2"
-#~ msgid "gray"
-#~ msgstr "siva"
-#~ msgid "magenta"
-#~ msgstr "Å¡krlatna"
-#~ msgid "bright orange"
-#~ msgstr "bistro oranÅ¾na"
-#~ msgid "bright blue"
-#~ msgstr "bistro modra"
-#~ msgid "red purple"
-#~ msgstr "rdeÄ?e vijoliÄ?na"
-#~ msgid "light grey"
-#~ msgstr "svetlo siva"
-#~ msgid "light orange"
-#~ msgstr "svetlo oranÅ¾na"
-#~ msgid "light blue"
-#~ msgstr "svetlo modra"
-#~ msgid "light purple"
-#~ msgstr "svetlo vijoliÄ?na"
-#~ msgid "purplish blue"
-#~ msgstr "vijoliÄ?no modra"
-#~ msgid "dark purple"
-#~ msgstr "temo vijoliÄ?na"
-#~ msgid "<b>Label orientation</b>"
-#~ msgstr "<b>Usmeritev nalepke</b>"
-#~ msgid "<b>Media type</b>"
-#~ msgstr "<b>Vrsta medija</b>"
-#~ msgid "00000000000 00000"
-#~ msgstr "00000000000 00000"
-#~ msgid "Select A File"
-#~ msgstr "Izbor datoteke"
-#~ msgid "<b>Print control (Simple)</b>"
-#~ msgstr "<b>Nadzor tiskanja (preprost)</b>"
-#~ msgid "Text Color"
-#~ msgstr "Barva besedila"
-#~ msgid "cd_size_page"
-#~ msgstr "stran_velikosti_cd"
-#~ msgid "finish_page"
-#~ msgstr "konÄ?na_stran"
-#~ msgid "layout_page"
-#~ msgstr "razporeditvena_stran"
-#~ msgid "nlayouts_page"
-#~ msgstr "Å¡t_razporeditev_stran"
-#~ msgid "pg_size_page"
-#~ msgstr "stran_velikosti_strani"
-#~ msgid "rect_size_page"
-#~ msgstr "pravokotna_stran"
-#~ msgid "round_size_page"
-#~ msgstr "okrogla_stran"
-#~ msgid "shape_page"
-#~ msgstr "oblikovna_stran"
-#~ msgid "start_page"
-#~ msgstr "zaÄ?etna_sran"
-#~ msgid "Recent templates"
-#~ msgstr "Nedavne predloge"
-#~ msgid "Search all templates"
-#~ msgstr "IÅ¡Ä?i po vseh predlogah"
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: moÅ¾nost `%s' je dvoumna\n"
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: moÅ¾nost `--%s' ne dovoli argumenta\n"
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: moÅ¾nost `%c%s' ne dovoli argumenta\n"
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: moÅ¾nost `%s' zahteva argument\n"
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: nepoznana moÅ¾nost `--%s'\n"
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: nepoznana moÅ¾nost `%c%s'\n"
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: neveljavna moÅ¾nost -- %c\n"
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: neveljavna moÅ¾nost -- %c\n"
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: moÅ¾nost zahteva argument -- %c\n"
-
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: glabels master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
+"PO-Revision-Date: 2010-07-03 11:22+0100\n"
+"Last-Translator: Andrej Å½nidarÅ¡iÄ? <andrej znidarsic gmail com>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (any)"
+
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (ZIP only)"
+
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP+4)"
+
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
+
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (katerakoli)"
+
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
+
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
+
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
+
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
+
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
+
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
+
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A or UPC-E)"
+
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
+
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
+
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
+
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
+
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
+
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
+
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
+
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
+
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Koda 39"
+
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Koda 128"
+
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Koda 128C"
+
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Koda 128B"
+
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "Prepleteno 2 od 5"
+
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Å tevilka Ä?rtne kode"
+
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
+
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:155 ../src/bc.c:213
+msgid "Code 93"
+msgstr "Koda 93"
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Koda 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Koda 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Koda 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Koda 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Koda 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (Podatkovna matrika)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr "GS1-128"
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Koda 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Koda 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (Podatkovna matrika)"
+
+#: ../src/bc.c:273
+#, fuzzy
+msgid "HIBC QR Code"
+msgstr "IEC18004 (QRKoda)"
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Prilepi"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Ä?rtna koda"
+
+#: ../src/bc.c:330
+#, fuzzy
+msgid "Pharmacode 2-track"
+msgstr "Podatki Ä?rtne kode"
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "IzbriÅ¡i"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (Podatkovna matrika)"
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr "IEC18004 (QRKoda)"
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+msgid "Default Color"
+msgstr "Privzeta barva"
+
+#: ../src/color-combo-menu.c:83
+msgid "Dark Red"
+msgstr "Temno rdeÄ?a"
+
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr "Rjava"
+
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr "Temna zlata palica"
+
+#: ../src/color-combo-menu.c:86
+msgid "Dark Green"
+msgstr "Temno zelena"
+
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr "Temno sinja"
+
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr "Mornarsko modra"
+
+#: ../src/color-combo-menu.c:89
+msgid "Dark Violet"
+msgstr "Temno vijoliÄ?na"
+
+#: ../src/color-combo-menu.c:91
+msgid "Red"
+msgstr "RdeÄ?a"
+
+#: ../src/color-combo-menu.c:92
+msgid "Orange"
+msgstr "OranÅ¾na"
+
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr "Temno rumena"
+
+#: ../src/color-combo-menu.c:94
+msgid "Medium green"
+msgstr "Srednja zelena"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr "Turkizna"
+
+#: ../src/color-combo-menu.c:96
+msgid "Blue"
+msgstr "Modra"
+
+#: ../src/color-combo-menu.c:97
+msgid "Purple"
+msgstr "Å krlatna"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr "Lososova"
+
+#: ../src/color-combo-menu.c:100
+msgid "Gold"
+msgstr "Zlata"
+
+#: ../src/color-combo-menu.c:101
+msgid "Yellow"
+msgstr "Rumena"
+
+#: ../src/color-combo-menu.c:102
+msgid "Green"
+msgstr "Zelena"
+
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr "Sinja"
+
+#: ../src/color-combo-menu.c:104
+msgid "SkyBlue"
+msgstr "NebeÅ¡ko modra"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr "VijoliÄ?na"
+
+#: ../src/color-combo-menu.c:107
+msgid "Pink"
+msgstr "Roza"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr "Kakijeva"
+
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
+msgstr "Svetlo rumena"
+
+#: ../src/color-combo-menu.c:110
+msgid "Light Green"
+msgstr "Svetlo zelena"
+
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
+msgstr "Svetlo sinja"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr "SkrilavÄ?no siva"
+
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
+msgstr "Osatna"
+
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr "Bela"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr "10% siva"
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr "25% siva"
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr "40% siva"
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr "50% siva"
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr "60% siva"
+
+#: ../src/color-combo-menu.c:126
+msgid "Black"
+msgstr "Ä?rna"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+msgid "Custom Color"
+msgstr "Barva po meri"
+
+#: ../src/color-combo-menu.c:319
+#, c-format
+msgid "Custom Color #%u"
+msgstr "Barva po meri #%u"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr "Usodna napaka gLables!"
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "Nova nalepka ali vizitka"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+msgid "Label properties"
+msgstr "Lastnosti nalepke"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
+msgstr "Vse datoteke"
+
+#: ../src/file.c:272 ../src/file.c:562
+msgid "gLabels documents"
+msgstr "Dokumenti gLabels"
+
+#: ../src/file.c:319 ../src/file.c:620
+msgid "Empty file name selection"
+msgstr "Prazen izbor imena datoteke"
+
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
+msgstr "Izberite datoteko ali vpiÅ¡ite veljavno ime datoteke"
+
+#: ../src/file.c:335
+msgid "File does not exist"
+msgstr "Datoteka ne obstaja"
+
+#: ../src/file.c:410
+#, c-format
+msgid "Could not open file \"%s\""
+msgstr "Datoteke \"%s\" ni mogoÄ?e odpreti"
+
+#: ../src/file.c:413
+msgid "Not a supported file format"
+msgstr "Ni podprt zapis datoteke"
+
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
+msgid "Could not save file \"%s\""
+msgstr "Datoteke \"%s\" ni mogoÄ?e shraniti"
+
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
+msgstr "Med shranjevanjem je priÅ¡lo do napake. Datoteka Å¡e vedno ni shranjena."
+
+#: ../src/file.c:535
+#, c-format
+msgid "Save \"%s\" as"
+msgstr "Shrani \"%s\" kot"
+
+#: ../src/file.c:623
+msgid "Please supply a valid file name"
+msgstr "Vnesite veljavno ime datoteke"
+
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
+msgstr "Ali naj bo datoteka \"%s\" prepisana?"
+
+#: ../src/file.c:648
+msgid "File already exists."
+msgstr "Datoteka Å¾e obstaja."
+
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
+msgstr "Ali Å¾elite pred zapiranjem shraniti spremembe v dokumentu \"%s\"?"
+
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
+msgstr "V primeru, da sprememb na shranite, bodo trajno izgubljene."
+
+#: ../src/file.c:751
+msgid "Close without saving"
+msgstr "Zapri brez shranjevanja"
+
+#: ../src/font-combo-menu.c:137
+msgid "Recent fonts"
+msgstr "Nedavne pisave"
+
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr "Sorazmerne pisave"
+
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr "Pisave stalne Å¡irine"
+
+#: ../src/font-combo-menu.c:168
+msgid "All fonts"
+msgstr "Vse pisave"
+
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr "Aa"
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr "abcÄ?defghijklmnoprsÅ¡tuvzÅ¾"
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr "ABCÄ?DEFGHIJKLMNOPRSÅ TUVZÅ½"
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr "0123456789 .:,;(*!?)"
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr "VzorÄ?no besedilo"
+
+#: ../src/glabels-batch.c:53
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "nastavi odvodno ime datoteke (privzeto=\"output.pdf\")"
+
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
+msgid "filename"
+msgstr "ime datoteke"
+
+#: ../src/glabels-batch.c:55
+msgid "number of sheets (default=1)"
+msgstr "Å¡tevilo delovnih listov (privzeto=1)"
+
+#: ../src/glabels-batch.c:55
+msgid "sheets"
+msgstr "delovni listi"
+
+#: ../src/glabels-batch.c:57
+msgid "number of copies (default=1)"
+msgstr "Å¡tevilo kopij (privzeto=1)"
+
+#: ../src/glabels-batch.c:57
+msgid "copies"
+msgstr "kopije"
+
+#: ../src/glabels-batch.c:59
+msgid "first label on first sheet (default=1)"
+msgstr "prva nalepka na prvem delovnem listu (privzeto=1)"
+
+#: ../src/glabels-batch.c:59
+msgid "first"
+msgstr "prva"
+
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "natisni orise (za preizkus poravnave tiskalnika)"
+
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "natisni obrnjeno (to je zrcalna slika)"
+
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
+msgstr "natisni oznake obrezave"
+
+#: ../src/glabels-batch.c:67
+msgid "input file for merging"
+msgstr "vhodna datoteka za zdruÅ¾evanje"
+
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[DATOTEKA...]"
+
+#: ../src/glabels-batch.c:99
+msgid "Print files created with gLabels."
+msgstr "Tiskanje datotek ustvarjenih z gLables."
+
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"ZaÅ¾enite '%s --help' za ogled celotnega seznama razpoloÅ¾ljivih moÅ¾nosti "
+"ukazne vrstice.\n"
+
+#: ../src/glabels-batch.c:151
+#, c-format
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "zdruÅ¾evanja dokumenta z glabels datoteko %s ni mogoÄ?e izvesti\n"
+
+#: ../src/glabels-batch.c:186
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "Datoteke glables %s ni mogoÄ?e odpreti\n"
+
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr "Zagon snovalnika nalepk in poslovnih vizitk gLabels. "
+
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Ustvarjanje predmeta Ä?rtne kode"
+
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+msgid "Barcode data"
+msgstr "Podatki Ä?rtne kode"
+
+#: ../src/label-barcode.c:263
+msgid "Barcode property"
+msgstr "Lastnost Ä?rtne kode"
+
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr "Podatki Ä?rtne kode so prazni"
+
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "Neveljavni podatki Ä?rtne kode"
+
+#: ../src/label-box.c:156
+msgid "Create box object"
+msgstr "Ustvari okvir"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "Barva polnila"
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "Barva Ä?rte"
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "Å irine vrstice"
+
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "Brez naslova"
+
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Lastnosti zdruÅ¾evanja"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "IzbriÅ¡i"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "Prinesi v ospredje"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr "PoÅ¡lji nazaj"
+
+#: ../src/label.c:1307
+msgid "Rotate"
+msgstr "Zavrti"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Zavrti levo"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Zavrti desno"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "Zrcali vodoravno"
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "Zrcali navpiÄ?no"
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "Poravnava levo"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "Poravnava desno"
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Poravnava vodoravne sredine"
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Poravnava vrhov"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Poravnava dnov"
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Poravnava navpiÄ?ne sredine"
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "Sredini vodoravno"
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "Sredini navpiÄ?no"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "Prilepi"
+
+#: ../src/label-ellipse.c:160
+msgid "Create ellipse object"
+msgstr "Ustvarjanje elipso"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Ustvarjanje slikovnega predmeta"
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+msgid "Set image"
+msgstr "Nastavi sliko"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Ustvarjanje Ä?rte"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr "Premakni"
+
+#: ../src/label-object.c:467
+msgid "Resize"
+msgstr "Spremeni velikost"
+
+#: ../src/label-object.c:1185
+msgid "Shadow state"
+msgstr "Stanje sence"
+
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
+msgstr "Odmik sence"
+
+#: ../src/label-object.c:1276
+msgid "Shadow color"
+msgstr "Barva sence"
+
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
+msgstr "Prekrivnost sence"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Ustvarjanje besedilnega predmeta"
+
+#: ../src/label-text.c:451
+msgid "Typing"
+msgstr "Tipkanje"
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "DruÅ¾ina pisav"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Velikost pisave"
+
+#: ../src/label-text.c:655
+msgid "Font weight"
+msgstr "TeÅ¾a pisave"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "LeÅ¾eÄ?e"
+
+#: ../src/label-text.c:721
+msgid "Align text"
+msgstr "Poravnaj besedilo"
+
+#: ../src/label-text.c:754
+msgid "Line spacing"
+msgstr "Razmik med vrsticami"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "Barva besedila"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr "Samodejno skrÄ?i"
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+msgctxt "Brand"
+msgid "Any"
+msgstr "Vse"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
+msgstr "Vse"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
+msgstr "Vse"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "Nedavnih predlog ni mogoÄ?e najti."
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr "Poskusite izbrati predlogo v zavihku  \"IÅ¡Ä?i vse predloge\"."
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr "Ni skladanja."
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr "Poskusite z izbiro druge znamke, velikosti strani ali kategorije."
+
+#: ../src/media-select.c:1157
+msgid "No custom templates found."
+msgstr "Predlog po meri ni mogoÄ?e najti."
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+"Ustvarite lahko nove predloge ali poskusite z iskanje pred-doloÄ?enih predlog "
+"v zavihku \"IÅ¡Ä?i vse\"."
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "Brez"
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr "Poizvedbe ni mogoÄ?e izgraditi"
+
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+msgid "Couldn't open addressbook."
+msgstr "Imenika ni mogoÄ?e odpreti."
+
+#: ../src/merge-evolution.c:348
+msgid "Couldn't list available fields."
+msgstr "Dostopnih polj ni mogoÄ?e razvrstiti."
+
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr "Stikov ni mogoÄ?e dobiti."
+
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr "Besedilo: Z vejico loÄ?ene vrednosti (CSV)"
+
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr "Besedilo: z vejico loÄ?ene vrednosti (CSV) s kljuÄ?i v prvi vrstici"
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr "Besedilo: s tabulatorjem loÄ?ene vrednosti (TSV)"
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+"Besedilo: s tabulatorjem loÄ?ene vrednosti (TSV) s kljuÄ?i v prvi vrstici"
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr "Besedilo: z dvopiÄ?jem loÄ?ene vrednosti"
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr "Besedilo: z dvopiÄ?jem loÄ?ene vrednosti s kljuÄ?i v prvi vrstici"
+
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr "Besedilo: S podpiÄ?jem loÄ?ene vrednosti"
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr "Besedilo: z podpiÄ?jem loÄ?ene vrednosti s kljuÄ?i v prvi vrstici"
+
+#: ../src/merge-init.c:119
+msgid "Evolution Addressbook"
+msgstr "Imenik Evolution"
+
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr "Vizitke VCard"
+
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Lastnosti zdruÅ¾evanja"
+
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Izbor vira podatkovne zbirke za zdruÅ¾evanje"
+
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Izberi"
+
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Posnemi/polje"
+
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "Podatki"
+
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+msgid "Fixed"
+msgstr "Nespremenljivo"
+
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr "Navzgor"
+
+#: ../src/new-label-dialog.c:203
+msgid "Select Product"
+msgstr "Izberite izdelek"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr "Izberite usmerite"
+
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr "Pregled"
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "Lastnosti predmeta"
+
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "Lastnosti okvirja"
+
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "Lastnosti elipse"
+
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "Lastnosti Ä?rte"
+
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "Lastnosti slike"
+
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "Lastnosti besedila"
+
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "Lastnosti Ä?rtne kode"
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Vstavi polje zdruÅ¾evanja"
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+msgid "No Fill"
+msgstr "Brez polnila"
+
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
+msgstr "Vse datoteke"
+
+#: ../src/object-editor-image-page.c:283
+msgid "All Images"
+msgstr "Vse slike"
+
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr "%s (*.%s)"
+
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+msgid "No Line"
+msgstr "Brez Ä?rte"
+
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "Nastavitve programa"
+
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "Nalepke"
+
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "_NaÄ?in izbora"
+
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "_Besedilo"
+
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "Ä?_rta"
+
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "_Okvir"
+
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "_Elipsa"
+
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "Sl_ika"
+
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "Ä?rtna _koda"
+
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "_ZdruÅ¾i lastnosti"
+
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "Lastnosti _predmeta"
+
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "Prinesi v _ospredje"
+
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "PoÅ¡lji _nazaj"
+
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "Zavrti _levo"
+
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "Zavrti _desno"
+
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "Zrcali _vodoravno"
+
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "Zrcali _navpiÄ?no"
+
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "_Levo"
+
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "_Desno"
+
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "_SrediÅ¡Ä?a"
+
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "_Vrhovi"
+
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "Dna"
+
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "SrediÅ¡Ä?a"
+
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "Sre_diÅ¡Ä?e nalepke"
+
+#: ../src/stock.c:95 ../src/stock.c:97
+msgid "Linked"
+msgstr "Povezano"
+
+#: ../src/stock.c:96 ../src/stock.c:98
+msgid "Not Linked"
+msgstr "Nepovezano"
+
+#: ../src/template-designer.c:404
+msgid "New gLabels Template"
+msgstr "Nova predloga gLabels"
+
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr "DobrodoÅ¡li"
+
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "Ime in opis"
+
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Velikost strani"
+
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Oblika vizitke ali nalepke"
+
+#: ../src/template-designer.c:661
+msgid "Label or Card Size"
+msgstr "Velikost vizitke ali nalepke"
+
+#: ../src/template-designer.c:760
+msgid "Label Size (round)"
+msgstr "Velikost nalepke (okrogla)"
+
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Velikost nalepke (CD/DVD)"
+
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "Å tevilo razporeditev"
+
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "Razporeditev"
+
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "Snovanje je konÄ?ano"
+
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
+msgstr "Uredi predlogo gLabels"
+
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
+msgstr ""
+"<span foreground='red' weight='bold'>Znamka in Å¡tevilka dela se skladata z "
+"obstojeÄ?o predlogo!</span>"
+
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../src/ui.c:94
+msgid "Open Recent _Files"
+msgstr "Odpri nedavne _datoteke"
+
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
+msgstr "Prilagodi glavno orodno vrstico"
+
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
+msgstr "Prilagodi orodno vrstico risanja"
+
+#: ../src/ui.c:99
+msgid "Customize Properties Toolbar"
+msgstr "Prilagodi orodno vrstico lastnosti"
+
+#: ../src/ui.c:100
+msgid "_Objects"
+msgstr "P_redmeti"
+
+#: ../src/ui.c:101
+msgid "_Create"
+msgstr "_Ustvari"
+
+#: ../src/ui.c:102
+msgid "_Order"
+msgstr "_Razvrsti"
+
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "_Zavrti/zrcali"
+
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
+msgstr "_Vodoravna poravnava"
+
+#: ../src/ui.c:105
+msgid "Align _Vertical"
+msgstr "_NavpiÄ?na poravnava"
+
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "Pomo_Ä?"
+
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+msgid "Context Menu"
+msgstr "Vsebinski meni"
+
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "_Novo"
+
+#: ../src/ui.c:117
+msgid "Create a new file"
+msgstr "Ustvarjanje nove datoteke"
+
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "_Odpri ..."
+
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "Odpiranje datoteke"
+
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "_Shrani"
+
+#: ../src/ui.c:131
+msgid "Save current file"
+msgstr "Shranjevanje trenutne datoteke"
+
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "Shrani _kot ..."
+
+#: ../src/ui.c:138
+msgid "Save the current file to a different name"
+msgstr "Shranjevanje trenutne datoteke z drugim imenom"
+
+#: ../src/ui.c:143
+msgid "_Print..."
+msgstr "Na_tisni ..."
+
+#: ../src/ui.c:145
+msgid "Print the current file"
+msgstr "Tiskanje trenutne datoteke"
+
+#: ../src/ui.c:150
+msgid "Properties..."
+msgstr "Lastnosti ..."
+
+#: ../src/ui.c:152
+msgid "Modify document properties"
+msgstr "Spreminjanje lastnosti dokumenta"
+
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr "_Snovalnik predlog ..."
+
+#: ../src/ui.c:159
+msgid "Create a custom template"
+msgstr "Ustvarjanje predloge po meri"
+
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "_Zapri"
+
+#: ../src/ui.c:166
+msgid "Close the current file"
+msgstr "Zapri trenutno datoteko"
+
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "_KonÄ?aj"
+
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "KonÄ?anje programa"
+
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "Razveljavi"
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr "Uveljavi"
+
+#: ../src/ui.c:194
+msgid "Cut"
+msgstr "IzreÅ¾i"
+
+#: ../src/ui.c:196
+msgid "Cut the selection"
+msgstr "Izrez izbora"
+
+#: ../src/ui.c:201
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: ../src/ui.c:203
+msgid "Copy the selection"
+msgstr "Kopiranje izbora"
+
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
+msgstr "Prilepi iz odloÅ¾iÅ¡Ä?a"
+
+#: ../src/ui.c:217
+msgid "Delete the selected objects"
+msgstr "IzbriÅ¡i izbrane predmete"
+
+#: ../src/ui.c:222
+msgid "Select All"
+msgstr "Izberi vse"
+
+#: ../src/ui.c:224
+msgid "Select all objects"
+msgstr "Izbor vseh predmetov"
+
+#: ../src/ui.c:229
+msgid "Un-select All"
+msgstr "Odstrani izbor vsega"
+
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "Odstrani vse izbore"
+
+#: ../src/ui.c:236
+msgid "Preferences"
+msgstr "Nastavitve"
+
+#: ../src/ui.c:238
+msgid "Configure the application"
+msgstr "Nastavitev programa"
+
+#: ../src/ui.c:245
+msgid "Zoom in"
+msgstr "PribliÅ¾aj"
+
+#: ../src/ui.c:247
+msgid "Increase magnification"
+msgstr "PribliÅ¾aj predmet"
+
+#: ../src/ui.c:252
+msgid "Zoom out"
+msgstr "Oddalji"
+
+#: ../src/ui.c:254
+msgid "Decrease magnification"
+msgstr "Oddalji predmet"
+
+#: ../src/ui.c:259
+msgid "Zoom 1 to 1"
+msgstr "Velikost 1:1"
+
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
+msgstr "Obnavljanje velikosti na 100%"
+
+#: ../src/ui.c:266
+msgid "Zoom to fit"
+msgstr "Prilagodi oknu"
+
+#: ../src/ui.c:268
+msgid "Set scale to fit window"
+msgstr "Prilagajanje velikost oknu"
+
+#: ../src/ui.c:275
+msgid "Select Mode"
+msgstr "NaÄ?in izbiranja"
+
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "Izbor, premikanje in spreminjanje predmetov"
+
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Text"
+msgstr "Besedilo"
+
+#: ../src/ui.c:289
+msgid "Box"
+msgstr "Okvir"
+
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "Ustvarjanje okvirja/pravokotnika"
+
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Line"
+msgstr "Ä?rta"
+
+#: ../src/ui.c:303
+msgid "Ellipse"
+msgstr "Elipsa"
+
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "Ustvarjanje elipse/kroga"
+
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
+msgid "Image"
+msgstr "Slika"
+
+#: ../src/ui.c:317
+msgid "Barcode"
+msgstr "Ä?rtna koda"
+
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr "Vzdigni predmet na vrh"
+
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
+msgstr "Spusti predmet na dno"
+
+#: ../src/ui.c:340
+msgid "Rotate object 90 degrees counter-clockwise"
+msgstr "Vrtenje predmeta 90 stopinj v levo"
+
+#: ../src/ui.c:347
+msgid "Rotate object 90 degrees clockwise"
+msgstr "Vrtenje predmeta 90 stopinj v desno"
+
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
+msgstr "Zrcaljenje predmeta vodoravno"
+
+#: ../src/ui.c:361
+msgid "Flip object vertically"
+msgstr "Zrcaljenje predmeta navpiÄ?no"
+
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
+msgstr "Poravnava predmetov na levi rob"
+
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
+msgstr "Poravnava predmetov na desni rob"
+
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
+msgstr "Poravnava predmetov na vodoravno srediÅ¡Ä?e"
+
+#: ../src/ui.c:389
+msgid "Align objects to top edges"
+msgstr "Poravnava predmetov na zgornji rob"
+
+#: ../src/ui.c:396
+msgid "Align objects to bottom edges"
+msgstr "Poravnava predmetov na spodni rob"
+
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
+msgstr "Poravnava predmetov na navpiÄ?no srediÅ¡Ä?e"
+
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr "Sredinjenje predmetov na vodoravno srediÅ¡Ä?e nalepke"
+
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr "Sredinjenje predmetov na navpiÄ?no srediÅ¡Ä?e nalepke"
+
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "Urejanje lastnosti zdruÅ¾evanja"
+
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr "Vsebina"
+
+#: ../src/ui.c:433
+msgid "Open glabels manual"
+msgstr "Odpri priroÄ?nik glables"
+
+#: ../src/ui.c:438
+msgid "About..."
+msgstr "O programu ..."
+
+#: ../src/ui.c:440
+msgid "About glabels"
+msgstr "O glables"
+
+#: ../src/ui.c:450
+msgid "Property toolbar"
+msgstr "Orodna vrstica lastnosti"
+
+#: ../src/ui.c:452
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr "Sprememba vidnosti orodne vrstice lastnosti v trenutnem oknu"
+
+#: ../src/ui.c:458
+msgid "Grid"
+msgstr "MreÅ¾a"
+
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr "Sprememba vidnosti mreÅ¾e v trenutnem oknu"
+
+#: ../src/ui.c:466
+msgid "Markup"
+msgstr "OznaÄ?eno"
+
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
+msgstr "Sprememba vidnosti Ä?rt nalepke v trenutnem oknu"
+
+#: ../src/ui.c:479
+msgid "Main toolbar"
+msgstr "Glavna orodna vrstica"
+
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
+msgstr "Sprememba vidnosti glavne orodne vrstice v trenutnem oknu"
+
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
+msgstr "Orodna vrstica risanja"
+
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
+msgstr "Sprememba vidnosti orodne vrstice risanja v trenutnem oknu"
+
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr "Glabels vkljuÄ?uje prispevke od:"
+
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
+msgstr "Poglejte si datoteko AUTHORS za celotne zasluge,"
+
+#: ../src/ui-commands.c:1142
+msgid "or visit http://glabels.org/";
+msgstr "ali pa obiÅ¡Ä?ite http://glabels.org";
+
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
+msgstr "Program za snovanje nalepk in poslovnih vizitk.\n"
+
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
+msgstr "Andrej Å½nidarÅ¡iÄ? <andrej znidarsic gmail com>"
+
+#: ../src/ui-commands.c:1161
+msgid ""
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+msgstr ""
+"gLabels je prosto programje; lahko ga redistribuirate in/ali\n"
+"spreminjate pod pogoji GNU General Public Licence kot je objavljena\n"
+"s strani Free Software Foundation; ali razliÄ?ico 2 Licence ali (na vaÅ¡o "
+"Å¾eljo)\n"
+" katerakoli kasnejÅ¡a razliÄ?ica.\n"
+"\n"
+"Ta program je distribuiran v upanju da bo uporaben,\n"
+"toda BREZ KAKRÅ NIHKOLI ZAGOTOVIL; tudi brez impliciranih\n"
+"zagotovila za PRODAJO ali PRIMERNOST ZA DOLOÄ?EN NAMEN.\n"
+" Oglejte si GNU General Public Licence za veÄ? podrobnosti.\n"
+
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "glabels"
+
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "Napaka gLables!"
+
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(brez) - gLabels"
+
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr " (spremenjeno)"
+
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "Slabo korensko vozliÅ¡Ä?e = \"%s\""
+
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "slabo vozliÅ¡Ä?e = \"%s\""
+
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
+msgid "xmlParseFile error"
+msgstr "napaka xml datoteke razÄ?lenjevanja"
+
+#: ../src/xml-label.c:274
+msgid "No document root"
+msgstr "Ni korena dokumenta"
+
+#: ../src/xml-label.c:282
+msgid "Importing from glabels 0.1 format"
+msgstr "UvaÅ¾anje iz zapisa glables 0.1"
+
+#: ../src/xml-label.c:291
+msgid "Importing from glabels 0.4 format"
+msgstr "UvaÅ¾anje iz zapisa glables 0.4"
+
+#: ../src/xml-label.c:301
+#, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "Neznan imenski prostor glables -- uporaba %s"
+
+#: ../src/xml-label.c:370
+#, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "slabo vozliÅ¡Ä?e v vozliÅ¡Ä?u dokumenta = \"%s\""
+
+#: ../src/xml-label.c:868
+#, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "slabo vozliÅ¡Ä?e v podatkovnem vozliÅ¡Ä?u  = \"%s\""
+
+#: ../src/xml-label.c:944
+#, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Neznana vkljuÄ?ena vrsta datoteke:  \"%s\""
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr "Napaka pretvarjanja Utf8."
+
+#: ../src/xml-label.c:1157
+msgid "Problem saving xml file."
+msgstr "TeÅ¾ava med shranjevanjem xml datoteke."
+
+#. Create and append an "Other" entry.
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
+msgid "Other"
+msgstr "Ostalo"
+
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
+msgid "User defined"
+msgstr "UporabniÅ¡ko doloÄ?eno"
+
+#: ../libglabels/db.c:665
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
+"Definicij velikosti papirja ni mogoÄ?e najti. Libglabels morda ni pravilno "
+"nameÅ¡Ä?en!"
+
+#: ../libglabels/db.c:1057
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
+"Definicij kategorije ni mogoÄ?e najti. Libglabels morda ni pravilno nameÅ¡Ä?en!"
+
+#: ../libglabels/db.c:2097
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
+"Datotek predlog ni mogoÄ?e najti. Libglabels morda ni pravilno nameÅ¡Ä?en!"
+
+#: ../libglabels/db.c:2164
+#, c-format
+msgid "%s full page label"
+msgstr "%s nalepka cele strani"
+
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr "Enakovredni del (\"%s\") za \"%s\", ni predhodno doloÄ?en."
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr ""
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
+msgstr "na list"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+msgid "diameter"
+msgstr "premer"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "toÄ?ke"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "palcev"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr "cm"
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr "pic"
+
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr "ManjkajoÄ?e ime ali atributa znamke/dela."
+
+#. This should always be an id, but just in case a name
+#. slips by!
+#: ../libglabels/xml-template.c:244
+#, c-format
+msgid "Unknown page size id \"%s\", trying as name"
+msgstr "Neznan id velikosti strani \"%s\", poskuÅ¡anje kot ime"
+
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
+msgstr "Neznan id velikosti strani ali ime \"%s\""
+
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr "Posredovanje sklicev ni podprto."
+
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
+"Zahtevan atribut \"znamka\" ali \"del\" manjka; poskuÅ¡anje s skrajÅ¡anim "
+"imenom. "
+
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr "Atributi imena manjkajo."
+
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
+msgid "Format:"
+msgstr "Zapis:"
+
+#: ../data/ui/merge-properties-dialog.ui.h:2
+msgid "Location:"
+msgstr "Mesto:"
+
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>Posnemi izbiro/predogled</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
+msgid "Select all"
+msgstr "Izberi vse"
+
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>Vir</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
+msgid "Unselect all"
+msgstr "PrekliÄ?i izbor vsega"
+
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr "Znamka:"
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Kategorija:"
+
+#: ../data/ui/media-select.ui.h:3
+msgid "Custom"
+msgstr "Po meri"
+
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "Velikost strani:"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr "Nedavno"
+
+#: ../data/ui/media-select.ui.h:6
+msgid "Search all"
+msgstr "IÅ¡Ä?i vse"
+
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
+msgstr ""
+"Izberite nalepko ali kartico med stotinami pred-doloÄ?enimi predlogami ali "
+"doloÄ?ite svojo."
+
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Velikost nalepke:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "Razpored:"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+msgid "Normal"
+msgstr "ObiÄ?ajna"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "Del Å¡t:"
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr "Preglejte in potrdite svoj izbor."
+
+#: ../data/ui/new-label-dialog.ui.h:9
+msgid "Rotated"
+msgstr "Zarteno"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr "Izberite usmeritev vsebine nalepke."
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr "Podobni izdelki:"
+
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr "Ponudnik:"
+
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
+msgid "Alignment:"
+msgstr "Poravnava:"
+
+#: ../data/ui/object-editor.ui.h:4
+msgid "Allow merge to automatically shrink text"
+msgstr "Dovoli samodejno skrÄ?enje besedila ob zdruÅ¾evanju"
+
+#: ../data/ui/object-editor.ui.h:5
+msgid "Angle:"
+msgstr "Kot:"
+
+#: ../data/ui/object-editor.ui.h:6
+msgid "Checksum"
+msgstr "Nadzorna vsota"
+
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
+msgid "Color:"
+msgstr "Barva:"
+
+#: ../data/ui/object-editor.ui.h:9
+msgid "Enable shadow"
+msgstr "OmogoÄ?i senco"
+
+#: ../data/ui/object-editor.ui.h:10
+msgid "Family:"
+msgstr "DruÅ¾ina:"
+
+#: ../data/ui/object-editor.ui.h:11
+msgid "File:"
+msgstr "Datoteka:"
+
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
+msgid "Fill"
+msgstr "Polnilo"
+
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
+msgid "Height:"
+msgstr "ViÅ¡ina:"
+
+#: ../data/ui/object-editor.ui.h:15
+msgid "Key:"
+msgstr "KljuÄ?:"
+
+#: ../data/ui/object-editor.ui.h:16
+msgid "Length:"
+msgstr "DolÅ¾ina:"
+
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
+msgid "Line Spacing:"
+msgstr "Razmik vrstic:"
+
+#: ../data/ui/object-editor.ui.h:19
+msgid "Literal:"
+msgstr "Dosledno:"
+
+#: ../data/ui/object-editor.ui.h:20
+msgid "Opacity:"
+msgstr "Prosojnost:"
+
+#: ../data/ui/object-editor.ui.h:21
+msgid "Position"
+msgstr "Lega"
+
+#: ../data/ui/object-editor.ui.h:22
+msgid "Reset image size"
+msgstr "Ponastavi velikost slike"
+
+#: ../data/ui/object-editor.ui.h:23
+msgid "Shadow"
+msgstr "Senca"
+
+#: ../data/ui/object-editor.ui.h:24
+msgid "Size"
+msgstr "Velikost"
+
+#: ../data/ui/object-editor.ui.h:25
+msgid "Size:"
+msgstr "Velikost:"
+
+#: ../data/ui/object-editor.ui.h:26
+msgid "Style"
+msgstr "Slog"
+
+#: ../data/ui/object-editor.ui.h:27
+msgid "Style:"
+msgstr "Slog:"
+
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "Å irina:"
+
+#: ../data/ui/object-editor.ui.h:30
+msgid "X Offset:"
+msgstr "Odmik X osi:"
+
+#: ../data/ui/object-editor.ui.h:31
+msgid "X:"
+msgstr "X:"
+
+#: ../data/ui/object-editor.ui.h:32
+msgid "Y Offset:"
+msgstr "Odmik Y osi:"
+
+#: ../data/ui/object-editor.ui.h:33
+msgid "Y:"
+msgstr "Y:"
+
+#: ../data/ui/object-editor.ui.h:34
+msgid "degrees"
+msgstr "stopinje"
+
+#: ../data/ui/object-editor.ui.h:35
+msgid "dialog1"
+msgstr "pogovorno okno 1"
+
+#: ../data/ui/object-editor.ui.h:36
+msgid "digits:"
+msgstr "Å¡tevilke:"
+
+#: ../data/ui/object-editor.ui.h:37
+msgid "format:"
+msgstr "oblika:"
+
+#: ../data/ui/prefs-dialog.ui.h:1
+msgid "   "
+msgstr "   "
+
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "Ponastavi velikost slike"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "Font:"
+msgstr "Pisava:"
+
+#: ../data/ui/prefs-dialog.ui.h:7
+msgid "ISO A4"
+msgstr "ISO A4"
+
+#: ../data/ui/prefs-dialog.ui.h:8
+msgid "Inches"
+msgstr "Palci"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Locale"
+msgstr "Jezikovna oznaka"
+
+#: ../data/ui/prefs-dialog.ui.h:12
+msgid "Millimeters"
+msgstr "Milimetri"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Object defaults"
+msgstr "Privzete vrednosti predmeta"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Points"
+msgstr "ToÄ?ke"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Select default properties for new objects."
+msgstr "Izbor privzeti lastnosti za nove predmete."
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Select locale specific behavior."
+msgstr "Izberite z jezikovno oznako doloÄ?eno obnaÅ¡anje."
+
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr "AmeriÅ¡ko pismo"
+
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "Brez naslova"
+
+#: ../data/ui/property-bar.ui.h:1
+msgid "Bold"
+msgstr "Krepko"
+
+#: ../data/ui/property-bar.ui.h:2
+msgid "Center align"
+msgstr "Poravnava na sredino"
+
+#: ../data/ui/property-bar.ui.h:7
+msgid "Left align"
+msgstr "Poravnava levo"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Right align"
+msgstr "Poravnava desno"
+
+#: ../data/ui/template-designer.ui.h:1
+msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
+msgstr "(na primer \"PoÅ¡tne nalepke\", \"Poslovne vizitke\" ...)"
+
+#: ../data/ui/template-designer.ui.h:2
+msgid "(e.g., 8163A)"
+msgstr "(na primer 1000)"
+
+#: ../data/ui/template-designer.ui.h:3
+msgid "(e.g., Avery, Acme, ...)"
+msgstr "(na primer Mobitel, Simobil, ...)"
+
+#: ../data/ui/template-designer.ui.h:4
+msgid "1. Outer radius:"
+msgstr "1. Zunanji polmer:"
+
+#: ../data/ui/template-designer.ui.h:5
+msgid "1. Radius:"
+msgstr "1. Polmer:"
+
+#: ../data/ui/template-designer.ui.h:6
+msgid "1. Width:"
+msgstr "1. Å irina"
+
+#: ../data/ui/template-designer.ui.h:7
+msgid "2. Height:"
+msgstr "2. ViÅ¡ina:"
+
+#: ../data/ui/template-designer.ui.h:8
+msgid "2. Inner radius:"
+msgstr "2. Notranji polmer:"
+
+#: ../data/ui/template-designer.ui.h:9
+msgid "2. Waste (overprint allowed):"
+msgstr "2. Vmesni prostor:"
+
+#: ../data/ui/template-designer.ui.h:10
+msgid "3. Clipping width:"
+msgstr "3. Å irina odreza:"
+
+#: ../data/ui/template-designer.ui.h:11
+msgid "3. Margin"
+msgstr "3. Obroba"
+
+#: ../data/ui/template-designer.ui.h:12
+msgid "3. Round (radius of corner):"
+msgstr "3. Okroglo (polmer kota):"
+
+#: ../data/ui/template-designer.ui.h:13
+msgid "4. Clipping height:"
+msgstr "4. ViÅ¡ina odreza:"
+
+#: ../data/ui/template-designer.ui.h:14
+msgid "4. Horiz. waste (overprint allowed):"
+msgstr "5. Vodoravni vmesni prostor:"
+
+#: ../data/ui/template-designer.ui.h:15
+msgid "5. Vert. waste (overprint allowed):"
+msgstr "5. NavpiÄ?ni vmesni prostor:"
+
+#: ../data/ui/template-designer.ui.h:16
+msgid "5. Waste (overprint allowed):"
+msgstr "5. Vmesni prostor:"
+
+#: ../data/ui/template-designer.ui.h:17
+msgid "6. Margin"
+msgstr "6. Obroba"
+
+#: ../data/ui/template-designer.ui.h:18
+msgid "Brand/Manufacturer:"
+msgstr "Znamka/Izdelovalec:"
+
+#: ../data/ui/template-designer.ui.h:19
+msgid "CD/DVD (including credit card CDs)"
+msgstr "CD/DVD (vkljuÄ?ujoÄ? CD-je v obliki kreditnih kartic)"
+
+#: ../data/ui/template-designer.ui.h:20
+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."
+msgstr ""
+"Ä?estitamo!\n"
+"\n"
+"DokonÄ?ali ste snovanje predloge gLables.\n"
+"V primeru, da Å¾elite sprejeti in shraniti vaÅ¡e oblikovanje, kliknite "
+"\"Uporabi.\"\n"
+"\n"
+"V nasprotnem primeru lahko kliknete \"PrekliÄ?i\" in program konÄ?ate\n"
+"ali pa \"Nazaj\" za nadaljevanje oblikovanja."
+
+#: ../data/ui/template-designer.ui.h:28
+msgid "Distance from left edge (x0):"
+msgstr "Razdalja od levega roba (x0):"
+
+#: ../data/ui/template-designer.ui.h:29
+msgid "Distance from top edge (y0):"
+msgstr "Razdalja od zgornjega roba (y0):"
+
+#: ../data/ui/template-designer.ui.h:31
+msgid "Horizontal pitch (dx):"
+msgstr "Vodoravna razdalja (dx):"
+
+#: ../data/ui/template-designer.ui.h:32
+msgid ""
+"How many layouts will your template contain? \n"
+"\n"
+"A layout is a set of labels or cards that can be arranged in a simple grid.\n"
+"Most templates only need one layout, as in the first example.\n"
+"The second example illustrates when two layouts are needed."
+msgstr ""
+"Koliko razporeditev bo vsebovala vaÅ¡a predloga? \n"
+"\n"
+"Razporeditev je niz nalepk ali vizitk, ki je lahko urejen v preprosto "
+"mreÅ¾o.\n"
+"VeÄ?ina predlog potrebuje le eno razporeditev, kot na prvem primeru.\n"
+"Drugi primer vsebuje dve razporeditvi. "
+
+#: ../data/ui/template-designer.ui.h:37
+msgid "Layout #1"
+msgstr "Razporeditev Å¡t. 1"
+
+#: ../data/ui/template-designer.ui.h:38
+msgid "Layout #2"
+msgstr "Razporeditev Å¡t. 2"
+
+#: ../data/ui/template-designer.ui.h:39
+msgid "Number across (nx):"
+msgstr "Vodoravno Å¡tevilo (nx):"
+
+#: ../data/ui/template-designer.ui.h:40
+msgid "Number down (ny):"
+msgstr "NavpiÄ?no Å¡tevilo (ny):"
+
+#: ../data/ui/template-designer.ui.h:41
+msgid "Number of layouts:"
+msgstr "Å tevilo razporeditev:"
+
+#: ../data/ui/template-designer.ui.h:44
+msgid ""
+"Please enter the following identifying information about the template "
+"stationery."
+msgstr "Vnesite podrobnosti doloÄ?itve predloge pisalnih pripomoÄ?kov."
+
+#: ../data/ui/template-designer.ui.h:45
+msgid "Please enter the following layout information."
+msgstr "Vnesite sledeÄ?e podrobnosti razporeditve."
+
+#: ../data/ui/template-designer.ui.h:46
+msgid ""
+"Please enter the following size parameters of a single label in your "
+"template."
+msgstr "Vnesite sledeÄ?e parametre velikosti posamezne nalepke v vaÅ¡i predlogi."
+
+#: ../data/ui/template-designer.ui.h:47
+msgid ""
+"Please enter the following size parameters of a single label or card in your "
+"template."
+msgstr ""
+"Vnesite sledeÄ?e parametre velikosti posamezne nalepke ali poslovne vizitke v "
+"vaÅ¡i predlogi."
+
+#: ../data/ui/template-designer.ui.h:48
+msgid "Please select the basic shape of the labels or cards."
+msgstr "Izberite osnovno obliko nalepk ali vizitk."
+
+#: ../data/ui/template-designer.ui.h:49
+msgid "Please select the page size of the template stationery."
+msgstr "Izberite velikost strani predloge pisalnih pripomoÄ?kov."
+
+#: ../data/ui/template-designer.ui.h:50
+msgid "Print test sheet"
+msgstr "Natisni preizkusni list"
+
+#: ../data/ui/template-designer.ui.h:51
+msgid "Rectangular or square (can have rounded corners)"
+msgstr "Kvadrat ali pravokotnik (lahko ima zaokroÅ¾ene robove)"
+
+#: ../data/ui/template-designer.ui.h:52
+msgid "Round"
+msgstr "Krog"
+
+#: ../data/ui/template-designer.ui.h:53
+msgid ""
+"Templates needing\n"
+"two layouts."
+msgstr ""
+"Predloge z \n"
+"dvema razporeditvama."
+
+#: ../data/ui/template-designer.ui.h:55
+msgid ""
+"Templates needing only\n"
+"one layout."
+msgstr ""
+"Predloge z le\n"
+"eno razporeditvijo."
+
+#: ../data/ui/template-designer.ui.h:57
+msgid "Vertical pitch (dy):"
+msgstr "NavpiÄ?na razdalja (dy):"
+
+#: ../data/ui/template-designer.ui.h:58
+msgid ""
+"Welcome to the gLabels Template Designer.\n"
+"\n"
+"This dialog will assist you in the creation of a custom gLabels template."
+msgstr ""
+"DobrodoÅ¡li v snovalniku predlog gLabels.\n"
+"\n"
+"To pogovorno okno vam bo pomagalo pri ustvarjanju predloge gLables po meri."
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "Zberi"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "Copies"
+msgstr "Kopije:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "Kopije:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "<b>Nadzor zdruÅ¾evanja</b>"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>MoÅ¾nosti</b>"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "Listi:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "ZaÄ?ni na nalepki"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "od:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "na prvem listu"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "za:"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "Ustvarjanje nalepk, poslovnih vizitk in medijskih platnic"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+msgid "gLabels Label Designer 3"
+msgstr "snovalnik nalepk gLabels 3"
+
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "Datoteka projekta gLabels"
+
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr "Ovojnica Å¡t. 10"
+
+#. Other ISO A series sizes
+#: ../templates/paper-sizes.xml.h:4
+msgid "A0"
+msgstr "A0"
+
+#: ../templates/paper-sizes.xml.h:5
+msgid "A1"
+msgstr "A1"
+
+#: ../templates/paper-sizes.xml.h:6
+msgid "A10"
+msgstr "A10"
+
+#: ../templates/paper-sizes.xml.h:7
+msgid "A2"
+msgstr "A2"
+
+#: ../templates/paper-sizes.xml.h:8
+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
+msgid "A5"
+msgstr "A5"
+
+#: ../templates/paper-sizes.xml.h:12
+msgid "A6"
+msgstr "A6"
+
+#: ../templates/paper-sizes.xml.h:13
+msgid "A7"
+msgstr "A7"
+
+#: ../templates/paper-sizes.xml.h:14
+msgid "A8"
+msgstr "A8"
+
+#: ../templates/paper-sizes.xml.h:15
+msgid "A9"
+msgstr "A9"
+
+#. ISO B series sizes
+#: ../templates/paper-sizes.xml.h:17
+msgid "B0"
+msgstr "B0"
+
+#: ../templates/paper-sizes.xml.h:18
+msgid "B1"
+msgstr "B1"
+
+#: ../templates/paper-sizes.xml.h:19
+msgid "B10"
+msgstr "B10"
+
+#: ../templates/paper-sizes.xml.h:20
+msgid "B2"
+msgstr "B2"
+
+#: ../templates/paper-sizes.xml.h:21
+msgid "B3"
+msgstr "B3"
+
+#: ../templates/paper-sizes.xml.h:22
+msgid "B4"
+msgstr "B4"
+
+#: ../templates/paper-sizes.xml.h:23
+msgid "B5"
+msgstr "B5"
+
+#: ../templates/paper-sizes.xml.h:24
+msgid "B6"
+msgstr "B6"
+
+#: ../templates/paper-sizes.xml.h:25
+msgid "B7"
+msgstr "B7"
+
+#: ../templates/paper-sizes.xml.h:26
+msgid "B8"
+msgstr "B8"
+
+#: ../templates/paper-sizes.xml.h:27
+msgid "B9"
+msgstr "B9"
+
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr "C5"
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr "C6"
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr "DL"
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr "Ovojnica Monarch"
+
+#: ../templates/paper-sizes.xml.h:32
+msgid "US Executive"
+msgstr "AmeriÅ¡ka izvrÅ¡ilna"
+
+#. Other US paper sizes
+#: ../templates/paper-sizes.xml.h:34
+msgid "US Legal"
+msgstr "AmeriÅ¡ka pravna"
+
+#: ../templates/categories.xml.h:1
+msgid "Any card"
+msgstr "Katerakoli vizika"
+
+#: ../templates/categories.xml.h:2
+msgid "Any label"
+msgstr "Katerakoli nalepka"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
+msgid "Business cards"
+msgstr "Poslovne nalepke"
+
+#: ../templates/categories.xml.h:4
+msgid "CD/DVD or other media"
+msgstr "CD/DVD ali drugi mediji"
+
+#: ../templates/categories.xml.h:5
+msgid "Mailing/shipping products"
+msgstr "PoÅ¡iljanje izdelkov po poÅ¡ti"
+
+#: ../templates/categories.xml.h:6
+msgid "Rectangular labels"
+msgstr "Pravokotne nalepke"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
+msgid "Round labels"
+msgstr "Okrogle nalepke"
+
+#: ../templates/categories.xml.h:8
+msgid "Square labels"
+msgstr "Kvadratne nalepke"
+
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "Nalepke naslovov"
+
+#. ===================================================================
+#. ============================================================
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
+msgid "Business Cards"
+msgstr "Poslovne vizitke"
+
+#. ===================================================================
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
+msgid "CD/DVD Labels"
+msgstr "CD/DVD nalepke"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:8
+msgid "CD/DVD Labels (Disc Labels)"
+msgstr "CD/DVD nalepke (nalepke diska)"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:10
+msgid "CD/DVD Labels (Spine Labels)"
+msgstr "CD/DVD nalepke (nalepke robov)"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
+msgid "Diskette Labels"
+msgstr "Nalepke disket"
+
+#. the LSK labels can be torn in half down the center
+#: ../templates/avery-us-templates.xml.h:14
+msgid "Divider Labels"
+msgstr "Nalepke loÄ?ilnikov"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+msgid "File Folder Labels"
+msgstr "Nalepke map z datotekami"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
+msgid "Filing Labels"
+msgstr "Nalepke kartotek"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
+msgid "Full Sheet Labels"
+msgstr "Celostranske nalepke"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:22
+msgid "ID Labels"
+msgstr "ID nalepke"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:24
+msgid "Index Cards"
+msgstr "Kartice kazal"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:26
+msgid "Large Round Labels"
+msgstr "Velike okrogle nalepke"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:28
+msgid "Name Badge Labels"
+msgstr "Nalepke z imeni"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:30
+msgid "Post cards"
+msgstr "Razglednice"
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
+msgid "Return Address Labels"
+msgstr "Nalepke za naslov vraÄ?ila"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
+msgid "Round Labels"
+msgstr "Okrogle nalepke"
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
+msgid "Shipping Labels"
+msgstr "Nalepke poÅ¡iljanja"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:38
+msgid "Small Round Labels"
+msgstr "Majhne okrogle nalepke"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:40
+msgid "Square Labels"
+msgstr "Kvadratne nalepke"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:42
+msgid "Tent Cards"
+msgstr "Karte za Å¡otorjenje"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
+msgid "Video Tape Face Labels"
+msgstr "Nalepke ploskev video kaset"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
+msgid "Video Tape Spine Labels"
+msgstr "Nalepke robov video kaset"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:4
+msgid "Address labels"
+msgstr "Nalepke naslovov"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:6
+msgid "Allround labels"
+msgstr "Vsestranske nalepke"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:10
+msgid "CD Booklet"
+msgstr "CD polica"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:12
+msgid "CD Inlet"
+msgstr "Robovi CD"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:18
+msgid "Diskette labels"
+msgstr "Nalepke disket"
+
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
+msgid "Mailing Labels"
+msgstr "PoÅ¡tne nalepke"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:22
+msgid "Mailing labels"
+msgstr "PoÅ¡tne nalepke"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:24
+msgid "Mini Address Labels"
+msgstr "Mini nalepke naslovov"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:26
+msgid "Mini Labels"
+msgstr "Mini nalepke"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:28
+msgid "Shipping labels"
+msgstr "Nalepke poÅ¡iljanja"
+
+#: ../templates/brother-other-templates.xml.h:1
+msgid "Multi Purpose Labels 17mm x 54mm"
+msgstr "VeÄ?namenske nalepke 17mm x 54mm"
+
+#: ../templates/brother-other-templates.xml.h:2
+msgid "Shipping Labels 62mm x 100mm"
+msgstr "Nalepke poÅ¡iljanja 62mm x 100 mm"
+
+#.
+#. *********************************************************************
+#. *********************************************************************
+#. 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.
+#.
+#. One difference from typical templates is that the template size is
+#. not the actual media size - it is the size of the printable area,
+#. which is smaller than the media size.  This is because (at least with
+#. the Brother driver) coordinates are relative the corner of this area.
+#.
+#. *********************************************************************
+#. *********************************************************************
+#.
+#: ../templates/brother-other-templates.xml.h:20
+msgid "Standard Address Labels 29mm x 90mm"
+msgstr "Standardne nalepke naslovov 29mm x 90mm"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:2
+msgid "3.5in Diskette"
+msgstr "3,5-palÄ?na disketa"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:6
+msgid "File Folder"
+msgstr "Mapa z datotekami"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:8
+msgid "Hanging Folder"
+msgstr "IzroÄ?na mapa"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:10
+msgid "Large Address Labels"
+msgstr "Velike nalepke naslovov"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:14
+msgid "Shipping Address Labels"
+msgstr "Nalepke naslova poÅ¡iljanja"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:2
+msgid "Business Card CD"
+msgstr "CD poslovne vizitke"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
+msgid "CD Template Rectangles"
+msgstr "Pravokotne CD predloge"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
+msgid "CD/DVD Labels (Face Only)"
+msgstr "CD/DVD nalepke (le ploskev)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
+msgid "CD/DVD Labels (face only)"
+msgstr "CD/DVD nalepke (le ploskev)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:14
+msgid "Cassette Labels"
+msgstr "Nalepke kaset"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:16
+msgid "DLT Labels"
+msgstr "Nalepke DLT"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:18
+msgid "Jewel Case Booklet"
+msgstr "KnjiÅ¾ica Å¡katlice z dragulji"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
+msgid "Microtube labels"
+msgstr "Nalepke Microtube"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
+msgid "Mini-CD Labels"
+msgstr "Nalepke mini CD-jev"
+
+#: ../templates/misc-us-templates.xml.h:25
+msgid "PRO CD Labels 2-up (CD spine only)"
+msgstr "PRO CD nalepke 2-up (le rob CD)"
+
+#: ../templates/misc-us-templates.xml.h:26
+msgid "PRO CD Labels 2-up (Face only)"
+msgstr "PRO CD nalepke 2-up (le ploskev)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
+msgid "PRO CD Labels 2-up (face only)"
+msgstr "PRO CD nalepke 2-up (le ploskev)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
+msgid "Slimline CD Case (rightside up)"
+msgstr "Ozko CD ohiÅ¡je (od desne navzgor)"
+
+#: ../templates/misc-us-templates.xml.h:33
+msgid "Slimline CD Case (upside down)"
+msgstr "Ozko CD ohiÅ¡je (od zgoraj navzdol)"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
+msgid "Allround Labels"
+msgstr "RazliÄ?ne nalepke"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:6
+msgid "Arch File Labels"
+msgstr "Nalepke datotek arhiva"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:8
+msgid "Arch File Labels (large)"
+msgstr "Nalepke datotek arhiva (velike)"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:10
+msgid "Arch File Labels (small)"
+msgstr "Nalepke datotek arhiva (majhne)"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:14
+msgid "CD Labels"
+msgstr "CD nalepke"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:20
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr "ObiÄ?ajna oblika CD/DVD nalepk (le ploskev)"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:22
+msgid "Diskette Labels (face only)"
+msgstr "Nalepke disket (le ploskev)"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:24
+msgid "EPSON Photo Stickers 16"
+msgstr "Foto nalepke EPSON 16"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:26
+msgid "Etiketten"
+msgstr "Nalepke"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:28
+msgid "Fridge Magnet Stickers"
+msgstr "Nalepke magnetov za na hladilnik"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:30
+msgid "General Labels"
+msgstr "SploÅ¡ne nalepke"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:32
+msgid "Inkjet/Laser Labels 70x37mm"
+msgstr "Nalepke Ä?rnila/laserja 70x37mm"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:38
+msgid "Mailing Labels-2 columns"
+msgstr "PoÅ¡tne nalepke - 2 stolpca"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:40
+msgid "Mailing Labels-3 columns"
+msgstr "PoÅ¡tne nalepke - 3 stolpci"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
+msgid "Rectangular Labels"
+msgstr "Pravokotne nalepke"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:46
+msgid "Universal Labels"
+msgstr "SploÅ¡ne oznake"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
+msgid "Video Labels (face only)"
+msgstr "Video nalepke (le ploskev)"
+
+#. ===================================================================
+#: ../templates/misc-other-templates.xml.h:2
+msgid "Multi-Purpose Labels"
+msgstr "VeÄ?namenske nalepke"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+msgid "Address Labels (STAMPIT)"
+msgstr "Nalepke naslovov (STAMPIT)"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+msgid "Bottle labels"
+msgstr "Nalepke steklenic"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr "BlesteÄ?e poslovne vizite, tisk na obeh straneh"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+msgid "Business cards high glossy"
+msgstr "Visoko blesteÄ?e poslovne vizitke"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+msgid "Business cards punched"
+msgstr "Preluknjane poslovne vizitke"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+msgid "Business cards punched dull"
+msgstr "Preluknjane mraÄ?ne poslovne vizike "
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+msgid "Business cards punched glossy"
+msgstr "Preluknjane blesteÄ?e poslovne vizitke"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+msgid "Floppy disk labels"
+msgstr "Nalepke disket"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+msgid "Foldable business cards"
+msgstr "Prepogljive poslovne vizitke"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr "Prepogljive poslovne vizitke blesteÄ?e/mraÄ?ne"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+msgid "Labels A4"
+msgstr "Nalepke A4"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+msgid "Labels A5"
+msgstr "Nalepke A5"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+msgid "Labels A6"
+msgstr "Nalepke A6"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr "Ä?lanske kartice"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr "Ä?lanske kartice, tisk na obeh straneh "
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr "Kartice z imeni"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr "BlesteÄ?e nalepke fotografij potnega lista"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+msgid "Photo labels"
+msgstr "Nalepke fotografij"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr "Pol blesteÄ?e nalepke fotografij "
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+msgid "SD card labels"
+msgstr "Nalepke kartic CD"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr "Samolepilni prozoren film"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr "Samolepilni vremensko odporni film"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Self-adhesive labels"
+msgstr "Samolepilne nalepke"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr "Samolepilni okenski film"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
+msgid "Correction and Cover-up Labels"
+msgstr "Nalepke popravljanja in prekrivanja"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:12
+msgid "File Back Labels"
+msgstr "Nalepke predalnikov"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:14
+msgid "Lever Arch File Labels"
+msgstr "Nalepke arhivskih datotek"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:18
+msgid "Multi-purpose Stick+Lift Labels"
+msgstr "VeÄ?namenske odstranljive lepljive nalepke"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:20
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr "Nalepke QSL-kart 70mm x 50,8 mm"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:22
+msgid "Rectangular Copier Labels"
+msgstr "Pravokotne kopirne nalepke"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:26
+msgid "Video Labels (back)"
+msgstr "Video nalepke (zadnja stran)"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">lastnosti predmeta Xxx</span>"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">Privzeta velikost strani</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">Polnilo</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Ä?rta</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Besedilo</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Enote</span>"
+
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>Kopije</b>"
+
+#~ msgid "- gLabels label designer"
+#~ msgstr "- snovalnik nalepk gLabels"
+
+#~ msgid "- batch process gLabels label files"
+#~ msgstr "- paketno obdelovanje datotek gLabels nalepk"
+
+#~ msgid "Show tooltips"
+#~ msgstr "PokaÅ¾i namige"
+
+#~ msgid "Show tooltips for property toolbar"
+#~ msgstr "PokaÅ¾i namige za orodno vrstico lastnosti"
+
+#~ msgid "Show tooltips for main toolbar"
+#~ msgstr "PokaÅ¾i namige za glavno orodno vrstico"
+
+#~ msgid "Show tooltips for drawing toolbar"
+#~ msgstr "PokaÅ¾i namige za orodno vrstico risanja"
+
+#~ msgid "xmlParseDoc error"
+#~ msgstr "napaka xmlParseDoc"
+
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "Besedila datoteka loÄ?ena z vejicami (CSV)"
+
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "Besedila datoteka loÄ?ena s stolpci"
+
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "Besedila datoteka loÄ?ena s tabulatorji"
+
+#~ msgid "Data from a file containing VCards"
+#~ msgstr "Podatki iz datoteke, ki vsebuje VCards"
+
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s premer"
+
+#~ msgid "Choose Custom Color"
+#~ msgstr "Izberite barvo po meri"
+
+#~ msgid "light brown"
+#~ msgstr "svetlo rjava"
+
+#~ msgid "brown gold"
+#~ msgstr "rjavo-zlata"
+
+#~ msgid "dark green #2"
+#~ msgstr "temno zelena 2"
+
+#~ msgid "navy"
+#~ msgstr "mornarska"
+
+#~ msgid "dark blue"
+#~ msgstr "temno modra"
+
+#~ msgid "purple #2"
+#~ msgstr "vijoliÄ?na 2"
+
+#~ msgid "very dark gray"
+#~ msgstr "zelo temno siva"
+
+#~ msgid "red-orange"
+#~ msgstr "rdeÄ?e-oranÅ¾na"
+
+#~ msgid "dull blue"
+#~ msgstr "mraÄ?no modra"
+
+#~ msgid "dull purple"
+#~ msgstr "mraÄ?no vijoliÄ?na"
+
+#~ msgid "dark grey"
+#~ msgstr "temno siva"
+
+#~ msgid "lime"
+#~ msgstr "rumeno-zelena"
+
+#~ msgid "dull blue #2"
+#~ msgstr "mraÄ?no modra 2"
+
+#~ msgid "sky blue #2"
+#~ msgstr "nebeÅ¡ko modra 2"
+
+#~ msgid "gray"
+#~ msgstr "siva"
+
+#~ msgid "magenta"
+#~ msgstr "Å¡krlatna"
+
+#~ msgid "bright orange"
+#~ msgstr "bistro oranÅ¾na"
+
+#~ msgid "bright blue"
+#~ msgstr "bistro modra"
+
+#~ msgid "red purple"
+#~ msgstr "rdeÄ?e vijoliÄ?na"
+
+#~ msgid "light grey"
+#~ msgstr "svetlo siva"
+
+#~ msgid "light orange"
+#~ msgstr "svetlo oranÅ¾na"
+
+#~ msgid "light blue"
+#~ msgstr "svetlo modra"
+
+#~ msgid "light purple"
+#~ msgstr "svetlo vijoliÄ?na"
+
+#~ msgid "purplish blue"
+#~ msgstr "vijoliÄ?no modra"
+
+#~ msgid "dark purple"
+#~ msgstr "temo vijoliÄ?na"
+
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>Usmeritev nalepke</b>"
+
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>Vrsta medija</b>"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "Select A File"
+#~ msgstr "Izbor datoteke"
+
+#~ msgid "<b>Print control (Simple)</b>"
+#~ msgstr "<b>Nadzor tiskanja (preprost)</b>"
+
+#~ msgid "Text Color"
+#~ msgstr "Barva besedila"
+
+#~ msgid "cd_size_page"
+#~ msgstr "stran_velikosti_cd"
+
+#~ msgid "finish_page"
+#~ msgstr "konÄ?na_stran"
+
+#~ msgid "layout_page"
+#~ msgstr "razporeditvena_stran"
+
+#~ msgid "nlayouts_page"
+#~ msgstr "Å¡t_razporeditev_stran"
+
+#~ msgid "pg_size_page"
+#~ msgstr "stran_velikosti_strani"
+
+#~ msgid "rect_size_page"
+#~ msgstr "pravokotna_stran"
+
+#~ msgid "round_size_page"
+#~ msgstr "okrogla_stran"
+
+#~ msgid "shape_page"
+#~ msgstr "oblikovna_stran"
+
+#~ msgid "start_page"
+#~ msgstr "zaÄ?etna_sran"
+
+#~ msgid "Recent templates"
+#~ msgstr "Nedavne predloge"
+
+#~ msgid "Search all templates"
+#~ msgstr "IÅ¡Ä?i po vseh predlogah"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: moÅ¾nost `%s' je dvoumna\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: moÅ¾nost `--%s' ne dovoli argumenta\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: moÅ¾nost `%c%s' ne dovoli argumenta\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: moÅ¾nost `%s' zahteva argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: nepoznana moÅ¾nost `--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: nepoznana moÅ¾nost `%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neveljavna moÅ¾nost -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: neveljavna moÅ¾nost -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: moÅ¾nost zahteva argument -- %c\n"
diff --git a/po/sv.po b/po/sv.po
index b8ba8a0..1f555de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,141 +7,384 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:44+0200\n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2009-10-06 10:47+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/bc.c:65
+#: ../src/bc.c:66
 msgid "POSTNET (any)"
 msgstr ""
 
-#: ../src/bc.c:68
+#: ../src/bc.c:69
 msgid "POSTNET-5 (ZIP only)"
 msgstr ""
 
-#: ../src/bc.c:71
+#: ../src/bc.c:72
 msgid "POSTNET-9 (ZIP+4)"
 msgstr ""
 
-#: ../src/bc.c:74
+#: ../src/bc.c:75
 msgid "POSTNET-11 (DPBC)"
 msgstr ""
 
-#: ../src/bc.c:77
+#: ../src/bc.c:80
 msgid "CEPNET"
 msgstr "CEPNET"
 
-#: ../src/bc.c:80
+#: ../src/bc.c:83
 msgid "EAN (any)"
 msgstr ""
 
-#: ../src/bc.c:83
+#: ../src/bc.c:86
 msgid "EAN-8"
 msgstr "EAN-8"
 
-#: ../src/bc.c:86
+#: ../src/bc.c:89
 msgid "EAN-8 +2"
 msgstr "EAN-8 +2"
 
-#: ../src/bc.c:89
+#: ../src/bc.c:92
 msgid "EAN-8 +5"
 msgstr "EAN-8 +5"
 
-#: ../src/bc.c:92
+#: ../src/bc.c:95
 msgid "EAN-13"
 msgstr "EAN-13"
 
-#: ../src/bc.c:95
+#: ../src/bc.c:98
 msgid "EAN-13 +2"
 msgstr "EAN-13 +2"
 
-#: ../src/bc.c:98
+#: ../src/bc.c:101
 msgid "EAN-13 +5"
 msgstr "EAN-13 +5"
 
-#: ../src/bc.c:101
+#: ../src/bc.c:104
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A eller UPC-E)"
 
-#: ../src/bc.c:104
+#: ../src/bc.c:107 ../src/bc.c:348
 msgid "UPC-A"
 msgstr "UPC-A"
 
-#: ../src/bc.c:107
+#: ../src/bc.c:110
 msgid "UPC-A +2"
 msgstr "UPC-A +2"
 
-#: ../src/bc.c:110
+#: ../src/bc.c:113
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:113
+#: ../src/bc.c:116 ../src/bc.c:351
 msgid "UPC-E"
 msgstr "UPC-E"
 
-#: ../src/bc.c:116
+#: ../src/bc.c:119
 msgid "UPC-E +2"
 msgstr "UPC-E +2"
 
-#: ../src/bc.c:119
+#: ../src/bc.c:122
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:122
+#: ../src/bc.c:125 ../src/bc.c:288
 msgid "ISBN"
 msgstr "ISBN"
 
-#: ../src/bc.c:125
+#: ../src/bc.c:128
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:128
+#: ../src/bc.c:131 ../src/bc.c:204
 msgid "Code 39"
 msgstr "Code 39"
 
-#: ../src/bc.c:131
+#: ../src/bc.c:134 ../src/bc.c:216
 msgid "Code 128"
 msgstr "Code 128"
 
-#: ../src/bc.c:134
+#: ../src/bc.c:137
 msgid "Code 128C"
 msgstr "Code 128C"
 
-#: ../src/bc.c:137
+#: ../src/bc.c:140
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc.c:140
+#: ../src/bc.c:143 ../src/bc.c:285
 msgid "Interleaved 2 of 5"
 msgstr ""
 
-#: ../src/bc.c:143
+#: ../src/bc.c:146 ../src/bc.c:180
 msgid "Codabar"
 msgstr "Codabar"
 
-#: ../src/bc.c:146
+#: ../src/bc.c:149
 msgid "MSI"
 msgstr "MSI"
 
-#: ../src/bc.c:149
+#: ../src/bc.c:152
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:152
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "Klistra in"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "Streckkod"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "Ta bort"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:155
+#: ../src/bc.c:371
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
-#: ../src/color-combo-button.c:198
-#: ../src/color-combo.c:178
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
 msgid "Default Color"
 msgstr "StandardfÃ¤rg"
 
@@ -261,41 +504,40 @@ msgstr ""
 msgid "White"
 msgstr "Vit"
 
-#: ../src/color-combo-menu.c:116
-#, c-format
+#: ../src/color-combo-menu.c:117
+#, no-c-format
 msgid "10% Gray"
 msgstr "10% grÃ¥"
 
-#: ../src/color-combo-menu.c:117
-#, c-format
+#: ../src/color-combo-menu.c:119
+#, no-c-format
 msgid "25% Gray"
 msgstr "25% grÃ¥"
 
-#: ../src/color-combo-menu.c:118
-#, c-format
+#: ../src/color-combo-menu.c:121
+#, no-c-format
 msgid "40% Gray"
 msgstr "40% grÃ¥"
 
-#: ../src/color-combo-menu.c:119
-#, c-format
+#: ../src/color-combo-menu.c:123
+#, no-c-format
 msgid "50% Gray"
 msgstr "50% grÃ¥"
 
-#: ../src/color-combo-menu.c:120
-#, c-format
+#: ../src/color-combo-menu.c:125
+#, no-c-format
 msgid "60% Gray"
 msgstr "60% grÃ¥"
 
-#: ../src/color-combo-menu.c:121
+#: ../src/color-combo-menu.c:126
 msgid "Black"
 msgstr "Svart"
 
-#: ../src/color-combo-menu.c:249
-#: ../src/color-combo-menu.c:368
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 msgid "Custom Color"
 msgstr "Anpassad fÃ¤rg"
 
-#: ../src/color-combo-menu.c:314
+#: ../src/color-combo-menu.c:319
 #, c-format
 msgid "Custom Color #%u"
 msgstr "Anpassad fÃ¤rg #%u"
@@ -304,200 +546,469 @@ msgstr "Anpassad fÃ¤rg #%u"
 msgid "gLabels Fatal Error!"
 msgstr ""
 
-#: ../src/file.c:86
+#: ../src/file.c:84
 msgid "New Label or Card"
 msgstr "Ny etikett eller kort"
 
-#: ../src/file.c:188
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
 msgid "Label properties"
 msgstr "Etikettegenskaper"
 
-#: ../src/file.c:291
-#: ../src/file.c:581
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/file.c:296
-#: ../src/file.c:586
+#: ../src/file.c:272 ../src/file.c:562
 msgid "gLabels documents"
 msgstr "gLabels-dokument"
 
-#: ../src/file.c:343
-#: ../src/file.c:644
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
 msgstr ""
 
-#: ../src/file.c:346
-#: ../src/file.c:362
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: ../src/file.c:359
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
-#: ../src/file.c:434
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Kunde inte Ã¶ppna filen \"%s\""
 
-#: ../src/file.c:437
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr "Filformatet stÃ¶ds inte"
 
-#: ../src/file.c:515
-#: ../src/file.c:694
+#: ../src/file.c:491 ../src/file.c:670
 #, c-format
 msgid "Could not save file \"%s\""
 msgstr "Kunde inte spara filen \"%s\""
 
-#: ../src/file.c:519
-#: ../src/file.c:698
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: ../src/file.c:559
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Spara \"%s\" som"
 
-#: ../src/file.c:647
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr ""
 
-#: ../src/file.c:668
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Skriv Ã¶ver filen \"%s\"?"
 
-#: ../src/file.c:672
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr "Filen finns inte."
 
-#: ../src/file.c:768
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Spara Ã¤ndringar till dokumentet \"%s\" innan stÃ¤ngning?"
 
-#: ../src/file.c:772
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr "Dina Ã¤ndringar kommer att gÃ¥ fÃ¶rlorade om du inte sparar dem."
 
-#: ../src/file.c:775
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "StÃ¤ng utan att spara"
 
-#: ../src/font-combo-menu.c:127
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "Tidigare mallar"
+
+#: ../src/font-combo-menu.c:152
 msgid "Proportional fonts"
 msgstr ""
 
-#: ../src/font-combo-menu.c:142
+#: ../src/font-combo-menu.c:160
 msgid "Fixed-width fonts"
 msgstr ""
 
-#: ../src/font-combo-menu.c:157
+#: ../src/font-combo-menu.c:168
 msgid "All fonts"
 msgstr "Alla typsnitt"
 
-#: ../src/glabels-batch.c:51
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
+
+#: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr ""
 
-#: ../src/glabels-batch.c:51
-#: ../src/glabels-batch.c:65
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "filnamn"
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr ""
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "kopior"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:59
 msgid "first"
 msgstr ""
 
-#: ../src/glabels-batch.c:59
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr ""
 
-#: ../src/glabels-batch.c:61
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr ""
 
-#: ../src/glabels-batch.c:63
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:11
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr ""
 
-#: ../src/glabels-batch.c:65
+#: ../src/glabels-batch.c:67
 msgid "input file for merging"
 msgstr ""
 
-#: ../src/glabels-batch.c:67
-#: ../src/glabels.c:62
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[FIL...]"
 
-#: ../src/glabels-batch.c:96
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr ""
 
-#: ../src/glabels-batch.c:104
-#: ../src/glabels.c:87
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/glabels-batch.c:146
+#: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr ""
 
-#: ../src/glabels-batch.c:180
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "kan inte Ã¶ppna glabels-filen %s\n"
 
-#: ../src/glabels.c:79
+#: ../src/glabels.c:81
 msgid "Launch gLabels label and business card designer."
 msgstr "Starta gLabels fÃ¶r att skapa etiketter och visitkort."
 
-#: ../src/label-barcode.c:435
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr ""
+
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "Streckkod"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "Etikettegenskaper"
+
+#: ../src/label-barcode.c:485
 msgid "Barcode data empty"
 msgstr ""
 
-#: ../src/label-barcode.c:439
+#: ../src/label-barcode.c:489
 msgid "Invalid barcode data"
 msgstr "Ogiltig streckkodsdata"
 
-#: ../src/label.c:547
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "Skapa textobjekt"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr ""
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "RadfÃ¤rg"
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "Radbredd"
+
+#: ../src/label.c:402
 msgid "Untitled"
 msgstr "NamnlÃ¶s"
 
-#: ../src/merge.c:169
-#: ../src/merge.c:210
-#: ../src/merge.c:374
-#: ../src/merge.c:377
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr ""
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr ""
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr ""
+
+#: ../src/label.c:1307
+#, fuzzy
+msgid "Rotate"
+msgstr "Roterad"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Rotera Ã¥t vÃ¤nster"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Rotera Ã¥t hÃ¶ger"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr ""
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr ""
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "Justera vÃ¤nster"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "Justera hÃ¶ger"
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr ""
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr ""
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr ""
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr ""
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr ""
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr ""
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "Klistra in"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Skapa textobjekt"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr ""
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "Ã?terstÃ¤ll bildstorlek"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr ""
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Sidstorlek:"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "Skugga"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "Skugga"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "Skugga"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "Skugga"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Skapa textobjekt"
+
+#: ../src/label-text.c:451
+msgid "Typing"
+msgstr ""
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "Typsnittsfamilj"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Typsnittsstorlek"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Rotera Ã¥t hÃ¶ger"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Justera vÃ¤nster"
+
+#: ../src/label-text.c:754
+msgid "Line spacing"
+msgstr ""
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "TextfÃ¤rg"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "Alla"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "Alla"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "Alla"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "Inga tidigare mallar hittades."
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr "Prova att vÃ¤lja en mall frÃ¥n sidan \"SÃ¶k alla mallar\"."
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr ""
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Inga tidigare mallar hittades."
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
 msgstr "Ingen"
 
@@ -505,8 +1016,7 @@ msgstr "Ingen"
 msgid "Couldn't construct query"
 msgstr ""
 
-#: ../src/merge-evolution.c:322
-#: ../src/merge-evolution.c:333
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
 msgid "Couldn't open addressbook."
 msgstr "Kunde inte Ã¶ppna adressboken."
 
@@ -519,136 +1029,168 @@ msgid "Couldn't get contacts."
 msgstr "Kunde inte fÃ¥ tag pÃ¥ kontakter."
 
 #: ../src/merge-init.c:57
-msgid "Text file with comma delimeters (CSV)"
+msgid "Text: Comma Separated Values (CSV)"
 msgstr ""
 
 #: ../src/merge-init.c:64
-msgid "Text file with colon delimeters"
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
 msgstr ""
 
-#: ../src/merge-init.c:71
-msgid "Text file with tab delimeters"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
 msgstr ""
 
-#: ../src/merge-init.c:80
-msgid "Data from default Evolution Addressbook"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
 msgstr ""
 
-#: ../src/merge-init.c:86
-msgid "Data from a file containing VCards"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:279
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Kunde inte Ã¶ppna adressboken."
+
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr ""
+
+#: ../src/merge-properties-dialog.c:282
 msgid "Merge Properties"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:305
-#: ../src/merge-properties-dialog.c:421
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
 msgid "Select merge-database source"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:316
-#: ../src/merge-properties-dialog.c:443
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
 msgid "N/A"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:342
+#: ../src/merge-properties-dialog.c:345
 msgid "Select"
 msgstr "VÃ¤lj"
 
-#: ../src/merge-properties-dialog.c:349
+#: ../src/merge-properties-dialog.c:352
 msgid "Record/Field"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:357
-#: ../data/builder/object-editor.builder.h:10
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
 msgid "Data"
 msgstr "Data"
 
-#: ../src/merge-properties-dialog.c:436
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
 msgid "Fixed"
 msgstr ""
 
-#: ../src/new-label-dialog.c:112
-msgid "<b>Media type</b>"
-msgstr "<b>Mediatyp</b>"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Markera alla objekt"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
 
-#: ../src/new-label-dialog.c:122
-msgid "<b>Label orientation</b>"
-msgstr "<b>Etikettorientering</b>"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#: ../src/object-editor-bc-page.c:91
-#: ../src/object-editor-shadow-page.c:91
-#: ../src/object-editor-text-page.c:97
-#: ../src/prefs-dialog.c:337
-#: ../src/ui-property-bar.c:278
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/object-editor-fill-page.c:79
-#: ../src/prefs-dialog.c:343
-#: ../src/ui-property-bar.c:290
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr ""
+
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr ""
+
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr ""
+
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr ""
+
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr ""
+
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr ""
+
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr ""
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr ""
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
 msgid "No Fill"
 msgstr ""
 
-#: ../src/object-editor-image-page.c:270
+#: ../src/object-editor-image-page.c:278
 msgid "All Files"
 msgstr "Alla filer"
 
-#: ../src/object-editor-image-page.c:275
+#: ../src/object-editor-image-page.c:283
 msgid "All Images"
 msgstr "Alla bilder"
 
-#: ../src/object-editor-image-page.c:290
+#: ../src/object-editor-image-page.c:298
 #, c-format
 msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
-#: ../src/object-editor-line-page.c:79
-#: ../src/prefs-dialog.c:340
-#: ../src/ui-property-bar.c:302
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
 msgid "No Line"
 msgstr ""
 
-#. Should not happen
-#: ../src/prefs.c:156
-#: ../src/prefs.c:163
-#: ../data/builder/object-editor.builder.h:42
-#: ../data/builder/prefs-dialog.builder.h:22
-msgid "points"
-msgstr "punkter"
-
-#: ../src/prefs.c:158
-#: ../data/builder/object-editor.builder.h:41
-#: ../data/builder/template-designer.builder.h:64
-msgid "inches"
-msgstr "tum"
-
-#: ../src/prefs.c:160
-msgid "mm"
-msgstr "mm"
-
-#: ../src/prefs-dialog.c:172
-#: ../data/builder/prefs-dialog.builder.h:21
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
 msgid "gLabels Preferences"
 msgstr "InstÃ¤llningar fÃ¶r gLabels"
 
 #. ===================================================================
-#: ../src/print-op.c:203
-#: ../src/print-op-dialog.c:217
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:6
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../src/rotate-label-button.c:122
-msgid "Normal"
-msgstr "Normal"
-
-#: ../src/rotate-label-button.c:133
-msgid "Rotated"
-msgstr "Roterad"
-
 #: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr ""
@@ -733,555 +1275,471 @@ msgstr ""
 msgid "Centers"
 msgstr ""
 
-#: ../src/stock.c:91
-#: ../src/stock.c:92
+#: ../src/stock.c:91 ../src/stock.c:92
 msgid "Label Ce_nter"
 msgstr ""
 
-#: ../src/stock.c:93
-#: ../data/builder/property-bar.builder.h:3
-msgid "Fill color"
-msgstr ""
-
-#: ../src/stock.c:94
-#: ../data/builder/property-bar.builder.h:7
-msgid "Line color"
-msgstr "RadfÃ¤rg"
-
-#: ../src/stock.c:95
-#: ../src/stock.c:97
+#: ../src/stock.c:95 ../src/stock.c:97
 msgid "Linked"
 msgstr "LÃ¤nkad"
 
-#: ../src/stock.c:96
-#: ../src/stock.c:98
+#: ../src/stock.c:96 ../src/stock.c:98
 msgid "Not Linked"
 msgstr "Inte lÃ¤nkad"
 
-#: ../src/template-designer.c:401
-msgid "gLabels Template Designer"
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
 msgstr "gLabels malldesigner"
 
-#: ../src/template-designer.c:456
+#: ../src/template-designer.c:461
 msgid "Welcome"
 msgstr "VÃ¤lkommen"
 
-#: ../src/template-designer.c:495
+#: ../src/template-designer.c:500
 msgid "Name and Description"
 msgstr "Namn och beskrivning"
 
-#: ../src/template-designer.c:543
+#: ../src/template-designer.c:548
 msgid "Page Size"
 msgstr "Sidstorlek"
 
-#: ../src/template-designer.c:609
+#: ../src/template-designer.c:614
 msgid "Label or Card Shape"
 msgstr "Etikett- eller kortform"
 
-#: ../src/template-designer.c:655
+#: ../src/template-designer.c:661
 msgid "Label or Card Size"
 msgstr "Etikett- eller kortstorlek"
 
-#: ../src/template-designer.c:751
+#: ../src/template-designer.c:760
 msgid "Label Size (round)"
 msgstr "Etikettstorlek (rund)"
 
-#: ../src/template-designer.c:829
+#: ../src/template-designer.c:841
 msgid "Label Size (CD/DVD)"
 msgstr "Etikettstorlek (CD/DVD)"
 
-#: ../src/template-designer.c:917
+#: ../src/template-designer.c:932
 msgid "Number of Layouts"
 msgstr "Antal layouter"
 
-#: ../src/template-designer.c:981
+#: ../src/template-designer.c:1000
 msgid "Layout(s)"
 msgstr "Layout(er)"
 
-#: ../src/template-designer.c:1086
+#: ../src/template-designer.c:1105
 msgid "Design Completed"
 msgstr ""
 
-#: ../src/template-designer.c:1259
-msgid "<span foreground='red' weight='bold'>Brand and part# match an existing template!</span>"
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "gLabels malldesigner"
+
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
 msgstr ""
 
 #. Menu entries.
-#: ../src/ui.c:88
+#: ../src/ui.c:93
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../src/ui.c:89
+#: ../src/ui.c:94
 msgid "Open Recent _Files"
 msgstr "Ã?ppna tidigare _filer"
 
-#: ../src/ui.c:90
+#: ../src/ui.c:95
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../src/ui.c:91
+#: ../src/ui.c:96
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/ui.c:92
+#: ../src/ui.c:97
 msgid "Customize Main Toolbar"
 msgstr ""
 
-#: ../src/ui.c:93
+#: ../src/ui.c:98
 msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: ../src/ui.c:94
+#: ../src/ui.c:99
 msgid "Customize Properties Toolbar"
 msgstr ""
 
-#: ../src/ui.c:95
+#: ../src/ui.c:100
 msgid "_Objects"
 msgstr "_Objekt"
 
-#: ../src/ui.c:96
+#: ../src/ui.c:101
 msgid "_Create"
 msgstr "_Skapa"
 
-#: ../src/ui.c:97
+#: ../src/ui.c:102
 msgid "_Order"
 msgstr ""
 
-#: ../src/ui.c:98
+#: ../src/ui.c:103
 msgid "_Rotate/Flip"
 msgstr ""
 
-#: ../src/ui.c:99
+#: ../src/ui.c:104
 msgid "Align _Horizontal"
 msgstr "Justera _horisontellt"
 
-#: ../src/ui.c:100
+#: ../src/ui.c:105
 msgid "Align _Vertical"
 msgstr "Justera _vertikalt"
 
-#: ../src/ui.c:101
+#: ../src/ui.c:106
 msgid "_Help"
 msgstr "_HjÃ¤lp"
 
 #. Popup entries.
-#: ../src/ui.c:104
-#: ../src/ui.c:105
+#: ../src/ui.c:109 ../src/ui.c:110
 msgid "Context Menu"
 msgstr "Sammanhangsmeny"
 
-#: ../src/ui.c:110
+#: ../src/ui.c:115
 msgid "_New"
 msgstr "_Ny"
 
-#: ../src/ui.c:112
+#: ../src/ui.c:117
 msgid "Create a new file"
 msgstr "Skapa en ny fil"
 
-#: ../src/ui.c:117
+#: ../src/ui.c:122
 msgid "_Open..."
 msgstr "_Ã?ppna..."
 
-#: ../src/ui.c:119
+#: ../src/ui.c:124
 msgid "Open a file"
 msgstr "Ã?ppna en fil"
 
-#: ../src/ui.c:124
+#: ../src/ui.c:129
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../src/ui.c:126
+#: ../src/ui.c:131
 msgid "Save current file"
 msgstr "Spara aktuell fil"
 
-#: ../src/ui.c:131
+#: ../src/ui.c:136
 msgid "Save _As..."
 msgstr "Spara s_om..."
 
-#: ../src/ui.c:133
+#: ../src/ui.c:138
 msgid "Save the current file to a different name"
 msgstr "Spara den aktuella filen med ett annat namn"
 
-#: ../src/ui.c:138
+#: ../src/ui.c:143
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: ../src/ui.c:140
+#: ../src/ui.c:145
 msgid "Print the current file"
 msgstr "Skriv ut aktuell fil"
 
-#: ../src/ui.c:145
+#: ../src/ui.c:150
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: ../src/ui.c:147
+#: ../src/ui.c:152
 msgid "Modify document properties"
 msgstr "Ã?ndra dokumentegenskaper"
 
-#: ../src/ui.c:152
+#: ../src/ui.c:157
 msgid "Template _Designer..."
 msgstr "Mall_designer..."
 
-#: ../src/ui.c:154
+#: ../src/ui.c:159
 msgid "Create a custom template"
 msgstr "Skapa en anpassad mall"
 
-#: ../src/ui.c:159
+#: ../src/ui.c:164
 msgid "_Close"
 msgstr "S_tÃ¤ng"
 
-#: ../src/ui.c:161
+#: ../src/ui.c:166
 msgid "Close the current file"
 msgstr "StÃ¤ng aktuell fil"
 
-#: ../src/ui.c:166
+#: ../src/ui.c:171
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../src/ui.c:168
+#: ../src/ui.c:173
 msgid "Quit the program"
 msgstr "Avsluta programmet"
 
-#: ../src/ui.c:175
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr ""
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+#, fuzzy
+msgid "Redo"
+msgstr "RÃ¶d"
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ../src/ui.c:177
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: ../src/ui.c:182
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ../src/ui.c:184
+#: ../src/ui.c:203
 msgid "Copy the selection"
 msgstr "Kopiera markeringen"
 
-#: ../src/ui.c:189
-msgid "Paste"
-msgstr "Klistra in"
-
-#: ../src/ui.c:191
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr "Klistra in urklipp"
 
-#: ../src/ui.c:196
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../src/ui.c:198
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Ta bort markerade objekt"
 
-#: ../src/ui.c:203
+#: ../src/ui.c:222
 msgid "Select All"
 msgstr "Markera allt"
 
-#: ../src/ui.c:205
+#: ../src/ui.c:224
 msgid "Select all objects"
 msgstr "Markera alla objekt"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:229
 msgid "Un-select All"
 msgstr "Avmarkera allt"
 
-#: ../src/ui.c:212
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "Ta bort alla markeringar"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:236
 msgid "Preferences"
 msgstr "InstÃ¤llningar"
 
-#: ../src/ui.c:219
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr "Konfigurera programmet"
 
-#: ../src/ui.c:226
+#: ../src/ui.c:245
 msgid "Zoom in"
 msgstr "Zooma in"
 
-#: ../src/ui.c:228
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr ""
 
-#: ../src/ui.c:233
+#: ../src/ui.c:252
 msgid "Zoom out"
 msgstr "Zooma ut"
 
-#: ../src/ui.c:235
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr ""
 
-#: ../src/ui.c:240
+#: ../src/ui.c:259
 msgid "Zoom 1 to 1"
 msgstr ""
 
-#: ../src/ui.c:242
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr ""
 
-#: ../src/ui.c:247
+#: ../src/ui.c:266
 msgid "Zoom to fit"
 msgstr ""
 
-#: ../src/ui.c:249
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr ""
 
-#: ../src/ui.c:256
+#: ../src/ui.c:275
 msgid "Select Mode"
 msgstr ""
 
-#: ../src/ui.c:258
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr ""
 
-#: ../src/ui.c:263
-#: ../src/view-text.c:501
-#: ../data/builder/object-editor.builder.h:31
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Text"
 
-#: ../src/ui.c:265
-msgid "Create text object"
-msgstr "Skapa textobjekt"
-
-#: ../src/ui.c:270
+#: ../src/ui.c:289
 msgid "Box"
 msgstr "Rektangel"
 
-#: ../src/ui.c:272
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr ""
 
-#: ../src/ui.c:277
-#: ../data/builder/object-editor.builder.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "Linje"
 
-#: ../src/ui.c:279
-msgid "Create line object"
-msgstr ""
-
-#: ../src/ui.c:284
+#: ../src/ui.c:303
 msgid "Ellipse"
 msgstr "Ellips"
 
-#: ../src/ui.c:286
+#: ../src/ui.c:305
 msgid "Create ellipse/circle object"
 msgstr ""
 
-#: ../src/ui.c:291
-#: ../data/builder/object-editor.builder.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/ui.c:293
-msgid "Create image object"
-msgstr ""
-
-#: ../src/ui.c:298
+#: ../src/ui.c:317
 msgid "Barcode"
 msgstr "Streckkod"
 
-#: ../src/ui.c:300
-msgid "Create barcode object"
-msgstr ""
-
-#: ../src/ui.c:305
-msgid "Bring to front"
-msgstr ""
-
-#: ../src/ui.c:307
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr ""
 
-#: ../src/ui.c:312
-msgid "Send to back"
-msgstr ""
-
-#: ../src/ui.c:314
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr ""
 
-#: ../src/ui.c:319
-msgid "Rotate left"
-msgstr "Rotera Ã¥t vÃ¤nster"
-
-#: ../src/ui.c:321
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr ""
 
-#: ../src/ui.c:326
-msgid "Rotate right"
-msgstr "Rotera Ã¥t hÃ¶ger"
-
-#: ../src/ui.c:328
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr ""
 
-#: ../src/ui.c:333
-msgid "Flip horizontally"
-msgstr ""
-
-#: ../src/ui.c:335
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr ""
 
-#: ../src/ui.c:340
-msgid "Flip vertically"
-msgstr ""
-
-#: ../src/ui.c:342
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr ""
 
-#: ../src/ui.c:347
-msgid "Align left"
-msgstr "Justera vÃ¤nster"
-
-#: ../src/ui.c:349
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr ""
 
-#: ../src/ui.c:354
-msgid "Align right"
-msgstr "Justera hÃ¶ger"
-
-#: ../src/ui.c:356
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr ""
 
-#: ../src/ui.c:361
-msgid "Align horizontal center"
-msgstr ""
-
-#: ../src/ui.c:363
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr ""
 
-#: ../src/ui.c:368
-msgid "Align tops"
-msgstr ""
-
-#: ../src/ui.c:370
+#: ../src/ui.c:389
 msgid "Align objects to top edges"
 msgstr ""
 
-#: ../src/ui.c:375
-msgid "Align bottoms"
-msgstr ""
-
-#: ../src/ui.c:377
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr ""
 
-#: ../src/ui.c:382
-msgid "Align vertical center"
-msgstr ""
-
-#: ../src/ui.c:384
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr ""
 
-#: ../src/ui.c:389
-msgid "Center horizontally"
-msgstr ""
-
-#: ../src/ui.c:391
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: ../src/ui.c:396
-msgid "Center vertically"
-msgstr ""
-
-#: ../src/ui.c:398
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr ""
 
-#: ../src/ui.c:403
-msgid "Merge properties"
-msgstr ""
-
-#: ../src/ui.c:405
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr ""
 
-#: ../src/ui.c:412
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr "InnehÃ¥ll"
 
-#: ../src/ui.c:414
+#: ../src/ui.c:433
 msgid "Open glabels manual"
 msgstr ""
 
-#: ../src/ui.c:419
+#: ../src/ui.c:438
 msgid "About..."
 msgstr "Om..."
 
-#: ../src/ui.c:421
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr "Om glabels"
 
-#: ../src/ui.c:431
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr ""
 
-#: ../src/ui.c:433
+#: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr ""
 
-#: ../src/ui.c:439
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr "RutnÃ¤t"
 
-#: ../src/ui.c:441
+#: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
 msgstr ""
 
-#: ../src/ui.c:447
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr ""
 
-#: ../src/ui.c:449
+#: ../src/ui.c:468
 msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: ../src/ui.c:460
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr ""
 
-#: ../src/ui.c:462
+#: ../src/ui.c:481
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: ../src/ui.c:468
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr ""
 
-#: ../src/ui.c:470
+#: ../src/ui.c:489
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: ../src/ui-commands.c:1100
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "Glabels inkluderar bidrag frÃ¥n:"
 
-#: ../src/ui-commands.c:1106
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr "Se filen AUTHORS fÃ¶r ytterligare tack,"
 
-#: ../src/ui-commands.c:1107
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
 msgstr "eller besÃ¶k http://glabels.sourceforge.net/";
 
-#: ../src/ui-commands.c:1119
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr "Ett program fÃ¶r att skapa etiketter och visitkort.\n"
 
-#: ../src/ui-commands.c:1123
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po danielnylander se>\n"
@@ -1289,7 +1747,7 @@ msgstr ""
 "Skicka synpunkter pÃ¥ Ã¶versÃ¤ttningen till\n"
 "tp-sv listor tp-sv se"
 
-#: ../src/ui-commands.c:1126
+#: ../src/ui-commands.c:1161
 msgid ""
 "gLabels is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1302,211 +1760,195 @@ msgid ""
 "GNU General Public License for more details.\n"
 msgstr ""
 
-#: ../src/ui-commands.c:1153
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "glabels"
 
-#: ../src/ui-sidebar.c:154
-msgid "Object properties"
-msgstr ""
-
-#. Build editor.
-#: ../src/view-barcode.c:176
-msgid "Barcode object properties"
-msgstr ""
-
-#. Build editor.
-#: ../src/view-box.c:176
-msgid "Box object properties"
-msgstr ""
-
-#. Build editor.
-#: ../src/view-ellipse.c:178
-msgid "Ellipse object properties"
-msgstr ""
-
-#. Build editor.
-#: ../src/view-image.c:176
-msgid "Image object properties"
-msgstr ""
-
-#. Build editor.
-#: ../src/view-line.c:176
-msgid "Line object properties"
-msgstr ""
-
-#. Build editor.
-#: ../src/view-text.c:180
-msgid "Text object properties"
-msgstr ""
-
 #: ../src/warning-handler.c:69
 msgid "gLabels Error!"
 msgstr "Fel i gLabels!"
 
-#: ../src/wdgt-media-select.c:290
-#: ../src/wdgt-media-select.c:294
-#: ../src/wdgt-media-select.c:299
-#: ../src/wdgt-media-select.c:308
-#: ../src/wdgt-media-select.c:311
-#: ../src/wdgt-media-select.c:405
-#: ../src/wdgt-media-select.c:618
-#: ../src/wdgt-media-select.c:627
-msgid "Any"
-msgstr "Alla"
-
-#: ../src/wdgt-media-select.c:653
-#, c-format
-msgid "%d per sheet"
-msgstr ""
-
-#: ../src/wdgt-media-select.c:684
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-#: ../src/wdgt-media-select.c:689
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-#: ../src/wdgt-media-select.c:700
-#: ../src/wdgt-media-select.c:714
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s diameter"
-
-#: ../src/wdgt-media-select.c:704
-#: ../src/wdgt-media-select.c:718
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s diameter"
-
-#: ../src/wdgt-media-select.c:793
-msgid "No recent templates found."
-msgstr "Inga tidigare mallar hittades."
-
-#: ../src/wdgt-media-select.c:794
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr "Prova att vÃ¤lja en mall frÃ¥n sidan \"SÃ¶k alla mallar\"."
-
-#: ../src/wdgt-media-select.c:874
-msgid "No match."
-msgstr ""
-
-#: ../src/wdgt-media-select.c:875
-msgid "Try selecting a different brand, page size or category."
-msgstr ""
-
-#: ../src/window.c:256
+#: ../src/window.c:284
 msgid "(none) - gLabels"
 msgstr "(ingen) - gLabels"
 
-#: ../src/window.c:435
+#: ../src/window.c:485
 msgid "(modified)"
 msgstr "(Ã¤ndrad)"
 
-#: ../src/xml-label-04.c:75
-#: ../src/xml-label.c:320
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
 msgid "Bad root node = \"%s\""
 msgstr ""
 
-#: ../src/xml-label-04.c:123
-#: ../src/xml-label.c:403
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:187
-#: ../src/xml-label.c:225
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "xmlParseFile-fel"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Ingen dokumentrot"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Importerar frÃ¥n formatet glabels 0.1"
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Importerar frÃ¥n formatet glabels 0.4"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "OkÃ¤nd glabels Namespace -- AnvÃ¤nder %s"
 
-#: ../src/xml-label.c:357
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:850
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:1092
-#: ../libglabels/xml-template.c:664
+#: ../src/xml-label.c:944
+#, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr ""
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr ""
 
-#: ../src/xml-label.c:1099
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr ""
 
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:109
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr ""
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:122
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "AnvÃ¤ndardefinierad"
 
-#: ../libglabels/db.c:473
-msgid "Unable to locate paper size definitions.  Libglabels may not be installed correctly!"
+#: ../libglabels/db.c:665
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:866
-msgid "Unable to locate category definitions.  Libglabels may not be installed correctly!"
+#: ../libglabels/db.c:1057
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1450
-msgid "Unable to locate any template files.  Libglabels may not be installed correctly!"
+#: ../libglabels/db.c:2097
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1527
+#: ../libglabels/db.c:2164
 #, c-format
-msgid "Generic %s full page template"
+msgid "%s full page label"
 msgstr ""
 
-#: ../libglabels/xml-template.c:221
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr ""
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, c-format
+msgid "%d per sheet"
+msgstr ""
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s diameter"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "punkter"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "tum"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
+
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr ""
 
 #. This should always be an id, but just in case a name
 #. slips by!
-#: ../libglabels/xml-template.c:238
+#: ../libglabels/xml-template.c:244
 #, c-format
 msgid "Unknown page size id \"%s\", trying as name"
 msgstr ""
 
-#: ../libglabels/xml-template.c:250
+#: ../libglabels/xml-template.c:256
 #, c-format
 msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
-#: ../libglabels/xml-template.c:609
-msgid "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
+
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 
-#: ../libglabels/xml-template.c:619
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr ""
 
@@ -1518,352 +1960,383 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr ""
-
-#: ../data/builder/merge-properties-dialog.builder.h:2
-msgid "<b>Source</b>"
-msgstr "<b>KÃ¤lla</b>"
-
-#: ../data/builder/merge-properties-dialog.builder.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr ""
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Record selection/preview"
+msgstr ""
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "Markera allt"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>KÃ¤lla</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Avmarkera allt"
 
-#: ../data/builder/object-editor.builder.h:2
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Kategori:"
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "Anpassad fÃ¤rg"
+
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "Sidstorlek:"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Markera allt"
+
+#: ../data/ui/new-label-dialog.ui.h:1
+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:27
+msgid "Description:"
+msgstr "Beskrivning:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+#, fuzzy
+msgid "Label size:"
+msgstr "Sidstorlek:"
 
-#: ../data/builder/object-editor.builder.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
+#: ../data/ui/new-label-dialog.ui.h:4
+#, fuzzy
+msgid "Layout:"
+msgstr "Layout(er)"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+msgid "Normal"
+msgstr "Normal"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+msgid "Rotated"
+msgstr "Roterad"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
 
-#: ../data/builder/object-editor.builder.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:5
-#: ../data/builder/prefs-dialog.builder.h:7
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "Kontrollsumma"
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "FÃ¤rg:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "Aktivera skugga"
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "Familj:"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "Fil:"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "HÃ¶jd:"
 
-#: ../data/builder/object-editor.builder.h:17
-msgid "Insert merge field"
-msgstr ""
-
-#: ../data/builder/object-editor.builder.h:18
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:19
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "LÃ¤ngd:"
 
-#: ../data/builder/object-editor.builder.h:21
-#: ../data/builder/prefs-dialog.builder.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "Opacitet:"
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "Position"
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "Ã?terstÃ¤ll bildstorlek"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "Skugga"
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "Storlek"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "Storlek:"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/builder/object-editor.builder.h:30
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "Stil:"
 
-#: ../data/builder/object-editor.builder.h:32
-#: ../data/builder/prefs-dialog.builder.h:20
-#: ../data/builder/template-designer.builder.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Bredd:"
 
-#: ../data/builder/object-editor.builder.h:33
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "grader"
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:40
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "format:"
 
-#: ../data/builder/prefs-dialog.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/builder/prefs-dialog.builder.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr ""
-
-#: ../data/builder/prefs-dialog.builder.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linje</span>"
-
-#: ../data/builder/prefs-dialog.builder.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Text</span>"
-
-#: ../data/builder/prefs-dialog.builder.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">Enheter</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "Ã?terstÃ¤ll bildstorlek"
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "Typsnitt:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "Tum"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "Millimeter"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "Punkter"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr ""
 
-#. Most popular (at top of list)
-#: ../data/builder/prefs-dialog.builder.h:19
-#: ../templates/paper-sizes.xml.h:29
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "NamnlÃ¶s"
+
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Fet"
 
-#: ../data/builder/property-bar.builder.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:4
-msgid "Font size"
-msgstr "Typsnittsstorlek"
-
-#: ../data/builder/property-bar.builder.h:5
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../data/builder/property-bar.builder.h:6
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:8
-msgid "Line width"
-msgstr "Radbredd"
-
-#: ../data/builder/property-bar.builder.h:9
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:10
-msgid "Text color"
-msgstr "TextfÃ¤rg"
-
-#: ../data/builder/template-designer.builder.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. Radie:"
 
-#: ../data/builder/template-designer.builder.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Bredd:"
 
-#: ../data/builder/template-designer.builder.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. HÃ¶jd:"
 
-#: ../data/builder/template-designer.builder.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Marginal"
 
-#: ../data/builder/template-designer.builder.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. Rund (radie fÃ¶r hÃ¶rn):"
 
-#: ../data/builder/template-designer.builder.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Marginal"
 
-#: ../data/builder/template-designer.builder.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1881,23 +2354,19 @@ msgstr ""
 "Om inte, klicka pÃ¥ \"Avbryt\" fÃ¶r att fÃ¶rkasta din design\n"
 "eller \"BakÃ¥t\" fÃ¶r att fortsÃ¤tta redigera denna design."
 
-#: ../data/builder/template-designer.builder.h:27
-msgid "Description:"
-msgstr "Beskrivning:"
-
-#: ../data/builder/template-designer.builder.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:32
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1906,87 +2375,85 @@ msgid ""
 "The second example illustrates when two layouts are needed."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "Layout #1"
 
-#: ../data/builder/template-designer.builder.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "Layout #2"
 
-#: ../data/builder/template-designer.builder.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "Antal layouter:"
 
-#: ../data/builder/template-designer.builder.h:42
-msgid "Page size:"
-msgstr "Sidstorlek:"
-
-#: ../data/builder/template-designer.builder.h:43
-msgid "Part #:"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:44
-msgid "Please enter the following identifying information about the template stationery."
+#: ../data/ui/template-designer.ui.h:44
+msgid ""
+"Please enter the following identifying information about the template "
+"stationery."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:46
-msgid "Please enter the following size parameters of a single label in your template."
+#: ../data/ui/template-designer.ui.h:46
+msgid ""
+"Please enter the following size parameters of a single label in your "
+"template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:47
-msgid "Please enter the following size parameters of a single label or card in your template."
+#: ../data/ui/template-designer.ui.h:47
+msgid ""
+"Please enter the following size parameters of a single label or card in your "
+"template."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:48
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:49
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:51
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "RektangulÃ¤r eller fyrkantig (kan ha runda hÃ¶rn)"
 
-#: ../data/builder/template-designer.builder.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "Rund"
 
-#: ../data/builder/template-designer.builder.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr ""
 
-#: ../data/builder/template-designer.builder.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -1996,195 +2463,179 @@ msgstr ""
 "\n"
 "Denna dialog hjÃ¤lper dig att skapa en anpassad gLabels-mall."
 
-#: ../data/builder/template-designer.builder.h:62
-msgid "cd_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:63
-msgid "finish_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:65
-msgid "layout_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:66
-msgid "name_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:67
-msgid "nlayouts_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:68
-msgid "pg_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:69
-msgid "rect_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:70
-msgid "round_size_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:71
-msgid "shape_page"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:72
-msgid "start_page"
-msgstr ""
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:1
-msgid "<b>Copies</b>"
-msgstr "<b>Kopior</b>"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
-msgid "<b>Merge Control</b>"
-msgstr ""
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
-msgid "<b>Options</b>"
-msgstr ""
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
 msgid "Collate"
 msgstr "Sortera"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "Copies"
+msgstr "Kopior"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
 msgid "Copies:"
 msgstr "Kopior"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:7
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Merge Control"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "punkter"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:8
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
 msgid "Start on label"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:9
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
 msgid "from:"
 msgstr "frÃ¥n:"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:10
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
 msgid "on 1st sheet"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:14
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
 msgid "to:"
 msgstr "till:"
 
-#: ../data/desktop/glabels.desktop.in.h:1
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
 msgid "Create labels, business cards and media covers"
 msgstr "Skapa etiketter, visitkort och skivomslag"
 
-#: ../data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
 msgstr "Etikettdesignern gLabels"
 
-#: ../data/mime/glabels.keys.in.h:1
-#: ../data/mime/glabels.xml.in.h:1
+#: ../data/mime/glabels-3.0.xml.in.h:1
 msgid "gLabels Project File"
 msgstr ""
 
-#. Other ISO A series sizes
+#. Envelopes
 #: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
+
+#. Other ISO A series sizes
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0"
 
-#: ../templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1"
 
-#: ../templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10"
 
-#: ../templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2"
 
-#: ../templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3"
 
-#: ../templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4"
 
-#: ../templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5"
 
-#: ../templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6"
 
-#: ../templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7"
 
-#: ../templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8"
 
-#: ../templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9"
 
 #. ISO B series sizes
-#: ../templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0"
 
-#: ../templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1"
 
-#: ../templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10"
 
-#: ../templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2"
 
-#: ../templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3"
 
-#: ../templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4"
 
-#: ../templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5"
 
-#: ../templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6"
 
-#: ../templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7"
 
-#: ../templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8"
 
-#: ../templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9"
 
-#: ../templates/paper-sizes.xml.h:25
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "US Executive"
 
 #. Other US paper sizes
-#: ../templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "US Legal"
 
@@ -2196,7 +2647,8 @@ msgstr ""
 msgid "Any label"
 msgstr ""
 
-#: ../templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "Visitkort"
 
@@ -2212,7 +2664,8 @@ msgstr ""
 msgid "Rectangular labels"
 msgstr "RektangulÃ¤ra etiketter"
 
-#: ../templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "Runda etiketter"
 
@@ -2221,10 +2674,15 @@ msgid "Square labels"
 msgstr ""
 
 #. ===================================================================
+#. ********************************************************************
+#. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
 #: ../templates/avery-iso-templates.xml.h:2
 #: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
 #: ../templates/misc-iso-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 "Adressetiketter"
@@ -2249,6 +2707,8 @@ msgstr "Visitkort"
 #: ../templates/avery-iso-templates.xml.h:14
 #: ../templates/misc-us-templates.xml.h:8
 #: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
 msgstr "CD/DVD-etiketter"
@@ -2266,6 +2726,7 @@ msgstr ""
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:12
 #: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr ""
 
@@ -2277,79 +2738,98 @@ msgstr "CD-etiketter"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+#, fuzzy
+msgid "File Folder Labels"
+msgstr "Stora runda etiketter"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 msgid "ID Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 #, fuzzy
 msgid "Index Cards"
 msgstr "Visitkort"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "Stora runda etiketter"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:26
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:30
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
 #: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:32
-#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "Runda etiketter"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:34
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "SmÃ¥ runda etiketter"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:38
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:42
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr ""
 
@@ -2381,7 +2861,7 @@ msgstr ""
 #. ===============================================================
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:20
-#: ../templates/misc-us-templates.xml.h:18
+#: ../templates/misc-us-templates.xml.h:20
 #: ../templates/misc-iso-templates.xml.h:36
 #: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
@@ -2408,12 +2888,6 @@ msgstr "Etiketter"
 msgid "Shipping labels"
 msgstr "Leveransetiketter"
 
-#. ===================================================================
-#: ../templates/avery-other-templates.xml.h:2
-#, fuzzy
-msgid "File Folder Labels"
-msgstr "Stora runda etiketter"
-
 #: ../templates/brother-other-templates.xml.h:1
 msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr ""
@@ -2501,35 +2975,40 @@ msgid "DLT Labels"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:20
-msgid "Microtube labels"
+#: ../templates/misc-us-templates.xml.h:18
+msgid "Jewel Case Booklet"
 msgstr ""
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:22
+msgid "Microtube labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:24
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:26
+#: ../templates/misc-us-templates.xml.h:28
 #: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr ""
 
-#: ../templates/misc-us-templates.xml.h:31
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr ""
 
@@ -2612,6 +3091,12 @@ msgstr "RektangulÃ¤ra etiketter"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "AllmÃ¤nna etiketter"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr ""
 
@@ -2621,6 +3106,139 @@ msgid "Multi-Purpose Labels"
 msgstr ""
 
 #. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Adressetiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Om glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Visitkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Visitkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Visitkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Visitkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Leveransetiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Visitkort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Etiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Etiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Etiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "Om glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "RektangulÃ¤ra etiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Self-adhesive labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr ""
@@ -2655,38 +3273,74 @@ msgstr ""
 msgid "Video Labels (back)"
 msgstr ""
 
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>Mediatyp</b>"
+
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>Etikettorientering</b>"
+
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s diameter"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">Linje</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">Text</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">Enheter</span>"
+
+#~ msgid "<b>Copies</b>"
+#~ msgstr "<b>Kopior</b>"
+
 #~ msgid "%s: option `%s' is ambiguous\n"
 #~ msgstr "%s: flaggan `%s' Ã¤r tvetydig\n"
+
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
 #~ msgstr "%s: flaggan `--%s' tillÃ¥ter inte ett argument\n"
+
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
 #~ msgstr "%s: flaggan `%c%s' tillÃ¥ter inte ett argument\n"
+
 #~ msgid "%s: option `%s' requires an argument\n"
 #~ msgstr "%s: flaggan `%s' krÃ¤ver ett argument\n"
+
 #~ msgid "%s: unrecognized option `--%s'\n"
 #~ msgstr "%s: okÃ¤nd flagga `--%s'\n"
+
 #~ msgid "%s: unrecognized option `%c%s'\n"
 #~ msgstr "%s: okÃ¤nd flagga `%c%s'\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: otillÃ¥ten flagga -- %c\n"
+
 #~ msgid "%s: invalid option -- %c\n"
 #~ msgstr "%s: otillÃ¥ten flagga -- %c\n"
+
 #~ msgid "%s: option requires an argument -- %c\n"
 #~ msgstr "%s: flaggan krÃ¤ver ett argument -- %c\n"
+
 #~ msgid "         "
 #~ msgstr "         "
+
 #~ msgid "Select A File"
 #~ msgstr "VÃ¤lj en fil"
-#~ msgid "Font family"
-#~ msgstr "Typsnittsfamilj"
+
 #~ msgid "  "
 #~ msgstr "  "
-#~ msgid "Category:"
-#~ msgstr "Kategori:"
-#~ msgid "Recent templates"
-#~ msgstr "Tidigare mallar"
+
 #~ msgid "Search all templates"
 #~ msgstr "SÃ¶k alla mallar"
+
 #~ msgid "Show tooltips"
 #~ msgstr "Visa verktygstips"
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
index af9acb4..223fbf1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,55 +4,695 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels\n"
-"Report-Msgid-Bugs-To: \n" 
-"POT-Creation-Date: 2009-05-17 14:09+0800\n" 
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2009-05-19 20:16-0400\n"
-"Last-Translator: Careon <zzbusagain yahoo com cn>\n" 
-"Language-Team: Careon <zzbusagain yahoo com cn>\n" 
-"MIME-Version: 1.0\n" 
-"Content-Type: text/plain; charset=UTF-8\n" 
-"Content-Transfer-Encoding: 8bit\n" 
-"X-Poedit-Language: Chinese\n" 
-"X-Poedit-Country: CHINA\n" 
-"X-Poedit-SourceCharset: utf-8\n" 
-#: ../src/glabels.c:66 ../src/glabels-batch.c:69
-msgid "[FILE...]"
-msgstr "[æ??ä»¶...]"
+"Last-Translator: Careon <zzbusagain yahoo com cn>\n"
+"Language-Team: Careon <zzbusagain yahoo com cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (é??ç?¨)"
 
-#: ../src/glabels.c:83
-msgid "Launch gLabels label and business card designer."
-msgstr "å?¯å?¨gLabelsæ ?ç¾å??å??ç??è®¾è®¡è½¯ä»¶ã??"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (ç?¨äº?é?®ç¼?)"
+
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP+4)"
+
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
+
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (é??ç?¨)"
+
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
+
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
+
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
+
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
+
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
+
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
+
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A æ??è?? UPC-E)"
+
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
+msgstr "UPC-A"
+
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
+
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
+
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
+msgstr "UPC-E"
+
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
+
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
+
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
+msgstr "ISBN"
+
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
+
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Code 128C"
+
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Code 128B"
+
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr "Interleaved 2 of 5"
+
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr "Codabar"
+
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
+
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:155 ../src/bc.c:213
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
+
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
+
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
+
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
+
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:177
+msgid "Aztec Rune"
+msgstr ""
+
+#: ../src/bc.c:183
+#, fuzzy
+msgid "Code One"
+msgstr "Code 39"
+
+#: ../src/bc.c:186
+#, fuzzy
+msgid "Code 11"
+msgstr "Code 128"
+
+#: ../src/bc.c:189
+#, fuzzy
+msgid "Code 16K"
+msgstr "Code 128"
+
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
+
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
+
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
+
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
+
+#: ../src/bc.c:207
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc.c:210
+#, fuzzy
+msgid "Code 49"
+msgstr "Code 39"
+
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
+
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
+
+#: ../src/bc.c:225
+#, fuzzy
+msgid "Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
+
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
+
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
+msgstr ""
+
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
+msgstr ""
+
+#: ../src/bc.c:240
+msgid "Grid Matrix"
+msgstr ""
+
+#: ../src/bc.c:243
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
+msgstr ""
+
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
+
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
+msgstr ""
+
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
+msgstr ""
+
+#: ../src/bc.c:264
+#, fuzzy
+msgid "HIBC Code 128"
+msgstr "Code 128"
+
+#: ../src/bc.c:267
+#, fuzzy
+msgid "HIBC Code 39"
+msgstr "Code 39"
+
+#: ../src/bc.c:270
+#, fuzzy
+msgid "HIBC Data Matrix"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
+
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
+
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
+msgstr ""
+
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
+
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
+
+#: ../src/bc.c:297
+msgid "Korean Postal"
+msgstr ""
+
+#: ../src/bc.c:300
+msgid "LOGMARS"
+msgstr ""
+
+#: ../src/bc.c:303
+msgid "Micro PDF417"
+msgstr ""
+
+#: ../src/bc.c:306
+msgid "Micro QR Code"
+msgstr ""
+
+#: ../src/bc.c:309
+#, fuzzy
+msgid "MSI Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
+
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
+
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
+
+#: ../src/bc.c:321
+#, fuzzy
+msgid "PLANET"
+msgstr "CEPNET"
+
+#: ../src/bc.c:324
+#, fuzzy
+msgid "PostNet"
+msgstr "ç²?è´´"
+
+#: ../src/bc.c:327
+#, fuzzy
+msgid "Pharmacode"
+msgstr "æ?¡å½¢ç ?"
+
+#: ../src/bc.c:330
+msgid "Pharmacode 2-track"
+msgstr ""
+
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
+msgstr ""
+
+#: ../src/bc.c:336
+msgid "QR Code"
+msgstr ""
+
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
+
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "å? é?¤"
+
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
+
+#: ../src/bc.c:354
+msgid "USPS One Code"
+msgstr ""
+
+#: ../src/bc.c:357
+#, fuzzy
+msgid "UK Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
+
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+msgid "Default Color"
+msgstr "é»?è®¤é¢?è?²"
+
+#: ../src/color-combo-menu.c:83
+msgid "Dark Red"
+msgstr "æ??çº¢"
+
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr "æ£?è?²"
+
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr "æ??é»?"
+
+#: ../src/color-combo-menu.c:86
+msgid "Dark Green"
+msgstr "æ??ç»¿"
+
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr "æ??å??çº¢"
+
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr "æµ·æ°´è??"
+
+#: ../src/color-combo-menu.c:89
+msgid "Dark Violet"
+msgstr "ç´«é»?"
+
+#: ../src/color-combo-menu.c:91
+msgid "Red"
+msgstr "çº¢è?²"
+
+#: ../src/color-combo-menu.c:92
+msgid "Orange"
+msgstr "æ¡?çº¢"
+
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr "æ??é»?"
+
+#: ../src/color-combo-menu.c:94
+msgid "Medium green"
+msgstr "ä¸ç?ç»¿"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr "è??ç»¿"
+
+#: ../src/color-combo-menu.c:96
+msgid "Blue"
+msgstr "è??è?²"
+
+#: ../src/color-combo-menu.c:97
+msgid "Purple"
+msgstr "ç´«çº¢"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr "é©¬å??é±¼è?²"
+
+#: ../src/color-combo-menu.c:100
+msgid "Gold"
+msgstr "é??é»?"
+
+#: ../src/color-combo-menu.c:101
+msgid "Yellow"
+msgstr "é»?è?²"
 
-#: ../src/glabels.c:91 ../src/glabels-batch.c:105
+#: ../src/color-combo-menu.c:102
+msgid "Green"
+msgstr "ç»¿è?²"
+
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr "è??ç»¿è?²"
+
+#: ../src/color-combo-menu.c:104
+msgid "SkyBlue"
+msgstr "å¤©ç©ºè??"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr "ç´«è?²"
+
+#: ../src/color-combo-menu.c:107
+msgid "Pink"
+msgstr "ç²?çº¢"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr "æµ?æ£?é»?è?²"
+
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
+msgstr "æµ?é»?"
+
+#: ../src/color-combo-menu.c:110
+msgid "Light Green"
+msgstr "æµ?ç»¿"
+
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
+msgstr "æµ?å??çº¢è?²"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr "ç?³ç?°ç?½"
+
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
+msgstr ""
+
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr "ç?½è?²"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr "10% ç?°è?²"
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr "25% ç?°è?²"
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr "40% ç?°è?²"
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr "50% ç?°è?²"
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr "60% ç?°è?²"
+
+#: ../src/color-combo-menu.c:126
+msgid "Black"
+msgstr "é»?è?²"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+msgid "Custom Color"
+msgstr "è?ªå®?ä¹?é¢?è?²"
+
+#: ../src/color-combo-menu.c:319
 #, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+msgid "Custom Color #%u"
+msgstr "è?ªå®?ä¹?é¢?è?² #%u"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr "gLabelså?ºç?°ä¸¥é??é??è¯¯ï¼?"
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "æ?°å»ºæ ?ç¾æ??å??ç??"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+msgid "Label properties"
+msgstr "æ ?ç¾å±?æ?§"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
+msgstr "å?¨é?¨æ??ä»¶"
+
+#: ../src/file.c:272 ../src/file.c:562
+msgid "gLabels documents"
+msgstr "gLabelsæ??ä»¶(.glabels)"
+
+#: ../src/file.c:319 ../src/file.c:620
+msgid "Empty file name selection"
+msgstr "æ²¡æ??é??æ?©æ??ä»¶"
+
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
+msgstr "è¯·é??æ?©æ??ä»¶ï¼?æ??è¾?å?¥æ??ä»¶å??"
+
+#: ../src/file.c:335
+msgid "File does not exist"
+msgstr "æ??ä»¶ä¸?å?å?¨"
+
+#: ../src/file.c:410
+#, c-format
+msgid "Could not open file \"%s\""
+msgstr "æ? æ³?æ??å¼?æ??ä»¶ \"%s\""
+
+#: ../src/file.c:413
+msgid "Not a supported file format"
+msgstr "ä¸?æ?¯æ??ç??æ??ä»¶æ ¼å¼?"
+
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
+msgid "Could not save file \"%s\""
+msgstr "æ? æ³?ä¿?å?æ??ä»¶ \"%s\""
+
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
+msgstr "ä¿?å?æ?¶å?ºé??ã??æ??ä»¶æ²¡æ??ä¿?å?ã??"
+
+#: ../src/file.c:535
+#, c-format
+msgid "Save \"%s\" as"
+msgstr " \"%s\" å?¦å?ä¸º"
+
+#: ../src/file.c:623
+msgid "Please supply a valid file name"
+msgstr "è¯·è¾?å?¥æ??ä»¶å??"
+
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
+msgstr "è¦?ç??æ??ä»¶ \"%s\"ï¼?"
+
+#: ../src/file.c:648
+msgid "File already exists."
+msgstr "å·²æ??å??å??æ??ä»¶ã??"
+
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
+msgstr "å?¨å?³é?å??å??ä¿?å?æ??ä»¶ \"%s\"ï¼?"
+
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
+msgstr "å¦?æ??ä¸?ä¿?å?ï¼?æ??å??ç??æ?´æ?¹ä¼?ä¸¢å¤±ã??"
+
+#: ../src/file.c:751
+msgid "Close without saving"
+msgstr "å?³é?(ä¸?ä¿?å?)"
+
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "æ??è¿?ç??æ¨¡æ?¿"
+
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "å?¨é?¨æ??ä»¶"
+
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
 msgstr ""
-"%s\n"
-"è¿?è¡?'%s --help'æ?¥æ?¥ç??å?¯ç?¨ç??å?½ä»¤å??æ?°ã??\n"
 
 #: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "è¾?å?ºæ??ä»¶å??(é»?è®¤å?¼=\"output.pdf\")"
 
-#: src/glabels-batch.c:56 src/glabels-batch.c:70
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
 msgstr "æ??ä»¶å??"
 
-#: src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
 msgstr "æ¯?é¡µæ?°é??(é»?è®¤å?¼=1)"
 
-#: src/glabels-batch.c:54
+#: ../src/glabels-batch.c:55
 msgid "sheets"
 msgstr "æ?°é??"
 
-#: src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
 msgstr "å?¯æ?¬æ?°é??(é»?è®¤å?¼=1)"
 
-#: src/glabels-batch.c:56
+#: ../src/glabels-batch.c:57
 msgid "copies"
 msgstr "å?¯æ?¬"
 
@@ -64,15 +704,15 @@ msgstr "ç¬¬1é¡µç??ç¬¬1ä¸ªæ ?ç¾ (é»?è®¤å?¼=1)"
 msgid "first"
 msgstr "ç¬¬1ä¸ª"
 
-#: src/glabels-batch.c:64 src/print-dialog.c:336
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print outlines (to test printer alignment)"
 msgstr "æ??å?°å¤?æ¡?çº¿(ç?¨äº?æ ¡æ£æ??å?°æ?º)"
 
-#: src/glabels-batch.c:66 src/print-dialog.c:344
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr "å??è½¬æ??å?° (ä¾?å¦?å¯¹ç§°)"
 
-#: ../src/glabels-batch.c:65 ../data/builder/print-custom-widget.glade.h:4
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "æ??å?°è£?å?ªæ ?è®°"
 
@@ -80,133 +720,634 @@ msgstr "æ??å?°è£?å?ªæ ?è®°"
 msgid "input file for merging"
 msgstr "è¾?å?¥è¦?æ??å?¥ç??æ??ä»¶å??"
 
-#: ../src/glabels-batch.c:97
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[æ??ä»¶...]"
+
+#: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
 msgstr "æ??å?°gLabelsæ??ä»¶ã??"
 
-#: ../src/glabels-batch.c:147
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
-msgid "cannot perform document merge with glabels file %s\n"
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"æ? æ³?å??å¹¶glabelsæ??ä»¶%s \n"
+"%s\n"
+"è¿?è¡?'%s --help'æ?¥æ?¥ç??å?¯ç?¨ç??å?½ä»¤å??æ?°ã??\n"
 
-#: ../src/glabels-batch.c:169
+#: ../src/glabels-batch.c:151
+#, c-format
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "æ? æ³?å??å¹¶glabelsæ??ä»¶%s \n"
+
+#: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "æ? æ³?æ??å¼?glabelsæ??ä»¶ %s\n"
 
-#: ../src/window.c:259
-msgid "(none) - gLabels"
-msgstr "(æ? ) - gLabels"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr "å?¯å?¨gLabelsæ ?ç¾å??å??ç??è®¾è®¡è½¯ä»¶ã??"
 
-#: src/window.c:414
-msgid "(modified)"
-msgstr "(å·²ä¿®æ?¹)"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "æ?°å»ºæ?¡å½¢ç ?"
+
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "ç©ºæ?¡å½¢ç ?æ?°æ?®"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "æ?¡å½¢ç ?å±?æ?§"
+
+#: ../src/label-barcode.c:485
+msgid "Barcode data empty"
+msgstr "ç©ºæ?¡å½¢ç ?æ?°æ?®"
+
+#: ../src/label-barcode.c:489
+msgid "Invalid barcode data"
+msgstr "æ?¡å½¢ç ?æ?°æ?®æ? æ??"
+
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "æ?°å»ºæ??å?å¯¹è±¡"
+
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr "å¡«å??è?²"
+
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr "çº¿æ?¡é¢?è?²"
+
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr "çº¿å®½"
+
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr "æ?ªå?½å??"
+
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "å??å¹¶å±?æ?§"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "å? é?¤"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "ç§»å?°ä¸?å±?"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr "ç§»å?°ä¸?å±?"
+
+#: ../src/label.c:1307
+#, fuzzy
+msgid "Rotate"
+msgstr "æ??è½¬"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "å??å·¦æ??è½¬"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "å??å?³æ??è½¬"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "æ°´å¹³ç¿»è½¬"
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "å??ç?´ç¿»è½¬"
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "å·¦å¯¹é½?"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "å?³å¯¹é½?"
 
-#: src/stock.c:65 data/ui/glabels-ui.xml.h:162
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "æ°´å¹³ä¸å¿?å?±çº¿"
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr "é¡¶ç«¯å¯¹é½?"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "åº?é?¨å¯¹é½?"
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "å??ç?´ä¸å¿?å?±çº¿"
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "æ°´å¹³å±?ä¸"
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "å??ç?´å±?ä¸"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "ç²?è´´"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "æ?°å»ºçº¿æ?¡å¯¹è±¡"
+
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "æ?°å»ºå?¾ç??å¯¹è±¡"
+
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "æ?¢å¤?å?¾ç??å¤§å°?"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "æ?°å»ºçº¿æ?¡å¯¹è±¡"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "çº¸å¼ å¤§å°?"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "é?´å½±"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "é?´å½±"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "é?´å½±"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "é?´å½±"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "æ?°å»ºæ??å?å¯¹è±¡"
+
+#: ../src/label-text.c:451
+msgid "Typing"
+msgstr ""
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "å?ä½?ç³»å??"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "å?ä½?å¤§å°?"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "å??å?³æ??è½¬"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "æ??ä½?"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "å·¦å¯¹é½?"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "çº¿æ?¡é?´é??ï¼?"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+#, fuzzy
+msgid "Text color"
+msgstr "æ??å?é¢?è?²"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "é??ç?¨"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "é??ç?¨"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "é??ç?¨"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "æ??è¿?æ²¡æ??ä½¿ç?¨æ¨¡æ?¿ã??"
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr "è¯·ä»? \"æ?¥æ?¾å?¨é?¨æ¨¡æ?¿\" é¡µé?¢ä¸é??æ?©ä¸?ä¸ªæ¨¡æ?¿ã??"
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr "ä¸?ç?¸ç¬¦ã??"
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr "è¯·é??æ?©å?¶å®?å??ç??ï¼?çº¸å¼ å°ºå¯¸æ??ç±»å??ã??"
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "æ??è¿?æ²¡æ??ä½¿ç?¨æ¨¡æ?¿ã??"
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "æ? "
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr "ä¸?è?½æ?¥è¯¢æ?°æ?®ç»?"
+
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+msgid "Couldn't open addressbook."
+msgstr "ä¸?è?½æ??å¼?é??è¿?å½?"
+
+#: ../src/merge-evolution.c:348
+msgid "Couldn't list available fields."
+msgstr "æ? æ³?æ?¾ç¤ºæ??æ??å?ºå??ã??"
+
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr "æ? æ³?è¯»å??é??è¿?å½?ä¿¡æ?¯ã??"
+
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
+
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "ä»?Evolutionå¯¼å?ºç??é??è¿?å½?"
+
+#: ../src/merge-init.c:125
+#, fuzzy
+msgid "VCards"
+msgstr "å¤¹çº¸æ?¡"
+
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "å??å¹¶å±?æ?§"
+
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "é??æ?©è¦?æ??å?¥ç??æ?°æ?®"
+
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "æ? "
+
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "é??æ?©"
+
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "è®°å½?/å?ºå??"
+
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "æ?°æ?®"
+
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
+msgid "Fixed"
+msgstr "å?ºå®?å?¼"
+
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "æ¨¡å¼?é??æ?©"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
+
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
+
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+msgid "Default"
+msgstr "é»?è®¤å?¼"
+
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "å¯¹è±¡å±?æ?§"
+
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "ç?©å½¢å±?æ?§"
+
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "æ¤å??å±?æ?§"
+
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "çº¿æ?¡å±?æ?§"
+
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "å?¾ç??å±?æ?§"
+
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "æ??å?å±?æ?§"
+
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "æ?¡å½¢ç ?å±?æ?§"
+
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "æ??å?¥å??å¹¶å?ºå??"
+
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+msgid "No Fill"
+msgstr "æ²¡æ??å¡«å??"
+
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
+msgstr "å?¨é?¨æ??ä»¶"
+
+#: ../src/object-editor-image-page.c:283
+msgid "All Images"
+msgstr "å?¨é?¨å?¾ç??"
+
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr "%s (*.%s)"
+
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+msgid "No Line"
+msgstr "æ²¡æ??çº¿æ?¡"
+
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "gLabelså??æ?°"
+
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "æ ?ç¾"
+
+#: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr "é??æ?©æ¨¡å¼?(_S)"
 
-#: src/stock.c:66 data/ui/glabels-ui.xml.h:163
+#: ../src/stock.c:71
 msgid "_Text"
 msgstr "æ??å?(_T)"
 
-#: src/stock.c:67 data/ui/glabels-ui.xml.h:148
+#: ../src/stock.c:72
 msgid "_Line"
 msgstr "çº¿æ?¡(_L)"
 
-#: src/stock.c:68 data/ui/glabels-ui.xml.h:130
+#: ../src/stock.c:73
 msgid "_Box"
 msgstr "ç?©å½¢(_B)"
 
-#: src/stock.c:69 data/ui/glabels-ui.xml.h:141
+#: ../src/stock.c:74
 msgid "_Ellipse"
 msgstr "æ¤å??(_E)"
 
-#: src/stock.c:70 
+#: ../src/stock.c:75
 msgid "_Image"
 msgstr "å?¾ç??(_I)"
 
-#: src/stock.c:71 data/ui/glabels-ui.xml.h:11
+#: ../src/stock.c:76
 msgid "Bar_code"
 msgstr "æ?¡å½¢ç ?(_C)"
 
-#: src/stock.c:72
+#: ../src/stock.c:77
 msgid "_Merge Properties"
 msgstr "å??å¹¶å±?æ?§(_M)"
 
-#: src/stock.c:73
+#: ../src/stock.c:78
 msgid "Object _Properties"
 msgstr "å¯¹è±¡å±?æ?§(_P)"
 
-#: src/stock.c:74 data/ui/glabels-ui.xml.h:13
+#: ../src/stock.c:79
 msgid "Bring to _Front"
 msgstr "ç§»å?°ä¸?å±?(_F)"
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:109
+#: ../src/stock.c:80
 msgid "Send to _Back"
 msgstr "ç§»å?°ä¸?å±?(_B)"
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:96
+#: ../src/stock.c:81
 msgid "Rotate _Left"
 msgstr "å??å·¦æ??è½¬(_L)"
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:97
+#: ../src/stock.c:82
 msgid "Rotate _Right"
 msgstr "å??å?³æ??è½¬(_R)"
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
+#: ../src/stock.c:83
 msgid "Flip _Horizontally"
 msgstr "æ°´å¹³ç¿»è½¬(_H)"
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
+#: ../src/stock.c:84
 msgid "Flip _Vertically"
 msgstr "å??ç?´ç¿»è½¬(_V)"
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:147
+#: ../src/stock.c:85
 msgid "_Lefts"
 msgstr "é? å·¦(_L)"
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:159
+#: ../src/stock.c:86
 msgid "_Rights"
 msgstr "é? å?³(_R)"
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:131
+#: ../src/stock.c:87
 msgid "_Centers"
 msgstr "å±?ä¸(_C)"
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:164
+#: ../src/stock.c:88
 msgid "_Tops"
 msgstr "é¡¶é?¨(_T)"
 
-#: src/stock.c:84
+#: ../src/stock.c:89
 msgid "Bottoms"
 msgstr "åº?é?¨"
 
-#: src/stock.c:85
+#: ../src/stock.c:90
 msgid "Centers"
 msgstr "å±?ä¸"
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
+#: ../src/stock.c:91 ../src/stock.c:92
 msgid "Label Ce_nter"
 msgstr "æ ?ç¾ä¸å¿?(_N)"
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
-msgstr "å¡«å??è?²"
-
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
-msgstr "çº¿æ?¡é¢?è?²"
-
-#: src/stock.c:90 src/stock.c:92
+#: ../src/stock.c:95 ../src/stock.c:97
 msgid "Linked"
 msgstr "ç?¸è¿?"
 
-#: src/stock.c:91 src/stock.c:93
+#: ../src/stock.c:96 ../src/stock.c:98
 msgid "Not Linked"
 msgstr "ä¸?ç?¸è¿?"
 
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "gLabels æ¨¡æ?¿è®¾è®¡å·¥å?·r"
+
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr "æ¬¢è¿?"
+
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "å??ç§°å??è¯´æ??"
+
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "çº¸å¼ å°ºå¯¸"
+
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "æ ?ç¾æ??å??ç??å½¢ç?¶"
+
+#: ../src/template-designer.c:661
+msgid "Label or Card Size"
+msgstr "æ ?ç¾æ??å??ç??å°ºå¯¸"
+
+#: ../src/template-designer.c:760
+msgid "Label Size (round)"
+msgstr "æ ?ç¾å°ºå¯¸(å??å½¢)"
+
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "æ ?ç¾å°ºå¯¸(CD/DVD)"
+
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "å¸?å±?ä¸ªæ?°"
+
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "å¸?å±?"
+
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "è®¾è®¡å®?æ??"
+
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "gLabels æ¨¡æ?¿è®¾è®¡å·¥å?·r"
+
+#: ../src/template-designer.c:1423
+#, fuzzy
+msgid "Brand and part# match an existing template!"
+msgstr "<span foreground='red' weight='bold'>æ¨¡æ?¿ä¸å·²æ??ç??å??ç??å??è§?æ ¼</span>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -341,365 +1482,272 @@ msgstr "é??å?º(_Q)"
 msgid "Quit the program"
 msgstr "é??å?ºç¨?åº?"
 
-#: ../src/ui.c:180
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr ""
+
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+#, fuzzy
+msgid "Redo"
+msgstr "çº¢è?²"
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "å?ªå??"
 
-#: ../src/ui.c:182
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "å?ªå??é??ä¸ç??å??å®¹"
 
-#: ../src/ui.c:187
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr "å¤?å?¶"
 
-#: ../src/ui.c:189
+#: ../src/ui.c:203
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??ä¸ç??å??å®¹"
 
-#: ../src/ui.c:194
-msgid "Paste"
-msgstr "ç²?è´´"
-
-#: ../src/ui.c:196
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr "ç²?è´´å?°å?ªè´´æ?¿"
 
-#: ../src/ui.c:201
-msgid "Delete"
-msgstr "å? é?¤"
-
-#: ../src/ui.c:203
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "å? é?¤é??ä¸ç??å¯¹è±¡"
 
-#: ../src/ui.c:208
+#: ../src/ui.c:222
 msgid "Select All"
 msgstr "å?¨é??"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:224
 msgid "Select all objects"
 msgstr "é??ä¸å?¨é?¨å¯¹è±¡"
 
-#: ../src/ui.c:215
+#: ../src/ui.c:229
 msgid "Un-select All"
 msgstr "å??æ¶?å?¨é??"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "å? é?¤å?¨é?¨é??ä¸ç??å??å®¹"
 
-#: ../src/ui.c:222
+#: ../src/ui.c:236
 msgid "Preferences"
 msgstr "å??æ?°"
 
-#: ../src/ui.c:224
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr "å¯¹ç¨?åº?è¿?è¡?è®¾ç½®"
 
-#: ../src/ui.c:231
+#: ../src/ui.c:245
 msgid "Zoom in"
 msgstr "æ?¾å¤§"
 
-#: ../src/ui.c:233
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "æ?¾å¤§"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:252
 msgid "Zoom out"
 msgstr "ç¼©å°?"
 
-#: ../src/ui.c:240
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr "ç¼©å°?"
 
-#: ../src/ui.c:245
+#: ../src/ui.c:259
 msgid "Zoom 1 to 1"
 msgstr "1:1 ç¼©æ?¾"
 
-#: ../src/ui.c:247
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr "ç¼©æ?¾å?°å®?é??å¤§å°?ç?? 100% "
 
-#: ../src/ui.c:252
+#: ../src/ui.c:266
 msgid "Zoom to fit"
 msgstr "æ??ä½³æ¯?ä¾?"
 
-#: ../src/ui.c:254
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr "ç¼©æ?¾å?°é??å??çª?å?£"
 
-#: ../src/ui.c:261
+#: ../src/ui.c:275
 msgid "Select Mode"
 msgstr "æ¨¡å¼?é??æ?©"
 
-#: ../src/ui.c:263
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "é??æ?©ï¼?ç§»å?¨æ??å? é?¤å¯¹è±¡"
 
-#: ../src/ui.c:268 ../src/view-text.c:494
-#: ../data/builder/object-editor.glade.h:32
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "æ??å?"
 
-#: ../src/ui.c:270
-msgid "Create text object"
-msgstr "æ?°å»ºæ??å?å¯¹è±¡"
-
-#: ../src/ui.c:275
+#: ../src/ui.c:289
 msgid "Box"
 msgstr "ç?©å½¢"
 
-#: ../src/ui.c:277
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr "æ?°å»ºç?©å½¢å¯¹è±¡"
 
-#: ../src/ui.c:282 ../data/builder/object-editor.glade.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "çº¿æ?¡"
 
-#: ../src/ui.c:284
-msgid "Create line object"
-msgstr "æ?°å»ºçº¿æ?¡å¯¹è±¡"
-
-#: ../src/ui.c:289
+#: ../src/ui.c:303
 msgid "Ellipse"
 msgstr "æ¤å??"
 
-#: ../src/ui.c:291
+#: ../src/ui.c:305
 msgid "Create ellipse/circle object"
 msgstr "æ?°å»º æ¤å??/å?? å¯¹è±¡"
 
-#: ../src/ui.c:296 ../data/builder/object-editor.glade.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
 msgid "Image"
 msgstr "å?¾ç??"
 
-#: ../src/ui.c:298
-msgid "Create image object"
-msgstr "æ?°å»ºå?¾ç??å¯¹è±¡"
-
-#: ../src/ui.c:303
+#: ../src/ui.c:317
 msgid "Barcode"
 msgstr "æ?¡å½¢ç ?"
 
-#: ../src/ui.c:305
-msgid "Create barcode object"
-msgstr "æ?°å»ºæ?¡å½¢ç ?"
-
-#: ../src/ui.c:310
-msgid "Bring to front"
-msgstr "ç§»å?°ä¸?å±?"
-
-#: ../src/ui.c:312
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr "ç§»å?°æ??é¡¶ç«¯"
 
-#: ../src/ui.c:317
-msgid "Send to back"
-msgstr "ç§»å?°ä¸?å±?"
-
-#: ../src/ui.c:319
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr "æ??ä¸?å±?å¯¹è±¡ç§»å?°æ??åº?å±?"
 
-#: ../src/ui.c:324
-msgid "Rotate left"
-msgstr "å??å·¦æ??è½¬"
-
-#: ../src/ui.c:326
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr "å??å·¦æ??è½¬90åº¦"
 
-#: ../src/ui.c:331
-msgid "Rotate right"
-msgstr "å??å?³æ??è½¬"
-
-#: ../src/ui.c:333
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr "å??å?³æ??è½¬90åº¦"
 
-#: ../src/ui.c:338
-msgid "Flip horizontally"
-msgstr "æ°´å¹³ç¿»è½¬"
-
-#: ../src/ui.c:340
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr "æ°´å¹³ç¿»è½¬å¯¹è±¡"
 
-#: ../src/ui.c:345
-msgid "Flip vertically"
-msgstr "å??ç?´ç¿»è½¬"
-
-#: ../src/ui.c:347
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr "å??ç?´ç¿»è½¬å¯¹è±¡"
 
-#: ../src/ui.c:352
-msgid "Align left"
-msgstr "å·¦å¯¹é½?"
-
-#: ../src/ui.c:354
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr "å¤?ä¸ªå¯¹è±¡ä¸?å·¦è¾¹ç??å¯¹é½?"
 
-#: ../src/ui.c:359
-msgid "Align right"
-msgstr "å?³å¯¹é½?"
-
-#: ../src/ui.c:361
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr "å¤?ä¸ªå¯¹è±¡ä¸?å·¦è¾¹ç??å¯¹é½?"
 
-#: ../src/ui.c:366
-msgid "Align horizontal center"
-msgstr "æ°´å¹³ä¸å¿?å?±çº¿"
-
-#: ../src/ui.c:368
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr "å¤?ä¸ªå¯¹è±¡ç??æ°´å¹³ä¸å¿?å?±çº¿"
 
-#: ../src/ui.c:373
-msgid "Align tops"
-msgstr "é¡¶ç«¯å¯¹é½?"
-
-#: ../src/ui.c:375
+#: ../src/ui.c:389
 msgid "Align objects to top edges"
 msgstr "å¤?ä¸ªå¯¹è±¡ä¸?ä¸?è¾¹ç??å¯¹é½?"
 
-#: ../src/ui.c:380
-msgid "Align bottoms"
-msgstr "åº?é?¨å¯¹é½?"
-
-#: ../src/ui.c:382
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr "å¤?ä¸ªå¯¹è±¡ä¸?ä¸?è¾¹ç??å¯¹é½?"
 
-#: ../src/ui.c:387
-msgid "Align vertical center"
-msgstr "å??ç?´ä¸å¿?å?±çº¿"
-
-#: ../src/ui.c:389
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr "å¤?ä¸ªå¯¹è±¡ç??å??ç?´ä¸å¿?å?±çº¿"
 
-#: ../src/ui.c:394
-msgid "Center horizontally"
-msgstr "æ°´å¹³å±?ä¸"
-
-#: ../src/ui.c:396
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr "å¯¹è±¡ä¸å¿?ä¸?æ°´å¹³ä¸å¿?é??å??"
 
-#: ../src/ui.c:401
-msgid "Center vertically"
-msgstr "å??ç?´å±?ä¸"
-
-#: ../src/ui.c:403
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr "å¯¹è±¡ä¸å¿?ä¸?å??ç?´ä¸å¿?é??å??"
 
-#: ../src/ui.c:408
-msgid "Merge properties"
-msgstr "å??å¹¶å±?æ?§"
-
-#: ../src/ui.c:410
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr "ç¼?è¾?å??å¹¶å±?æ?§"
 
-#: ../src/ui.c:417
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr "å??å®¹"
 
-#: ../src/ui.c:419
+#: ../src/ui.c:433
 msgid "Open glabels manual"
 msgstr "æ??å¼?glabelså¸®å?©æ??å??"
 
-#: ../src/ui.c:424
+#: ../src/ui.c:438
 msgid "About..."
 msgstr "å?³äº?..."
 
-#: ../src/ui.c:426
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr "å?³äº?glabels"
 
 # CHECK
-#: ../src/ui.c:436
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr "å±?æ?§æ ?"
 
-#: ../src/ui.c:438
+#: ../src/ui.c:452
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr "æ?¹å??å½?å??çª?å?£ä¸å±?æ?§æ ?ç??å?¯è§?æ?§"
 
-#: ../src/ui.c:444
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr "å??å??æ ¼"
 
-#: ../src/ui.c:446
+#: ../src/ui.c:460
 msgid "Change the visibility of the grid in the current window"
 msgstr "æ?¹å??å½?å??çª?å?£ä¸å??å??æ ¼ç??å?¯è§?æ?§"
 
-#: ../src/ui.c:452
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr "æ ?è®°"
 
-#: ../src/ui.c:454
+#: ../src/ui.c:468
 msgid "Change the visibility of markup lines in the current window"
 msgstr "æ?¹å??å½?å??çª?å?£ä¸æ ?è®°çº¿æ?¡ç??å?¯è§?æ?§"
 
-#: ../src/ui.c:465
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr "ä¸»å·¥å?·æ ?"
 
-#: ../src/ui.c:467
+#: ../src/ui.c:481
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "æ?¹å??å½?å??çª?å?£ä¸ä¸»å·¥å?·æ ?ç??å?¯è§?æ?§"
 
-#: ../src/ui.c:473
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr "ç»?å?¾æ ?"
 
-#: ../src/ui.c:475
+#: ../src/ui.c:489
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "æ?¹å??å½?å??çª?å?£ä¸ç»?å?¾æ ?ç??å?¯è§?æ?§"
 
-#: ../src/ui-property-bar.c:279 ../src/prefs-dialog.c:328
-#: ../src/object-editor-bc-page.c:93 ../src/object-editor-text-page.c:93
-#: ../src/object-editor-shadow-page.c:93
-msgid "Default"
-msgstr "é»?è®¤å?¼"
-
-#: ../src/ui-property-bar.c:291 ../src/prefs-dialog.c:334
-#: ../src/object-editor-fill-page.c:79
-msgid "No Fill"
-msgstr "æ²¡æ??å¡«å??"
-
-#: ../src/ui-property-bar.c:303 ../src/prefs-dialog.c:331
-#: ../src/object-editor-line-page.c:81
-msgid "No Line"
-msgstr "æ²¡æ??çº¿æ?¡"
-
-#: ../src/ui-sidebar.c:152
-msgid "Object properties"
-msgstr "å¯¹è±¡å±?æ?§"
-
-#: ../src/ui-commands.c:1064
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "Glabels å??æ?¬ç??å??å¸?å??å®¹æ?¥è?ªï¼?"
 
-#: ../src/ui-commands.c:1070
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr "æ?¥ç??AUTHORSæ??ä»¶æ?¥è?·å¾?æ?´å¤?ä¿¡æ?¯ï¼?"
 
-#: ../src/ui-commands.c:1071
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
 msgstr "æ??è??è®¿é?® http://glabels.sourceforge.net/";
 
-#: ../src/ui-commands.c:1083
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr "ä¸?ä¸ªæ ?ç¾å??å??ç??è®¾è®¡ç¨?åº?ã??\n"
 
-#: ../src/ui-commands.c:1087
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr ""
 "Marcus Bauer <m 7n7 de>\n"
@@ -707,17 +1755,18 @@ msgstr ""
 "Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Careone <zzbusagain yahoo com cn>"
 
-#: ../src/ui-commands.c:1090
+#: ../src/ui-commands.c:1161
+#, fuzzy
 msgid ""
-"Glabels is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
-"the GNU General Public License for more details.\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 msgstr ""
 "Glabels is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by\n"
@@ -729,743 +1778,170 @@ msgstr ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
 "the GNU General Public License for more details.\n"
 
-#: ../src/ui-commands.c:1116
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "glabels"
 
-#: ../src/file.c:91
-msgid "New Label or Card"
-msgstr "æ?°å»ºæ ?ç¾æ??å??ç??"
-
-#: ../src/file.c:191
-msgid "Label properties"
-msgstr "æ ?ç¾å±?æ?§"
-
-#: ../src/file.c:292 ../src/file.c:578
-msgid "All files"
-msgstr "å?¨é?¨æ??ä»¶"
-
-#: ../src/file.c:297 ../src/file.c:583
-msgid "gLabels documents"
-msgstr "gLabelsæ??ä»¶(.glabels)"
-
-#: ../src/file.c:343 ../src/file.c:640
-msgid "Empty file name selection"
-msgstr "æ²¡æ??é??æ?©æ??ä»¶"
-
-#: ../src/file.c:346 ../src/file.c:362
-msgid "Please select a file or supply a valid file name"
-msgstr "è¯·é??æ?©æ??ä»¶ï¼?æ??è¾?å?¥æ??ä»¶å??"
-
-#: src/file.c:519 src/file.c:631
-msgid "File does not exist"
-msgstr "æ??ä»¶ä¸?å?å?¨"
-
-#: ../src/file.c:433
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "æ? æ³?æ??å¼?æ??ä»¶ \"%s\""
-
-#: src/file.c:715
-msgid "Not a supported file format"
-msgstr "ä¸?æ?¯æ??ç??æ??ä»¶æ ¼å¼?"
-
-#: ../src/file.c:513 ../src/file.c:690
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "æ? æ³?ä¿?å?æ??ä»¶ \"%s\""
-
-#: src/file.c:805 src/file.c:987 src/file.c:1182
-msgid "Error encountered during save.  The file is still not saved."
-msgstr "ä¿?å?æ?¶å?ºé??ã??æ??ä»¶æ²¡æ??ä¿?å?ã??"
-
-#: ../src/file.c:556
-#, c-format
-msgid "Save \"%s\" as"
-msgstr " \"%s\" å?¦å?ä¸º"
-
-#: src/file.c:935 src/file.c:1131
-msgid "Please supply a valid file name"
-msgstr "è¯·è¾?å?¥æ??ä»¶å??"
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "gLabelsé??è¯¯ï¼?"
 
-#: ../src/file.c:664
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "è¦?ç??æ??ä»¶ \"%s\"ï¼?"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(æ? ) - gLabels"
 
-#: src/file.c:960 src/file.c:1155
-msgid "File already exists."
-msgstr "å·²æ??å??å??æ??ä»¶ã??"
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(å·²ä¿®æ?¹)"
 
-#: src/file.c:1271
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "å?¨å?³é?å??å??ä¿?å?æ??ä»¶ \"%s\"ï¼?"
-
-#: src/file.c:1279
-msgid "Your changes will be lost if you don't save them."
-msgstr "å¦?æ??ä¸?ä¿?å?ï¼?æ??å??ç??æ?´æ?¹ä¼?ä¸¢å¤±ã??"
-
-#: src/file.c:1282
-msgid "Close without saving"
-msgstr "å?³é?(ä¸?ä¿?å?)"
-
-#. Should not happen
-#: ../src/prefs.c:159 ../src/prefs.c:166
-#: ../data/builder/object-editor.glade.h:43
-#: ../data/builder/prefs-dialog.glade.h:22
-msgid "points"
-msgstr "å??ç´ "
-
-#: src/prefs.c:158 data/glade/object-editor.glade.h:36
-#: data/glade/template-designer.glade.h:74
-msgid "inches"
-msgstr "è?±å¯¸"
-
-#: src/prefs.c:160
-msgid "mm"
-msgstr "mm"
-
-#: src/prefs-dialog.c:248 data/glade/prefs-dialog.glade.h:22
-msgid "gLabels Preferences"
-msgstr "gLabelså??æ?°"
-
-#. Build editor.
-#: ../src/view-box.c:175
-msgid "Box object properties"
-msgstr "ç?©å½¢å±?æ?§"
-
-#. Build editor.
-#: src/view-ellipse.c:224
-msgid "Ellipse object properties"
-msgstr "æ¤å??å±?æ?§"
-
-#. Build editor.
-#: src/view-line.c:224
-msgid "Line object properties"
-msgstr "çº¿æ?¡å±?æ?§"
-
-#. Build editor.
-#: src/view-image.c:223
-msgid "Image object properties"
-msgstr "å?¾ç??å±?æ?§"
-
-#. Build editor.
-#: src/view-text.c:251
-msgid "Text object properties"
-msgstr "æ??å?å±?æ?§"
-
-#. Build editor.
-#: ../src/view-barcode.c:174
-msgid "Barcode object properties"
-msgstr "æ?¡å½¢ç ?å±?æ?§"
-
-#: ../src/object-editor-image-page.c:267
-msgid "All Files"
-msgstr "å?¨é?¨æ??ä»¶"
-
-#: ../src/object-editor-image-page.c:272
-msgid "All Images"
-msgstr "å?¨é?¨å?¾ç??"
+msgid "Bad root node = \"%s\""
+msgstr "é??è¯¯ç??æ ¹å?°å?? = \"%s\""
 
-#: ../src/object-editor-image-page.c:287
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/merge-properties-dialog.c:271
-msgid "Merge Properties"
-msgstr "å??å¹¶å±?æ?§"
-
-#: ../src/merge-properties-dialog.c:297 ../src/merge-properties-dialog.c:405
-msgid "Select merge-database source"
-msgstr "é??æ?©è¦?æ??å?¥ç??æ?°æ?®"
-
-#: ../src/merge-properties-dialog.c:306 ../src/merge-properties-dialog.c:425
-msgid "N/A"
-msgstr "æ? "
-
-#: ../src/merge-properties-dialog.c:332
-msgid "Select"
-msgstr "é??æ?©"
-
-#: ../src/merge-properties-dialog.c:340
-msgid "Record/Field"
-msgstr "è®°å½?/å?ºå??"
-
-#: ../src/merge-properties-dialog.c:348
-#: ../data/builder/object-editor.glade.h:10
-msgid "Data"
-msgstr "æ?°æ?®"
-
-#: ../src/merge-properties-dialog.c:418
-msgid "Fixed"
-msgstr "å?ºå®?å?¼"
-
-#. ===================================================================
-#: ../src/print-op.c:242 ../src/wdgt-print-copies.c:171
-#: ../data/templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "æ ?ç¾"
-
-#: ../src/template-designer.c:411
-msgid "gLabels Template Designer"
-msgstr "gLabels æ¨¡æ?¿è®¾è®¡å·¥å?·r"
-
-#: ../src/template-designer.c:481
-msgid "Welcome"
-msgstr "æ¬¢è¿?"
-
-#: ../src/template-designer.c:534
-msgid "Name and Description"
-msgstr "å??ç§°å??è¯´æ??"
-
-#: ../src/template-designer.c:595
-msgid "Page Size"
-msgstr "çº¸å¼ å°ºå¯¸"
-
-#: ../src/template-designer.c:675
-msgid "Label or Card Shape"
-msgstr "æ ?ç¾æ??å??ç??å½¢ç?¶"
-
-#: ../src/template-designer.c:735
-msgid "Label or Card Size"
-msgstr "æ ?ç¾æ??å??ç??å°ºå¯¸"
-
-#: ../src/template-designer.c:844
-msgid "Label Size (round)"
-msgstr "æ ?ç¾å°ºå¯¸(å??å½¢)"
-
-#: ../src/template-designer.c:935
-msgid "Label Size (CD/DVD)"
-msgstr "æ ?ç¾å°ºå¯¸(CD/DVD)"
-
-#: ../src/template-designer.c:1036
-msgid "Number of Layouts"
-msgstr "å¸?å±?ä¸ªæ?°"
-
-#: ../src/template-designer.c:1110
-msgid "Layout(s)"
-msgstr "å¸?å±?"
-
-#: ../src/template-designer.c:1229
-msgid "Design Completed"
-msgstr "è®¾è®¡å®?æ??"
-
-#: ../src/template-designer.c:1396
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
-msgstr ""
-"<span foreground='red' weight='bold'>æ¨¡æ?¿ä¸å·²æ??ç??å??ç??å??è§?æ ¼</span>"
-
-#: ../src/bc.c:67
-msgid "POSTNET (any)"
-msgstr "POSTNET (é??ç?¨)"
-
-#: ../src/bc.c:70
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (ç?¨äº?é?®ç¼?)"
-
-#: ../src/bc.c:73
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP+4)"
-
-#: ../src/bc.c:76
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
-
-#: ../src/bc.c:79
-msgid "CEPNET"
-msgstr "CEPNET"
-
-#: ../src/bc.c:82
-msgid "EAN (any)"
-msgstr "EAN (é??ç?¨)"
-
-#: ../src/bc.c:85
-msgid "EAN-8"
-msgstr "EAN-8"
-
-#: ../src/bc.c:88
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
-
-#: ../src/bc.c:91
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
-
-#: ../src/bc.c:94
-msgid "EAN-13"
-msgstr "EAN-13"
-
-#: ../src/bc.c:97
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
-
-#: ../src/bc.c:100
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
-
-#: ../src/bc.c:103
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A æ??è?? UPC-E)"
-
-#: ../src/bc.c:106
-msgid "UPC-A"
-msgstr "UPC-A"
-
-#: ../src/bc.c:109
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
-
-#: ../src/bc.c:112
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
-
-#: ../src/bc.c:115
-msgid "UPC-E"
-msgstr "UPC-E"
-
-#: ../src/bc.c:118
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
-
-#: ../src/bc.c:121
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
-
-#: ../src/bc.c:124
-msgid "ISBN"
-msgstr "ISBN"
-
-#: ../src/bc.c:127
-msgid "ISBN +5"
-msgstr "ISBN +5"
-
-#: ../src/bc.c:130
-msgid "Code 39"
-msgstr "Code 39"
-
-#: ../src/bc.c:133
-msgid "Code 128"
-msgstr "Code 128"
-
-#: ../src/bc.c:136
-msgid "Code 128C"
-msgstr "Code 128C"
-
-#: ../src/bc.c:139
-msgid "Code 128B"
-msgstr "Code 128B"
-
-#: ../src/bc.c:142
-msgid "Interleaved 2 of 5"
-msgstr "Interleaved 2 of 5"
-
-#: ../src/bc.c:145
-msgid "Codabar"
-msgstr "Codabar"
-
-#: ../src/bc.c:148
-msgid "MSI"
-msgstr "MSI"
-
-#: ../src/bc.c:151
-msgid "Plessey"
-msgstr "Plessey"
-
-#: ../src/bc.c:154
-msgid "IEC16022 (DataMatrix)"
-msgstr "IEC16022 (DataMatrix)"
-
-#: ../src/label.c:531
-msgid "Untitled"
-msgstr "æ?ªå?½å??"
-
-#: ../src/label-barcode.c:426
-msgid "Barcode data empty"
-msgstr "ç©ºæ?¡å½¢ç ?æ?°æ?®"
-
-#: ../src/label-barcode.c:430
-msgid "Invalid barcode data"
-msgstr "æ?¡å½¢ç ?æ?°æ?®æ? æ??"
+msgid "bad node =  \"%s\""
+msgstr "é??è¯¯ç?¹ =  \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:226
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "xmlæ??ä»¶è¯æ³?é??è¯¯"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "æ²¡æ??æ??æ¡£æ ¹"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "å¯¼å?¥glabels 0.1æ ¼å¼?"
 
-#: src/xml-label.c:272
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "å¯¼å?¥glabels 0.4æ ¼å¼?"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:301
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "æ?ªç?¥ç??glabelsæ??ä»¶å??ç§° -- ä½¿ç?¨ %s"
 
-#: ../src/xml-label.c:319 ../src/xml-label-04.c:79
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "é??è¯¯ç??æ ¹å?°å?? = \"%s\""
-
-#: ../src/xml-label.c:356
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "æ??æ¡£å?°å??å??æ??é??è¯¯ç?¹ =  \"%s\""
 
-#: src/xml-label.c:393 src/xml-label-04.c:123 src/xml-label-191.c:197
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "é??è¯¯ç?¹ =  \"%s\""
-
-#: src/xml-label.c:796 src/xml-label-191.c:605
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "æ?°æ?®å?°å??å??æ??é??è¯¯ç?¹ =  \"%s\""
 
-#: src/xml-label.c:962 libglabels/xml-template.c:535
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "æ?ªç?¥ç??çº¸å¼ å¤§å°?idæ??è§?æ ¼ \"%s\""
+
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "UTF-8ç¼?ç ?è½¬æ?¢é??è¯¯ã??"
 
-#: src/xml-label.c:969 libglabels/xml-template.c:542
+#: ../src/xml-label.c:1157
 msgid "Problem saving xml file."
 msgstr "ä¿?å?xmlæ??ä»¶æ?¶å?ºé??ã??"
 
-#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378
-msgid "None"
-msgstr "æ? "
-
-#: ../src/merge-init.c:59
-msgid "Text file with comma delimeters (CSV)"
-msgstr "ç?¨é??å?·å??é??ç??æ??æ?¬æ??ä»¶ (CSV)"
-
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
-msgstr "ç?¨å??å?·å??é??ç??æ??æ?¬æ??ä»¶ (CSV)"
-
-#: src/merge-init.c:67
-msgid "Text file with tab delimeters"
-msgstr "ç?¨å?¶è¡¨ç¬¦å??é??ç??æ??æ?¬æ??ä»¶ (CSV)"
-
-#: ../src/merge-init.c:82
-msgid "Data from default Evolution Addressbook"
-msgstr "ä»?Evolutionå¯¼å?ºç??é??è¿?å½?"
-
-#: ../src/merge-init.c:88
-msgid "Data from a file containing VCards"
-msgstr "ä»?VCardsæ??ä»¶å¯¼å?ºç??æ?°æ?®"
-
-#: ../src/merge-evolution.c:309
-msgid "Couldn't construct query"
-msgstr "ä¸?è?½æ?¥è¯¢æ?°æ?®ç»?"
-
-#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326
-msgid "Couldn't open addressbook."
-msgstr "ä¸?è?½æ??å¼?é??è¿?å½?"
-
-#: ../src/merge-evolution.c:341
-msgid "Couldn't list available fields."
-msgstr "æ? æ³?æ?¾ç¤ºæ??æ??å?ºå??ã??"
-
-#: ../src/merge-evolution.c:377
-msgid "Couldn't get contacts."
-msgstr "æ? æ³?è¯»å??é??è¿?å½?ä¿¡æ?¯ã??"
-
-#: ../src/color-combo.c:210
-msgid "Default Color"
-msgstr "é»?è®¤é¢?è?²"
-
-#: ../src/color-combo-menu.c:86
-msgid "Dark Red"
-msgstr "æ??çº¢"
-
-#: ../src/color-combo-menu.c:87
-msgid "Brown"
-msgstr "æ£?è?²"
-
-#: ../src/color-combo-menu.c:88
-msgid "Dark Goldenrod"
-msgstr "æ??é»?"
-
-#: ../src/color-combo-menu.c:89
-msgid "Dark Green"
-msgstr "æ??ç»¿"
-
-#: ../src/color-combo-menu.c:90
-msgid "Dark Cyan"
-msgstr "æ??å??çº¢"
-
-#: ../src/color-combo-menu.c:91
-msgid "Navy Blue"
-msgstr "æµ·æ°´è??"
-
-#: ../src/color-combo-menu.c:92
-msgid "Dark Violet"
-msgstr "ç´«é»?"
-
-#: ../src/color-combo-menu.c:94
-msgid "Red"
-msgstr "çº¢è?²"
-
-#: ../src/color-combo-menu.c:95
-msgid "Orange"
-msgstr "æ¡?çº¢"
-
-#: ../src/color-combo-menu.c:96
-msgid "Dark Yellow"
-msgstr "æ??é»?"
-
-#: ../src/color-combo-menu.c:97
-msgid "Medium green"
-msgstr "ä¸ç?ç»¿"
-
-#: ../src/color-combo-menu.c:98
-msgid "Turquoise"
-msgstr "è??ç»¿"
-
-#: ../src/color-combo-menu.c:99
-msgid "Blue"
-msgstr "è??è?²"
-
-#: ../src/color-combo-menu.c:100
-msgid "Purple"
-msgstr "ç´«çº¢"
-
-#: ../src/color-combo-menu.c:102
-msgid "Salmon"
-msgstr "é©¬å??é±¼è?²"
-
-#: ../src/color-combo-menu.c:103
-msgid "Gold"
-msgstr "é??é»?"
-
-#: ../src/color-combo-menu.c:104
-msgid "Yellow"
-msgstr "é»?è?²"
-
-#: ../src/color-combo-menu.c:105
-msgid "Green"
-msgstr "ç»¿è?²"
-
-#: ../src/color-combo-menu.c:106
-msgid "Cyan"
-msgstr "è??ç»¿è?²"
-
-#: ../src/color-combo-menu.c:107
-msgid "SkyBlue"
-msgstr "å¤©ç©ºè??"
-
-#: ../src/color-combo-menu.c:108
-msgid "Violet"
-msgstr "ç´«è?²"
-
-#: ../src/color-combo-menu.c:110
-msgid "Pink"
-msgstr "ç²?çº¢"
-
-#: ../src/color-combo-menu.c:111
-msgid "Khaki"
-msgstr "æµ?æ£?é»?è?²"
-
-#: ../src/color-combo-menu.c:112
-msgid "Light Yellow"
-msgstr "æµ?é»?"
-
-#: ../src/color-combo-menu.c:113
-msgid "Light Green"
-msgstr "æµ?ç»¿"
-
-#: ../src/color-combo-menu.c:114
-msgid "Light Cyan"
-msgstr "æµ?å??çº¢è?²"
-
-#: ../src/color-combo-menu.c:115
-msgid "Slate Gray"
-msgstr "ç?³ç?°ç?½"
-
-#: ../src/color-combo-menu.c:116
-msgid "Thistle"
-msgstr ""
-
-#: ../src/color-combo-menu.c:118
-msgid "White"
-msgstr "ç?½è?²"
-
-#: ../src/color-combo-menu.c:119
-#, c-format
-msgid "10% Gray"
-msgstr "10% ç?°è?²"
-
-#: ../src/color-combo-menu.c:120
-#, c-format
-msgid "25% Gray"
-msgstr "25% ç?°è?²"
-
-#: ../src/color-combo-menu.c:121
-#, c-format
-msgid "40% Gray"
-msgstr "40% ç?°è?²"
-
-#: ../src/color-combo-menu.c:122
-#, c-format
-msgid "50% Gray"
-msgstr "50% ç?°è?²"
-
-#: ../src/color-combo-menu.c:123
-#, c-format
-msgid "60% Gray"
-msgstr "60% ç?°è?²"
-
-#: ../src/color-combo-menu.c:124
-msgid "Black"
-msgstr "é»?è?²"
-
-#: ../src/color-combo-menu.c:252 ../src/color-combo-menu.c:369
-msgid "Custom Color"
-msgstr "è?ªå®?ä¹?é¢?è?²"
-
-#: ../src/color-combo-menu.c:317
-#, c-format
-msgid "Custom Color #%u"
-msgstr "è?ªå®?ä¹?é¢?è?² #%u"
-
-#: ../src/wdgt-print-copies.c:153
-msgid "Sheets:"
-msgstr "é¡µç ?ï¼?"
-
-#: ../src/wdgt-print-copies.c:173
-msgid "from:"
-msgstr "ä»?ï¼?"
-
-#: ../src/wdgt-print-copies.c:179
-msgid "to:"
-msgstr "å?°ï¼?"
-
-#: ../src/wdgt-print-merge.c:154
-msgid "Start on label"
-msgstr "å?¯å?¨å??ç?´æ?¥æ??å¼?æ ?ç¾"
-
-#: ../src/wdgt-print-merge.c:161
-msgid "on 1st sheet"
-msgstr "å?¨ç¬¬1é¡µ"
-
-#: ../src/wdgt-print-merge.c:170
-msgid "Copies:"
-msgstr "å?¯æ?¬"
-
-#: ../src/wdgt-print-merge.c:176
-msgid "Collate"
-msgstr "é??å??"
-
-#: ../src/wdgt-media-select.c:290 ../src/wdgt-media-select.c:294
-#: ../src/wdgt-media-select.c:299 ../src/wdgt-media-select.c:308
-#: ../src/wdgt-media-select.c:311 ../src/wdgt-media-select.c:404
-#: ../src/wdgt-media-select.c:611 ../src/wdgt-media-select.c:620
-msgid "Any"
-msgstr "é??ç?¨"
-
-#: ../src/wdgt-media-select.c:645
-#, c-format
-msgid "%d per sheet"
-msgstr "æ¯?é¡µ %d"
-
-#: ../src/wdgt-media-select.c:675
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-#: ../src/wdgt-media-select.c:680
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-#: ../src/wdgt-media-select.c:691 ../src/wdgt-media-select.c:705
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s ç?´å¾?"
-
-#: ../src/wdgt-media-select.c:695 ../src/wdgt-media-select.c:709
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s ç?´å¾?"
-
-#: ../src/wdgt-media-select.c:783
-msgid "No recent templates found."
-msgstr "æ??è¿?æ²¡æ??ä½¿ç?¨æ¨¡æ?¿ã??"
-
-#: ../src/wdgt-media-select.c:784
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr "è¯·ä»? \"æ?¥æ?¾å?¨é?¨æ¨¡æ?¿\" é¡µé?¢ä¸é??æ?©ä¸?ä¸ªæ¨¡æ?¿ã??"
-
-#: ../src/wdgt-media-select.c:863
-msgid "No match."
-msgstr "ä¸?ç?¸ç¬¦ã??"
-
-#: ../src/wdgt-media-select.c:864
-msgid "Try selecting a different brand, page size or category."
-msgstr "è¯·é??æ?©å?¶å®?å??ç??ï¼?çº¸å¼ å°ºå¯¸æ??ç±»å??ã??"
-
-#: ../src/wdgt-rotate-label.c:129
-msgid "Normal"
-msgstr "æ£å¸¸"
-
-#: ../src/wdgt-rotate-label.c:130
-msgid "Rotated"
-msgstr "æ??è½¬"
-
-#: ../src/critical-error-handler.c:73
-msgid "gLabels Fatal Error!"
-msgstr "gLabelså?ºç?°ä¸¥é??é??è¯¯ï¼?"
-
-#: ../src/warning-handler.c:73
-msgid "gLabels Error!"
-msgstr "gLabelsé??è¯¯ï¼?"
-
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:118
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "å?¶å®?"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:131
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "è?ªå®?ä¹?ç??"
 
-#: ../libglabels/db.c:482
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr "æ?¾ä¸?å?°çº¸å¼ å°ºå¯¸å®?ä¹?æ??ä»¶ã??å?¯è?½æ?¯glabelsç??åº?æ??ä»¶æ²¡æ??æ£ç¡®å®?è£?ã??"
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
-msgstr ""
-"æ?¾ä¸?å?°ç±»å??å®?ä¹?æ??ä»¶ã??å?¯è?½æ?¯glabelsç??åº?æ??ä»¶æ²¡æ??æ£ç¡®å®?è£?ã??"
+msgstr "æ?¾ä¸?å?°ç±»å??å®?ä¹?æ??ä»¶ã??å?¯è?½æ?¯glabelsç??åº?æ??ä»¶æ²¡æ??æ£ç¡®å®?è£?ã??"
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
+msgstr "æ?¾ä¸?å?°æ¨¡æ?¿æ??ä»¶ã??å?¯è?½æ?¯glabelsç??åº?æ??ä»¶æ²¡æ??æ£ç¡®å®?è£?ã??"
+
+#: ../libglabels/db.c:2164
+#, fuzzy, c-format
+msgid "%s full page label"
+msgstr "æ?®é??ç??æ?´é¡µæ¨¡æ?¿ %s"
+
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr ""
-"æ?¾ä¸?å?°æ¨¡æ?¿æ??ä»¶ã??å?¯è?½æ?¯glabelsç??åº?æ??ä»¶æ²¡æ??æ£ç¡®å®?è£?ã??"
 
-#: ../libglabels/db.c:1538
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "æ¯?é¡µ %d"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
 #, c-format
-msgid "Generic %s full page template"
-msgstr "æ?®é??ç??æ?´é¡µæ¨¡æ?¿ %s"
+msgid "%d per sheet"
+msgstr "æ¯?é¡µ %d"
+
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s ç?´å¾?"
+
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "å??ç´ "
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "è?±å¯¸"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
+
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: ../libglabels/xml-template.c:227
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr "å??ç§°æ??å??ç??/è§?æ ¼ å±?æ?§ä¸?å®?æ?´ã??"
 
@@ -1476,396 +1952,410 @@ msgstr "å??ç§°æ??å??ç??/è§?æ ¼ å±?æ?§ä¸?å®?æ?´ã??"
 msgid "Unknown page size id \"%s\", trying as name"
 msgstr "æ?ªç?¥ç??çº¸å¼ å¤§å°?id \"%s\"ï¼?è¯·è¯?ç??ç?¨çº¸å¼ è§?æ ¼"
 
-#: src/xml-label-191.c:690 libglabels/xml-template.c:209
+#: ../libglabels/xml-template.c:256
 #, c-format
 msgid "Unknown page size id or name \"%s\""
 msgstr "æ?ªç?¥ç??çº¸å¼ å¤§å°?idæ??è§?æ ¼ \"%s\""
 
-#: ../libglabels/xml-template.c:615
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
+
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
-msgstr ""
-"\"å??ç??\" æ??è?? \"è§?æ ¼\" å±?æ?§ä¸?å®?æ?´ï¼?è¯·å°?è¯?æ?¹å??å?æ¯?å¤§å°?å??ã??"
+msgstr "\"å??ç??\" æ??è?? \"è§?æ ¼\" å±?æ?§ä¸?å®?æ?´ï¼?è¯·å°?è¯?æ?¹å??å?æ¯?å¤§å°?å??ã??"
 
-#: ../libglabels/xml-template.c:625
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr "å??ç§°å±?æ?§ä¹?ä¸?å®?æ?´ã??"
 
-#: ../data/builder/merge-properties-dialog.glade.h:1
-msgid "<b>Record selection/preview</b>"
-msgstr "<b>è®°å½?é??æ?©/é¢?è§?</b>"
-
-#: ../data/builder/merge-properties-dialog.glade.h:2
-msgid "<b>Source</b>"
-msgstr "<b>æ?¥æº?</b>"
-
-#: ../data/builder/merge-properties-dialog.glade.h:3
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "Format:"
 msgstr "æ ¼å¼?ï¼?"
 
-#: ../data/builder/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "Location:"
 msgstr "ä½?ç½®ï¼?"
 
-#: ../data/builder/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:3
+#, fuzzy
+msgid "Record selection/preview"
+msgstr "<b>è®°å½?é??æ?©/é¢?è§?</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "å?¨é??"
 
-#: ../data/builder/merge-properties-dialog.glade.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Source"
+msgstr "<b>æ?¥æº?</b>"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "å??æ¶?å?¨é??"
 
-#: ../data/builder/merge-properties-dialog.glade.h:7
-#: ../data/builder/object-editor.glade.h:39
-msgid "dialog1"
-msgstr "å¯¹è¯?æ¡?1"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr "å??ç??ï¼?"
 
-#: ../data/builder/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>æ ?ç¾æ?¹å??</b>"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "ç±»å??ï¼?"
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "å?ªå??"
 
-#: ../data/builder/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>ä»?è´¨ç±»å??</b>"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "çº¸å¼ å¤§å°?"
+
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "å?¨é??"
 
-#: ../data/builder/object-editor.glade.h:2
+#: ../data/ui/new-label-dialog.ui.h:1
+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:27
+msgid "Description:"
+msgstr "è¯´æ??ï¼?"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+#, fuzzy
+msgid "Label size:"
+msgstr "çº¸å¼ å¤§å°?"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+#, fuzzy
+msgid "Layout:"
+msgstr "å¸?å±?"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+msgid "Normal"
+msgstr "æ£å¸¸"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "è§?æ ¼ #:"
+
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+msgid "Rotated"
+msgstr "æ??è½¬"
+
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:2
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/builder/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/builder/object-editor.glade.h:4
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Xxxå¯¹è±¡å±?æ?§</span>"
-
-#: ../data/builder/object-editor.glade.h:5
-#: ../data/builder/prefs-dialog.glade.h:7
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "å¯¹é½?ï¼?"
 
-#: ../data/builder/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr "è?ªå?¨è°?æ?´å??ç¼©æ?¾æ??å?"
 
-#: ../data/builder/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "è§?åº¦ï¼?"
 
-#: ../data/builder/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr "æ ¡éª?å?¼"
 
-#: ../data/builder/object-editor.glade.h:9
-#: ../data/builder/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "é¢?è?²ï¼?"
 
-#: ../data/builder/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:9
 msgid "Enable shadow"
 msgstr "ä½¿ç?¨é?´å½±"
 
-#: ../data/builder/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:10
 msgid "Family:"
 msgstr "ç³»å??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:11
 msgid "File:"
 msgstr "æ??ä»¶ï¼?"
 
-#: ../data/builder/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "å¡«å??"
 
-#: ../data/builder/object-editor.glade.h:15
-#: ../data/builder/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "é«?åº¦ï¼?"
 
-#: ../data/builder/object-editor.glade.h:17
-msgid "Insert merge field"
-msgstr "æ??å?¥å??å¹¶å?ºå??"
-
-#: ../data/builder/object-editor.glade.h:18
+#: ../data/ui/object-editor.ui.h:15
 msgid "Key:"
 msgstr "é?®å?¼ï¼?"
 
-#: ../data/builder/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "é?¿åº¦ï¼?"
 
-#: ../data/builder/object-editor.glade.h:21
-#: ../data/builder/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "çº¿æ?¡é?´é??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "æ??å?ï¼?"
 
-#: ../data/builder/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:20
 msgid "Opacity:"
 msgstr "ä¸?é??æ??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../data/builder/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "æ?¢å¤?å?¾ç??å¤§å°?"
 
-#: ../data/builder/object-editor.glade.h:26
-msgid "Select A File"
-msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
-
-#: ../data/builder/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:23
 msgid "Shadow"
 msgstr "é?´å½±"
 
-#: ../data/builder/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "å°ºå¯¸"
 
-#: ../data/builder/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size:"
 msgstr "å°ºå¯¸ï¼?"
 
-#: ../data/builder/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:26
 msgid "Style"
 msgstr "è§?æ ¼"
 
-#: ../data/builder/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style:"
 msgstr "è§?æ ¼ï¼?"
 
-#: ../data/builder/object-editor.glade.h:33
-#: ../data/builder/prefs-dialog.glade.h:20
-#: ../data/builder/template-designer.glade.h:61
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "å®½åº¦ï¼?"
 
-#: ../data/builder/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:30
 msgid "X Offset:"
 msgstr "X å??ç§»é??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:32
 msgid "Y Offset:"
 msgstr "Y å??ç§»é??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "åº¦æ?°"
 
-#: ../data/builder/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:35
+msgid "dialog1"
+msgstr "å¯¹è¯?æ¡?1"
+
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr "æ?°å?ä½?æ?°ï¼?"
 
-#: ../data/builder/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:37
 msgid "format:"
 msgstr "æ ¼å¼?ï¼?"
 
-#: ../data/builder/prefs-dialog.glade.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/builder/prefs-dialog.glade.h:2
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">é»?è®¤çº¸å¼ å°ºå¯¸</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">å¡«å??</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">çº¿æ?¡</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">æ??å?</span>"
-
-#: ../data/builder/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Units</span>"
-msgstr "<span weight=\"bold\">å??ä½?</span>"
+#: ../data/ui/prefs-dialog.ui.h:4
+#, fuzzy
+msgid "Default page size"
+msgstr "æ?¢å¤?å?¾ç??å¤§å°?"
 
-#: ../data/builder/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
 msgstr "å?ä½?ï¼?"
 
-#: ../data/builder/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
 msgstr "è?±å¯¸"
 
-#: ../data/builder/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
 msgstr "æ?¬å?°å??"
 
-#: ../data/builder/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
 msgstr "æ¯«ç±³"
 
-#: ../data/builder/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Object defaults"
 msgstr "å¯¹è±¡é»?è®¤å?¼"
 
-#: ../data/builder/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Points"
 msgstr "å??ç´ "
 
-#: ../data/builder/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Select default properties for new objects."
 msgstr "ä¸ºæ?°å¯¹è±¡é??æ?©é»?è®¤å±?æ?§"
 
-#: data/glade/prefs-dialog.glade.h:19
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Select locale specific behavior."
 msgstr "æ?¬å?°å??è®¾ç½®"
 
-#. Most popular (at top of list)
-#: ../data/builder/prefs-dialog.glade.h:19
-#: ../data/templates/paper-sizes.xml.h:29
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "ç¾?å?½ä¿¡å°?"
 
-#: ../data/builder/print-custom-widget.glade.h:1
-msgid "<b>Options</b>"
-msgstr "<b>é??é¡¹</b>"
-
-#: ../data/builder/print-custom-widget.glade.h:2
-msgid "<b>Print control (Merge)</b>"
-msgstr "<b>æ??å?°æ?§å?¶(å??å¹¶)</b>"
-
-#: ../data/builder/print-custom-widget.glade.h:3
-msgid "<b>Print control (Simple)</b>"
-msgstr "<b>æ??å?°æ?§å?¶(ç®?å??)</b>"
+#: ../data/ui/prefs-dialog.ui.h:19
+#, fuzzy
+msgid "Units"
+msgstr "æ?ªå?½å??"
 
-#: ../data/builder/property-bar.glade.h:1
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "ç²?ä½?"
 
-#: ../data/builder/property-bar.glade.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "ä¸å¿?å¯¹é½?"
 
-#: ../data/builder/property-bar.glade.h:4
-msgid "Font family"
-msgstr "å?ä½?ç³»å??"
-
-#: ../data/builder/property-bar.glade.h:5
-msgid "Font size"
-msgstr "å?ä½?å¤§å°?"
-
-#: ../data/builder/property-bar.glade.h:6
-msgid "Italic"
-msgstr "æ??ä½?"
-
-#: ../data/builder/property-bar.glade.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "å·¦å¯¹é½?"
 
-#: ../data/builder/property-bar.glade.h:9
-msgid "Line width"
-msgstr "çº¿å®½"
-
-#: ../data/builder/property-bar.glade.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "å?³å¯¹é½?"
 
-#: ../data/builder/property-bar.glade.h:11
-msgid "Text Color"
-msgstr "æ??å?é¢?è?²"
-
-#: ../data/builder/template-designer.glade.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(ä¾?å¦?ï¼?ä¿¡å°?æ ?ç¾ï¼?å??ç??...)"
 
-#: ../data/builder/template-designer.glade.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(ä¾?å¦?ï¼?8163A)"
 
-#: ../data/builder/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(ä¾?å¦?ï¼?Avery, Acme, ...)"
 
-#: ../data/builder/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. å¤?å??å¾?ï¼?"
 
-#: data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. å??å¾?ï¼?"
 
-#: data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. å®½åº¦ï¼?"
 
-#: data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. é«?åº¦ï¼?"
 
-#: data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. å??å??å¾?ï¼?"
 
-#: data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. ä½?é??(å??è®¸å? å?°)ï¼?"
 
-#: data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. é??å®½ï¼?"
 
-#: data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. é¡µè¾¹"
 
-#: data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. ç?¯ç»? (å??å¾?):"
 
-#: data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. é??é«?ï¼?"
 
-#: data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. æ°´å¹³ä½?é??(å??è®¸å? å?°)ï¼?"
 
-#: data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. å??ç?´ä½?é??(å??è®¸å? å?°)ï¼?"
 
-#: data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. ä½?é??(å??è®¸å? å?°)ï¼?"
 
-#: data/glade/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. é¡µè¾¹"
 
-#: data/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "å??ç??/å?¶é? å??ï¼?"
 
-#: data/glade/template-designer.glade.h:21
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD (å??æ?¬ä¿¡ç?¨å?¡CD)"
 
-#: data/glade/template-designer.glade.h:22
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1883,23 +2373,19 @@ msgstr ""
 "å?¦å??è¯·ç?¹å?» \"å??æ¶?\" æ?¥æ?¾å¼?è®¾è®¡ï¼?\n"
 "æ??è??ç?¹å?» \"å??é??\" ç»§ç»è®¾è®¡ã??"
 
-#: ../data/builder/template-designer.glade.h:27
-msgid "Description:"
-msgstr "è¯´æ??ï¼?"
-
-#: data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "å?°å·¦è¾¹ç??ç??è·?ç¦» (x0):"
 
-#: data/glade/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "å?°ä¸?è¾¹ç??ç??è·?ç¦» (y0):"
 
-#: data/glade/template-designer.glade.h:34
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "æ°´å¹³æ ?è·? (dx):"
 
-#: data/glade/template-designer.glade.h:35
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -1913,77 +2399,69 @@ msgstr ""
 "ç»?å¤§å¤?æ?°æ¨¡æ?¿å?ªé??è¦?1ä¸ªå¸?å±?ï¼?å¦?ç¬¬1ä¸ªä¾?å?æ??ç¤ºã??\n"
 "ç¬¬2ä¸ªå?¾ä¾?è¯´æ??äº?é??è¦?2ä¸ªå¸?å±?ç??ä¾?å?ã??"
 
-#: ../data/builder/template-designer.glade.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "å¸?å±? #1"
 
-#: data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "å¸?å±? #2"
 
-#: data/glade/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "æ?°å?äº¤å?? (nx):"
 
-#: data/glade/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "æ?°å?å??ä¸? (ny):"
 
-#: data/glade/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "å¸?å±?ä¸ªæ?°ï¼?"
 
-#: data/glade/template-designer.glade.h:52
-msgid "Page size:"
-msgstr "çº¸å¼ å¤§å°?"
-
-#: data/glade/template-designer.glade.h:54
-msgid "Part #:"
-msgstr "è§?æ ¼ #:"
-
-#: ../data/builder/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr "è¯·è¾?å?¥æ¨¡æ?¿ç??å¤?æ³¨ä¿¡æ?¯ã??"
 
-#: data/glade/template-designer.glade.h:56
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "è¯·è¾?å?¥ä¸?é?¢ç??å¸?å±?æ?°æ?®ã??"
 
-#: data/glade/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
-"Please enter the following size parameters of a single label in your template."
+"Please enter the following size parameters of a single label in your "
+"template."
 msgstr "è¯·å?¨æ¨¡æ?¿é??è¾?å?¥å??ä¸ªæ ?ç¾ç??å°ºå¯¸æ?°æ?®ã??"
 
-#: ../data/builder/template-designer.glade.h:47
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
-msgstr ""
-"è¯·å?¨æ¨¡æ?¿é??è¾?å?¥å??ä¸ªæ ?ç¾æ??å??ç??ç??å°ºå¯¸æ?°æ?®ã??"
+msgstr "è¯·å?¨æ¨¡æ?¿é??è¾?å?¥å??ä¸ªæ ?ç¾æ??å??ç??ç??å°ºå¯¸æ?°æ?®ã??"
 
-#: data/glade/template-designer.glade.h:59
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr "è¯·é??æ?©æ ?ç¾æ??å??ç??ç??å?ºæ?¬å½¢ç?¶ã??"
 
-#: data/glade/template-designer.glade.h:60
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr "è¯·é??æ?©æ¨¡æ?¿æ??é??ç?¨ç??çº¸å¼ å¤§å°?ã??"
 
-#: data/glade/template-designer.glade.h:61
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "æ??å?°æµ?è¯?é¡µ"
 
-#: data/glade/template-designer.glade.h:62
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "é?¿æ?¹å½¢æ??æ£æ?¹å½¢(å?¯ä»¥å??å??è§?)"
 
-#: data/glade/template-designer.glade.h:63
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "å??å½¢"
 
-#: data/glade/template-designer.glade.h:64
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -1991,7 +2469,7 @@ msgstr ""
 "æ¨¡æ?¿é??è¦?\n"
 "2ä¸ªå¸?å±? "
 
-#: data/glade/template-designer.glade.h:66
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -1999,11 +2477,11 @@ msgstr ""
 "æ¨¡æ?¿é??è¦?\n"
 "1ä¸ªå¸?å±? "
 
-#: ../data/builder/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "å??ç?´æ ?è·? (dy):"
 
-#: ../data/builder/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2013,198 +2491,227 @@ msgstr ""
 "\n"
 "è¯·å??ç?§ä¸?é?¢ç??æ¥éª¤æ?¥å?¶ä½?ä¸?ä¸ªä½ é??è¦?ç?? gLabels æ¨¡æ?¿ã??"
 
-#: ../data/builder/template-designer.glade.h:62
-msgid "cd_size_page"
-msgstr "å??ç??å°ºå¯¸"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "é??å??"
 
-#: ../data/builder/template-designer.glade.h:63
-msgid "finish_page"
-msgstr "å®?æ??"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "Copies"
+msgstr "å?¯æ?¬"
 
-#: ../data/builder/template-designer.glade.h:65
-msgid "layout_page"
-msgstr "å¸?å±?"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "å?¯æ?¬"
 
-#: ../data/builder/template-designer.glade.h:66
-msgid "name_page"
-msgstr "å??ç§°"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Merge Control"
+msgstr ""
 
-#: ../data/builder/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "å¤?å±?å¸?å±?"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+#, fuzzy
+msgid "Options"
+msgstr "<b>é??é¡¹</b>"
 
-#: ../data/builder/template-designer.glade.h:68
-msgid "pg_size_page"
-msgstr "çº¸å¼ å¤§å°?"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "é¡µç ?ï¼?"
 
-#: ../data/builder/template-designer.glade.h:69
-msgid "rect_size_page"
-msgstr "ç?©å½¢å°ºå¯¸"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "å?¯å?¨å??ç?´æ?¥æ??å¼?æ ?ç¾"
 
-#: ../data/builder/template-designer.glade.h:70
-msgid "round_size_page"
-msgstr "å??å½¢å°ºå¯¸"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "ä»?ï¼?"
 
-#: ../data/builder/template-designer.glade.h:71
-msgid "shape_page"
-msgstr "å½¢ç?¶"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "å?¨ç¬¬1é¡µ"
 
-#: ../data/builder/template-designer.glade.h:72
-msgid "start_page"
-msgstr "èµ·å§?é¡µ"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "å?°ï¼?"
 
-#: ../data/builder/wdgt-media-select.glade.h:1
-msgid "Brand:"
-msgstr "å??ç??ï¼?"
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr "å?¶ä½?æ ?ç¾ï¼?å??ç??å??å??ç??ç??å°?é?¢"
 
-#: ../data/builder/wdgt-media-select.glade.h:2
-msgid "Category:"
-msgstr "ç±»å??ï¼?"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "gLabelsæ ?ç¾è®¾è®¡å·¥å?·"
 
-#: ../data/builder/wdgt-media-select.glade.h:4
-msgid "Recent templates"
-msgstr "æ??è¿?ç??æ¨¡æ?¿"
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "gLabelså·¥ç¨?æ??ä»¶"
 
-#: ../data/builder/wdgt-media-select.glade.h:5
-msgid "Search all templates"
-msgstr "æ?¥æ?¾å?¨é?¨æ¨¡æ?¿"
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
 
 #. Other ISO A series sizes
-#: ../data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr "A0"
 
-#: ../data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr "A1"
 
-#: ../data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr "A10"
 
-#: ../data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr "A2"
 
-#: ../data/templates/paper-sizes.xml.h:6
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr "A3"
 
-#: ../data/templates/paper-sizes.xml.h:7
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr "A4"
 
-#: ../data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr "A5"
 
-#: ../data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr "A6"
 
-#: ../data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr "A7"
 
-#: ../data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr "A8"
 
-#: ../data/templates/paper-sizes.xml.h:12
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr "A9"
 
 #. ISO B series sizes
-#: ../data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr "B0"
 
-#: ../data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr "B1"
 
-#: ../data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr "B10"
 
-#: ../data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr "B2"
 
-#: ../data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr "B3"
 
-#: ../data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr "B4"
 
-#: ../data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr "B5"
 
-#: ../data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr "B6"
 
-#: ../data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr "B7"
 
-#: ../data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr "B8"
 
-#: ../data/templates/paper-sizes.xml.h:24
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr "B9"
-#: data/templates/paper-sizes.xml.h:25
+
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr "ç¾?å?½å¸¸ç?¨"
 
 #. Other US paper sizes
-#: data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "ç¾?å?½å?½æ ?"
 
-#: ../data/templates/categories.xml.h:1
+#: ../templates/categories.xml.h:1
 msgid "Any card"
 msgstr "é??ç?¨å??ç??"
 
-#: ../data/templates/categories.xml.h:2
+#: ../templates/categories.xml.h:2
 msgid "Any label"
 msgstr "é??ç?¨æ ?ç¾"
 
-#: ../data/templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "å??ç??"
 
-#: ../data/templates/categories.xml.h:4
+#: ../templates/categories.xml.h:4
 msgid "CD/DVD or other media"
 msgstr "CD/DVD æ??å?¶å®?å??ç??"
 
-#: ../data/templates/categories.xml.h:5
+#: ../templates/categories.xml.h:5
 msgid "Mailing/shipping products"
 msgstr "ä¿¡ä»¶/å¿«é??å??è£¹"
 
-#: ../data/templates/categories.xml.h:6
+#: ../templates/categories.xml.h:6
 msgid "Rectangular labels"
 msgstr "é?¿æ?¹å½¢æ ?ç¾"
 
-#: ../data/templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "å??å½¢æ ?ç¾"
 
-#: ../data/templates/categories.xml.h:8
+#: ../templates/categories.xml.h:8
 msgid "Square labels"
 msgstr "æ£æ?¹å½¢æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:2
-#: ../data/templates/avery-iso-templates.xml.h:2
-#: ../data/templates/dymo-other-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:2
-#: ../data/templates/zweckform-iso-templates.xml.h:2
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 "é??è¿?å½?æ ?ç¾"
 
@@ -2213,178 +2720,204 @@ msgstr "é??è¿?å½?æ ?ç¾"
 #. ===================================================================
 #. ********************************************************************
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:4
-#: ../data/templates/avery-iso-templates.xml.h:8
-#: ../data/templates/misc-us-templates.xml.h:4
-#: ../data/templates/misc-iso-templates.xml.h:12
-#: ../data/templates/zweckform-iso-templates.xml.h:6
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "å??ç??"
 
 #. ===================================================================
 #. ===============================================================
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:6
-#: ../data/templates/avery-iso-templates.xml.h:14
-#: ../data/templates/misc-us-templates.xml.h:8
-#: ../data/templates/misc-iso-templates.xml.h:16
-#: ../data/templates/zweckform-iso-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
 msgstr "CD/DVD å??ç??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "CD/DVD å??ç??æ ?ç¾(å??ç??ç??é?¢)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:10
+#: ../templates/avery-us-templates.xml.h:10
 msgid "CD/DVD Labels (Spine Labels)"
 msgstr "CD/DVD å??ç??æ ?ç¾(å??ç??ç??å??è¡¬çº¸)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:12
-#: ../data/templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr "è½¯ç??æ ?ç¾"
 
 #. the LSK labels can be torn in half down the center
-#: ../data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:14
 msgid "Divider Labels"
 msgstr "å??é??æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:9
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+msgid "File Folder Labels"
+msgstr "æ??ä»¶å¤¹æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr "æ¡£æ¡?æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:11
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "æ?´é¡µæ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 msgid "ID Labels"
 msgstr "ç¼?å?·å?¡ç??"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 msgid "Index Cards"
 msgstr "ç´¢å¼?å?¡ç??"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "å¤§å??æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:15
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "é?ç??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr "è´ºå?¡/æ??ä¿¡ç??"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:17
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "é??å??å?°å??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:32
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "å??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:34
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr "ç?©æµ?æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:21
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "å°?å??æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:23
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "æ£æ?¹å½¢æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr "å¤¹çº¸æ?¡"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:42
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "å½?å??å¸¦æ£é?¢æ ?ç¾"
 
-#: data/templates/avery-us-templates.xml.h:25
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr "å½?å??å¸¦è??é?¢æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:4
 msgid "Address labels"
 msgstr "é??è¿?å½?æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:6
 msgid "Allround labels"
 msgstr "é??ç?¨æ ?ç¾"
 
 #. ===============================================================
-#: data/templates/avery-iso-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "CD Booklet"
 msgstr "CDé??æ ?ç¾"
 
 #. ===============================================================
-#: data/templates/avery-iso-templates.xml.h:8
+#: ../templates/avery-iso-templates.xml.h:12
 msgid "CD Inlet"
 msgstr "CDå??ç??"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:18
+#: ../templates/avery-iso-templates.xml.h:18
 msgid "Diskette labels"
 msgstr "è½¯ç??æ ?ç¾"
 
 #. ===============================================================
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:14
-#: data/templates/zweckform-iso-templates.xml.h:14
-#: data/templates/misc-iso-templates.xml.h:35
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
 msgstr "ä¿¡å°?æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:16
+#: ../templates/avery-iso-templates.xml.h:22
 msgid "Mailing labels"
 msgstr "ä¿¡å°?æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:18
+#: ../templates/avery-iso-templates.xml.h:24
 msgid "Mini Address Labels"
 msgstr "å?°å??æ ?ç¾"
 
 #. ===================================================================
-#: data/templates/avery-iso-templates.xml.h:20
-msgid "Shipping labels"
-msgstr "ç?©æµ?æ ?ç¾"
+#: ../templates/avery-iso-templates.xml.h:26
+#, fuzzy
+msgid "Mini Labels"
+msgstr "å¾®å??CDç??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/avery-other-templates.xml.h:2
-msgid "File Folder Labels"
-msgstr "æ??ä»¶å¤¹æ ?ç¾"
+#: ../templates/avery-iso-templates.xml.h:28
+msgid "Shipping labels"
+msgstr "ç?©æµ?æ ?ç¾"
 
-#: ../data/templates/brother-other-templates.xml.h:1
+#: ../templates/brother-other-templates.xml.h:1
 msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr "å¤?ç?¨é??æ ?ç¾ 17mm x 54mm"
 
-#: ../data/templates/brother-other-templates.xml.h:2
+#: ../templates/brother-other-templates.xml.h:2
 msgid "Shipping Labels 62mm x 100mm"
 msgstr "ç?©æµ?æ ?ç¾ 62mm x 100mm"
 
@@ -2405,266 +2938,481 @@ msgstr "ç?©æµ?æ ?ç¾ 62mm x 100mm"
 #. *********************************************************************
 #. *********************************************************************
 #.
-#: ../data/templates/brother-other-templates.xml.h:20
+#: ../templates/brother-other-templates.xml.h:20
 msgid "Standard Address Labels 29mm x 90mm"
 msgstr "æ ?å??é??è¿?å½? 29mm x 90mm"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:2
 msgid "3.5in Diskette"
 msgstr "3.5è?±å¯¸è½¯ç??"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:6
 msgid "File Folder"
 msgstr "æ??ä»¶å¤¹"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:8
+#: ../templates/dymo-other-templates.xml.h:8
 msgid "Hanging Folder"
 msgstr "æ??èµ·ç??å?¬æ??å¤¹"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:10
+#: ../templates/dymo-other-templates.xml.h:10
 msgid "Large Address Labels"
 msgstr "å¤§å?°å??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:14
 msgid "Shipping Address Labels"
 msgstr "ç?©æµ?å?°å??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:2
+#: ../templates/misc-us-templates.xml.h:2
 msgid "Business Card CD"
 msgstr "å??ç??CD"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:6
+#: ../templates/misc-us-templates.xml.h:6
 msgid "CD Template Rectangles"
 msgstr "CDæ?¹ç?? (æ?¹å½¢å¤?å??è£?)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
 msgid "CD/DVD Labels (Face Only)"
 msgstr "CD/DVDå??ç??è´´çº¸(ç??é?¢)"
 
-
-#: data/templates/misc-us-templates.xml.h:7
-#: data/templates/misc-iso-templates.xml.h:23
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "CD/DVD Labels (face only)"
 msgstr "CD/DVDå??ç??è´´çº¸(ç??é?¢)"
 
-
-#: data/templates/misc-us-templates.xml.h:9
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:14
 msgid "Cassette Labels"
 msgstr "ç£?å¸¦ç??æ ?ç¾"
 
-
-#: data/templates/misc-us-templates.xml.h:11
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:16
 msgid "DLT Labels"
 msgstr "DLTæ ?ç¾"
 
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "CDé??æ ?ç¾"
 
-#: data/templates/misc-us-templates.xml.h:13
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr "ç»?ç®¡æ ?ç¾"
 
-#: data/templates/misc-us-templates.xml.h:14
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr "å¾®å??CDç??æ ?ç¾"
 
-#: data/templates/misc-us-templates.xml.h:15
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr "è¶?çº§CDæ ?ç¾ 2-å??ä¸?(å??ç??ç??é?¢)"
 
-#: data/templates/misc-us-templates.xml.h:16
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "è¶?çº§CDæ ?ç¾ 2-å??ä¸?(å°?é?¢)"
 
-#: data/templates/misc-us-templates.xml.h:17
-#: data/templates/misc-iso-templates.xml.h:42
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr "è¶?çº§CDæ ?ç¾ 2-å??ä¸?(å°?é?¢)"
 
-#: data/templates/misc-us-templates.xml.h:13
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr "CDæ?¶é??ç??(å?³ä¾§å?¨ä¸?)"
 
-#: data/templates/misc-us-templates.xml.h:19
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr "CDæ?¶é??ç??(ç??å?å?¨ä¸?)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:4
-#: ../data/templates/zweckform-iso-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Allround Labels"
 msgstr "é??ç?¨æ ?ç¾"
 
-#: data/templates/misc-iso-templates.xml.h:11
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr "æ¡£æ¡?æ ?ç¾"
 
-#: data/templates/misc-iso-templates.xml.h:13
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr "æ¡£æ¡?æ ?ç¾(å¤§)"
 
-#: data/templates/misc-iso-templates.xml.h:15
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr "æ¡£æ¡?æ ?ç¾(å°?)"
 
-#: data/templates/misc-iso-templates.xml.h:19
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "CDæ ?ç¾"
 
-#: data/templates/misc-iso-templates.xml.h:25
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "CD/DVDå??ç??è´´çº¸æ ?å??æ ¼å¼?(æ£é?¢)"
 
-#: data/templates/misc-iso-templates.xml.h:27
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "è½¯ç??æ ?ç¾ (å°?é?¢)"
 
-#: data/templates/misc-iso-templates.xml.h:29
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "ç?±æ?®ç??(EPSON)ç?¸ç??çº¸"
 
-#: data/templates/misc-iso-templates.xml.h:31
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "å??è£?æ ?ç¾"
 
-#: data/templates/misc-iso-templates.xml.h:33
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "å?°ç®±è´´çº¸"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:30
 msgid "General Labels"
 msgstr "é??ç?¨æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr "å?·å¢¨/æ¿?å??æ??å?°çº¸ 70x37mm"
 
 #. ===================================================================
-#: data/templates/misc-iso-templates.xml.h:37
-msgid "Mailing Labels --14"
-msgstr "ä¿¡å°?æ ?ç¾ --14"
-
-#: data/templates/misc-iso-templates.xml.h:39
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr "ä¿¡å°?æ ?ç¾-2æ ?"
 
-#: data/templates/misc-iso-templates.xml.h:41
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr "ä¿¡å°?æ ?ç¾-3æ ?"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:44
-#: ../data/templates/zweckform-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Rectangular Labels"
 msgstr "é?¿æ?¹å½¢æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "é??ç?¨æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "å½?å??å¸¦æ ?ç¾(æ£é?¢)"
 
 #. ===================================================================
-#: ../data/templates/misc-other-templates.xml.h:2
+#: ../templates/misc-other-templates.xml.h:2
 msgid "Multi-Purpose Labels"
 msgstr "å¤?ç?¨é??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:10
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "é??è¿?å½?æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "è½¯ç??æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "å??ç??"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "å??ç??"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "å??ç??"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "å??ç??"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "é??ç?¨æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "å??ç??"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+#, fuzzy
+msgid "Name plates"
+msgstr "å??ç§°"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "å?³äº?glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "æ£æ?¹å½¢æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "æ£æ?¹å½¢æ ?ç¾"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
 msgid "Correction and Cover-up Labels"
 msgstr "æ?¹é??è´´çº¸æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:12
 msgid "File Back Labels"
 msgstr "æ??ä»¶å¤?æ¡?æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:14
+#: ../templates/zweckform-iso-templates.xml.h:14
 msgid "Lever Arch File Labels"
 msgstr "è£?è®¢æ¡£æ¡?æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr "å¤?ç?¨é?? æ??äº?è´´"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:20
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr ""
 
 #. ===================================================================
-#: data/templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
 msgstr "é?¿æ?¹å½¢å¤?å??æ ?ç¾"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "å½?å??å¸¦æ ?ç¾(è??é?¢)"
 
-#. ===================================================================
-#: data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "å?¶ä½?æ ?ç¾ï¼?å??ç??å??å??ç??ç??å°?é?¢"
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "ç?¨é??å?·å??é??ç??æ??æ?¬æ??ä»¶ (CSV)"
 
-#: data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "gLabelsæ ?ç¾è®¾è®¡å·¥å?·"
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "ç?¨å??å?·å??é??ç??æ??æ?¬æ??ä»¶ (CSV)"
 
-#: data/mime/glabels.keys.in.h:1 data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "gLabelså·¥ç¨?æ??ä»¶"
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "ç?¨å?¶è¡¨ç¬¦å??é??ç??æ??æ?¬æ??ä»¶ (CSV)"
 
-#: ../barcode-0.98/compat/getopt.c:583
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: é??é¡¹ `%s' æ??æ§ä¹?\n"
+#~ msgid "Data from a file containing VCards"
+#~ msgstr "ä»?VCardsæ??ä»¶å¯¼å?ºç??æ?°æ?®"
 
-#: ../barcode-0.98/compat/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: é??é¡¹ `--%s' ä¸?æ?¯æ??é??å? å??æ?°\n"
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
 
-#: ../barcode-0.98/compat/getopt.c:612
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: é??é¡¹ `%c%s' ä¸?æ?¯æ??é??å? å??æ?°\n"
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
 
-#: ../barcode-0.98/compat/getopt.c:629
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: é??é¡¹ `%s' é??è¦?é??å? å??æ?°\n"
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s ç?´å¾?"
 
-#. --option
-#: ../barcode-0.98/compat/getopt.c:658
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: æ?ªç?¥ç??é??é¡¹ '--%s'\n"
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>æ ?ç¾æ?¹å??</b>"
 
-#. +option or -option
-#: ../barcode-0.98/compat/getopt.c:662
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: æ?ªç?¥ç??é??é¡¹ `%c%s'\n"
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>ä»?è´¨ç±»å??</b>"
 
-#. 1003.2 specifies the format of this message.
-#: ../barcode-0.98/compat/getopt.c:688
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: é??æ³?ç??é??é¡¹ -- %c\n"
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
 
-#: ../barcode-0.98/compat/getopt.c:691
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: æ? æ??ç??é??é¡¹ -- %c\n"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Xxxå¯¹è±¡å±?æ?§</span>"
 
-#: ../barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: é??é¡¹é??è¦?é??å? å??æ?° -- %c\n"
\ No newline at end of file
+#~ msgid "Select A File"
+#~ msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
+
+#~ msgid "<span weight=\"bold\">Default page size</span>"
+#~ msgstr "<span weight=\"bold\">é»?è®¤çº¸å¼ å°ºå¯¸</span>"
+
+#~ msgid "<span weight=\"bold\">Fill</span>"
+#~ msgstr "<span weight=\"bold\">å¡«å??</span>"
+
+#~ msgid "<span weight=\"bold\">Line</span>"
+#~ msgstr "<span weight=\"bold\">çº¿æ?¡</span>"
+
+#~ msgid "<span weight=\"bold\">Text</span>"
+#~ msgstr "<span weight=\"bold\">æ??å?</span>"
+
+#~ msgid "<span weight=\"bold\">Units</span>"
+#~ msgstr "<span weight=\"bold\">å??ä½?</span>"
+
+#~ msgid "<b>Print control (Merge)</b>"
+#~ msgstr "<b>æ??å?°æ?§å?¶(å??å¹¶)</b>"
+
+#~ msgid "<b>Print control (Simple)</b>"
+#~ msgstr "<b>æ??å?°æ?§å?¶(ç®?å??)</b>"
+
+#~ msgid "cd_size_page"
+#~ msgstr "å??ç??å°ºå¯¸"
+
+#~ msgid "finish_page"
+#~ msgstr "å®?æ??"
+
+#~ msgid "layout_page"
+#~ msgstr "å¸?å±?"
+
+#~ msgid "nlayouts_page"
+#~ msgstr "å¤?å±?å¸?å±?"
+
+#~ msgid "pg_size_page"
+#~ msgstr "çº¸å¼ å¤§å°?"
+
+#~ msgid "rect_size_page"
+#~ msgstr "ç?©å½¢å°ºå¯¸"
+
+#~ msgid "round_size_page"
+#~ msgstr "å??å½¢å°ºå¯¸"
+
+#~ msgid "shape_page"
+#~ msgstr "å½¢ç?¶"
+
+#~ msgid "start_page"
+#~ msgstr "èµ·å§?é¡µ"
+
+#~ msgid "Search all templates"
+#~ msgstr "æ?¥æ?¾å?¨é?¨æ¨¡æ?¿"
+
+#~ msgid "Mailing Labels --14"
+#~ msgstr "ä¿¡å°?æ ?ç¾ --14"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: é??é¡¹ `%s' æ??æ§ä¹?\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: é??é¡¹ `--%s' ä¸?æ?¯æ??é??å? å??æ?°\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: é??é¡¹ `%c%s' ä¸?æ?¯æ??é??å? å??æ?°\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: é??é¡¹ `%s' é??è¦?é??å? å??æ?°\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: æ?ªç?¥ç??é??é¡¹ '--%s'\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: æ?ªç?¥ç??é??é¡¹ `%c%s'\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: é??æ³?ç??é??é¡¹ -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: æ? æ??ç??é??é¡¹ -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: é??é¡¹é??è¦?é??å? å??æ?° -- %c\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 579c4e3..567e161 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 0.4.4\n"
-"POT-Creation-Date: 2004-08-08 00:43-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-10 00:37-0400\n"
 "PO-Revision-Date: 2002-07-14 18:30+0800\n"
 "Last-Translator: Shell Hung <shell debian org>\n"
 "Language-Team: zh-l10n <zh-l10n linux org tw>\n"
@@ -13,2007 +14,2416 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/glabels.c:55
-msgid "Show view debugging messages."
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
 msgstr ""
 
-#: src/glabels.c:58
-msgid "Show item debugging messages."
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
 msgstr ""
 
-#: src/glabels.c:61
-msgid "Show printing debugging messages."
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
 msgstr ""
 
-#: src/glabels.c:64
-msgid "Show prefs debugging messages."
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
 msgstr ""
 
-#: src/glabels.c:67
-msgid "Show file debugging messages."
+#: ../src/bc.c:80
+msgid "CEPNET"
 msgstr ""
 
-#: src/glabels.c:70
-msgid "Show document debugging messages."
+#: ../src/bc.c:83
+msgid "EAN (any)"
 msgstr ""
 
-#: src/glabels.c:73
-msgid "Show template debugging messages."
+#: ../src/bc.c:86
+msgid "EAN-8"
 msgstr ""
 
-#: src/glabels.c:76
-msgid "Show paper debugging messages."
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
 msgstr ""
 
-#: src/glabels.c:79
-msgid "Show xml debugging messages."
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
 msgstr ""
 
-#: src/glabels.c:82
-msgid "Show document merge debugging messages."
+#: ../src/bc.c:95
+msgid "EAN-13"
 msgstr ""
 
-#: src/glabels.c:85
-msgid "Show commands debugging messages."
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
 msgstr ""
 
-#: src/glabels.c:88
-msgid "Show undo debugging messages."
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
 msgstr ""
 
-#: src/glabels.c:91
-msgid "Show recent debugging messages."
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
 msgstr ""
 
-#: src/glabels.c:94
-msgid "Show window debugging messages."
+#: ../src/bc.c:107 ../src/bc.c:348
+msgid "UPC-A"
 msgstr ""
 
-#: src/glabels.c:97
-msgid "Show ui debugging messages."
+#: ../src/bc.c:110
+msgid "UPC-A +2"
 msgstr ""
 
-#: src/glabels.c:100
-msgid "Show property_bar debugging messages."
+#: ../src/bc.c:113
+msgid "UPC-A +5"
 msgstr ""
 
-#: src/glabels.c:103
-msgid "Show media select widget debugging messages."
+#: ../src/bc.c:116 ../src/bc.c:351
+msgid "UPC-E"
 msgstr ""
 
-#: src/glabels.c:106
-msgid "Show mini preview widget debugging messages."
+#: ../src/bc.c:119
+msgid "UPC-E +2"
 msgstr ""
 
-#: src/glabels.c:109
-msgid "Show pixbuf cache debugging messages."
+#: ../src/bc.c:122
+msgid "UPC-E +5"
 msgstr ""
 
-#: src/glabels.c:112
-msgid "Show widget debugging messages."
+#: ../src/bc.c:125 ../src/bc.c:288
+msgid "ISBN"
 msgstr ""
 
-#: src/glabels.c:115
-msgid "Show object editor debugging messages."
+#: ../src/bc.c:128
+msgid "ISBN +5"
 msgstr ""
 
-#: src/glabels.c:118
-msgid "Turn on all debugging messages."
+#: ../src/bc.c:131 ../src/bc.c:204
+msgid "Code 39"
 msgstr ""
 
-#: src/glabels.c:187
-msgid "Could not initialize Bonobo!\n"
+#: ../src/bc.c:134 ../src/bc.c:216
+msgid "Code 128"
 msgstr ""
 
-#: src/glabels-batch.c:48
-msgid "print this message"
-msgstr "å??å?°é??å??è¨?æ?¯"
-
-#: src/glabels-batch.c:50
-msgid "print the version of glabels-batch being used"
-msgstr "å??å?°å?º glabels-batch ç??ç??æ?¬è³?è¨?"
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr ""
 
-#: src/glabels-batch.c:52
-msgid "set output filename (default=\"output.ps\")"
-msgstr "è¨å®?è¼¸å?ºæª?å??ç¨± (é ?è¨ç?º\"output.ps\")"
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr ""
 
-#: src/glabels-batch.c:52
-msgid "filename"
-msgstr "æª?æ¡?å??ç¨±"
+#: ../src/bc.c:143 ../src/bc.c:285
+msgid "Interleaved 2 of 5"
+msgstr ""
 
-#: src/glabels-batch.c:54
-msgid "number of sheets (default=1)"
-msgstr "ç´?å¼µæ?¸ç?® (é ?è¨ç?º 1)"
+#: ../src/bc.c:146 ../src/bc.c:180
+msgid "Codabar"
+msgstr ""
 
-#: src/glabels-batch.c:54
-msgid "sheets"
-msgstr "ç´?å¼µ"
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr ""
 
-#: src/glabels-batch.c:56
-msgid "number of copies (default=1)"
-msgstr "ä»½æ?¸ (é ?è¨ç?º 1)"
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr ""
 
-#: src/glabels-batch.c:56
-msgid "copies"
-msgstr "ä»½æ?¸"
+#: ../src/bc.c:155 ../src/bc.c:213
+msgid "Code 93"
+msgstr ""
 
-#: src/glabels-batch.c:58 src/print-dialog.c:336
-msgid "print outlines (to test printer alignment)"
-msgstr "å?°å?ºå¤?é?? (æ¸¬è©¦æ??å?°æ©?å??æ?¸)"
+#: ../src/bc.c:162
+msgid "Australia Post Standard"
+msgstr ""
 
-#: src/glabels-batch.c:60 src/print-dialog.c:344
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "å??æ?¹å??å??å?° (å¦?å??å??å½±å??)"
+#: ../src/bc.c:165
+msgid "Australia Post Reply Paid"
+msgstr ""
 
-#: src/glabels-batch.c:96
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr "[é?¸é ?...] GLABELS_FILE..."
+#: ../src/bc.c:168
+msgid "Australia Post Route Code"
+msgstr ""
 
-#: src/glabels-batch.c:116
-msgid "missing glabels file\n"
-msgstr "æ²?æ??è¼¸å?¥ glabels ç??æª?æ¡?\n"
+#: ../src/bc.c:171
+msgid "Australia Post Redirect"
+msgstr ""
 
-#: src/glabels-batch.c:157
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "é??å??æª?æ¡?å¤±æ?? %s\n"
+#: ../src/bc.c:174
+msgid "Aztec Code"
+msgstr ""
 
-#: src/window.c:244
-msgid "(none) - gLabels"
+#: ../src/bc.c:177
+msgid "Aztec Rune"
 msgstr ""
 
-#: src/window.c:414
-msgid "(modified)"
+#: ../src/bc.c:183
+msgid "Code One"
 msgstr ""
 
-#: src/stock.c:65 data/ui/glabels-ui.xml.h:165
-#, fuzzy
-msgid "_Select Mode"
-msgstr "é?¸æ??"
+#: ../src/bc.c:186
+msgid "Code 11"
+msgstr ""
 
-#: src/stock.c:66 data/ui/glabels-ui.xml.h:166
-#, fuzzy
-msgid "_Text"
-msgstr "æ??å?"
+#: ../src/bc.c:189
+msgid "Code 16K"
+msgstr ""
 
-#: src/stock.c:67 data/ui/glabels-ui.xml.h:151
-#, fuzzy
-msgid "_Line"
-msgstr "ç·?"
+#: ../src/bc.c:192
+msgid "Code 2 of 5 Matrix"
+msgstr ""
 
-#: src/stock.c:68 data/ui/glabels-ui.xml.h:133
-#, fuzzy
-msgid "_Box"
-msgstr "ç??å?"
+#: ../src/bc.c:195
+msgid "Code 2 of 5 IATA"
+msgstr ""
 
-#: src/stock.c:69 data/ui/glabels-ui.xml.h:144
-#, fuzzy
-msgid "_Ellipse"
-msgstr "æ©¢å??å½¢"
+#: ../src/bc.c:198
+msgid "Code 2 of 5 Data Logic"
+msgstr ""
 
-#: src/stock.c:70 data/ui/glabels-ui.xml.h:149
-#, fuzzy
-msgid "_Image"
-msgstr "å??å??"
+#: ../src/bc.c:201
+msgid "Code 32 (Italian Pharmacode)"
+msgstr ""
 
-#: src/stock.c:71 data/ui/glabels-ui.xml.h:11
-#, fuzzy
-msgid "Bar_code"
-msgstr "æ?¸ç¢¼æ¢?"
+#: ../src/bc.c:207
+msgid "Code 39 Extended"
+msgstr ""
 
-#: src/stock.c:72
-#, fuzzy
-msgid "_Merge Properties"
-msgstr "å??ä½µè¨å®?"
+#: ../src/bc.c:210
+msgid "Code 49"
+msgstr ""
 
-#: src/stock.c:73
-#, fuzzy
-msgid "Object _Properties"
-msgstr "æ??å?æ¨£è²?"
+#: ../src/bc.c:219
+msgid "Code 128 (Mode C supression)"
+msgstr ""
 
-#: src/stock.c:74 data/ui/glabels-ui.xml.h:13
-#, fuzzy
-msgid "Bring to _Front"
-msgstr "å¸¶å?ºå?°å??é?¢"
+#: ../src/bc.c:222
+msgid "DAFT Code"
+msgstr ""
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:110
-#, fuzzy
-msgid "Send to _Back"
-msgstr "æ?¾å?¨æ??åº?"
+#: ../src/bc.c:225
+msgid "Data Matrix"
+msgstr ""
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:97
-#, fuzzy
-msgid "Rotate _Left"
-msgstr "æ??è½?"
+#: ../src/bc.c:228
+msgid "Deutsche Post Leitcode"
+msgstr ""
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:98
-#, fuzzy
-msgid "Rotate _Right"
-msgstr "æ??è½?"
+#: ../src/bc.c:231
+msgid "Deutsche Post Identcode"
+msgstr ""
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
+#: ../src/bc.c:234
+msgid "Dutch Post KIX Code"
 msgstr ""
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
+#: ../src/bc.c:237
+msgid "European Article Number (EAN)"
 msgstr ""
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:150
-msgid "_Lefts"
+#: ../src/bc.c:240
+msgid "Grid Matrix"
 msgstr ""
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:162
-msgid "_Rights"
+#: ../src/bc.c:243
+msgid "GS1-128"
 msgstr ""
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:134
-msgid "_Centers"
+#: ../src/bc.c:246
+msgid "GS1 DataBar-14"
 msgstr ""
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:167
-#, fuzzy
-msgid "_Tops"
-msgstr "å·¥å?· (&_T)"
+#: ../src/bc.c:255
+msgid "GS1 DataBar-14 Stacked"
+msgstr ""
 
-#: src/stock.c:84
-msgid "Bottoms"
+#: ../src/bc.c:258
+msgid "GS1 DataBar-14 Stacked Omni."
 msgstr ""
 
-#: src/stock.c:85
-msgid "Centers"
+#: ../src/bc.c:261
+msgid "GS1 DataBar Extended Stacked"
 msgstr ""
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
+#: ../src/bc.c:264
+msgid "HIBC Code 128"
 msgstr ""
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
+#: ../src/bc.c:267
+msgid "HIBC Code 39"
 msgstr ""
 
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
+#: ../src/bc.c:270
+msgid "HIBC Data Matrix"
 msgstr ""
 
-#: src/stock.c:90 src/stock.c:92
-#, fuzzy
-msgid "Linked"
-msgstr "ç·?"
+#: ../src/bc.c:273
+msgid "HIBC QR Code"
+msgstr ""
 
-#: src/stock.c:91 src/stock.c:93
-#, fuzzy
-msgid "Not Linked"
-msgstr "æ²?æ??"
+#: ../src/bc.c:276
+msgid "HIBC PDF417"
+msgstr ""
 
-#: src/ui-property-bar.c:345 src/object-editor.c:499
-#, fuzzy
-msgid "Default"
-msgstr "å?ªé?¤"
+#: ../src/bc.c:279
+msgid "HIBC Micro PDF417"
+msgstr ""
 
-#: src/ui-property-bar.c:360 src/object-editor.c:512
-msgid "No fill"
+#: ../src/bc.c:282
+msgid "HIBC Aztec Code"
 msgstr ""
 
-#: src/ui-property-bar.c:375 src/object-editor.c:505
-#, fuzzy
-msgid "No line"
-msgstr "æ²?æ??"
+#: ../src/bc.c:291
+msgid "ITF-14"
+msgstr ""
 
-#: src/ui-sidebar.c:180
-#, fuzzy
-msgid "Object properties"
-msgstr "æ??å?æ¨£è²?"
+#: ../src/bc.c:294
+msgid "Japanese Postal"
+msgstr ""
 
-#: src/commands.c:385
-msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
+#: ../src/bc.c:297
+msgid "Korean Postal"
 msgstr ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
 
-#: src/commands.c:399
-msgid "See the file AUTHORS for additional credits,"
+#: ../src/bc.c:300
+msgid "LOGMARS"
 msgstr ""
 
-#: src/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/bc.c:303
+msgid "Micro PDF417"
 msgstr ""
 
-#: src/commands.c:409
-msgid " "
+#: ../src/bc.c:306
+msgid "Micro QR Code"
 msgstr ""
 
-#: src/commands.c:424
-#, fuzzy
-msgid "glabels"
-msgstr "æ¨?ç°½"
+#: ../src/bc.c:309
+msgid "MSI Plessey"
+msgstr ""
 
-#: src/file.c:100
-msgid "New Label or Card"
-msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
+#: ../src/bc.c:312
+msgid "NVE-18"
+msgstr ""
 
-#: src/file.c:132 src/file.c:304
-msgid "Media Type"
-msgstr "åª?é«?ç¨®é¡?"
+#: ../src/bc.c:315
+msgid "PDF417"
+msgstr ""
 
-#: src/file.c:138 src/file.c:310
-msgid "Label orientation"
-msgstr "æ¨?ç°½æ?¹å??"
+#: ../src/bc.c:318
+msgid "PDF417 Truncated"
+msgstr ""
 
-#: src/file.c:269
-#, fuzzy
-msgid "Label properties"
-msgstr "æ??å?æ¨£è²?"
+#: ../src/bc.c:321
+msgid "PLANET"
+msgstr ""
 
-#: src/file.c:452 src/file.c:870
-msgid "All files"
+#: ../src/bc.c:324
+msgid "PostNet"
 msgstr ""
 
-#: src/file.c:457 src/file.c:875
+#: ../src/bc.c:327
 #, fuzzy
-msgid "gLabels documents"
-msgstr "Glabels: è¨å®?å?¼"
+msgid "Pharmacode"
+msgstr "æ?¸ç¢¼æ¢?"
 
-#: src/file.c:505 src/file.c:617 src/file.c:934 src/file.c:1130
+#: ../src/bc.c:330
 #, fuzzy
-msgid "Empty file name selection"
-msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
+msgid "Pharmacode 2-track"
+msgstr "æ?¸ç¢¼æ¢?è³?æ??"
 
-#: src/file.c:506 src/file.c:520 src/file.c:618 src/file.c:632
-msgid "Please select a file or supply a valid file name"
+#: ../src/bc.c:333
+msgid "Pharmazentral Nummer (PZN)"
 msgstr ""
 
-#: src/file.c:519 src/file.c:631
-msgid "File does not exist"
+#: ../src/bc.c:336
+msgid "QR Code"
 msgstr ""
 
-#: src/file.c:563 data/ui/glabels-ui.xml.h:75
-msgid "Open"
-msgstr "é??å??"
+#: ../src/bc.c:339
+msgid "Royal Mail 4-State"
+msgstr ""
 
-#: src/file.c:565
-msgid "Open label"
-msgstr "é??å??æ¨?ç°½"
+#: ../src/bc.c:342
+#, fuzzy
+msgid "Telepen"
+msgstr "å?ªé?¤"
 
-#: src/file.c:707
-#, fuzzy, c-format
-msgid "Could not open file \"%s\""
-msgstr "é??å??æª?æ¡?å¤±æ??"
+#: ../src/bc.c:345
+msgid "Telepen Numeric"
+msgstr ""
 
-#: src/file.c:715
-msgid "Not a supported file format"
+#: ../src/bc.c:354
+msgid "USPS One Code"
 msgstr ""
 
-#: src/file.c:797 src/file.c:979 src/file.c:1174
-#, fuzzy, c-format
-msgid "Could not save file \"%s\""
-msgstr "ä¸?è?½å?²å?æª?æ¡?"
+#: ../src/bc.c:357
+msgid "UK Plessey"
+msgstr ""
 
-#: src/file.c:805 src/file.c:987 src/file.c:1182
-msgid "Error encountered during save.  The file is still not saved."
+#: ../src/bc.c:364
+msgid "IEC16022 (DataMatrix)"
 msgstr ""
 
-#: src/file.c:848 src/file.c:1048
-#, fuzzy, c-format
-msgid "Save \"%s\" as"
-msgstr "å?²å?æ¨?ç°½ç?º..."
+#: ../src/bc.c:371
+msgid "IEC18004 (QRCode)"
+msgstr ""
 
-#: src/file.c:935 src/file.c:1131
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
 #, fuzzy
-msgid "Please supply a valid file name"
-msgstr "è«?å¿?é??è¼¸å?¥æª?æ¡?å??ç¨±"
+msgid "Default Color"
+msgstr "å?ªé?¤"
 
-#: src/file.c:952 src/file.c:1147
-#, c-format
-msgid "Overwrite file \"%s\"?"
+#: ../src/color-combo-menu.c:83
+msgid "Dark Red"
 msgstr ""
 
-#: src/file.c:960 src/file.c:1155
-msgid "File already exists."
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
 msgstr ""
 
-#: src/file.c:1271
-#, c-format
-msgid "Save changes to document \"%s\" before closing?"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
 msgstr ""
 
-#: src/file.c:1279
-msgid "Your changes will be lost if you don't save them."
+#: ../src/color-combo-menu.c:86
+msgid "Dark Green"
 msgstr ""
 
-#: src/file.c:1282
-msgid "Close without saving"
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
 msgstr ""
 
-#. Should not happen
-#: src/prefs.c:156 src/prefs.c:163 data/glade/prefs-dialog.glade.h:23
-#: data/glade/object-editor.glade.h:37
-msgid "points"
-msgstr "é»?"
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/prefs.c:158 data/glade/object-editor.glade.h:36
-#: data/glade/template-designer.glade.h:74
-msgid "inches"
-msgstr "è?±å¯¸"
+#: ../src/color-combo-menu.c:89
+msgid "Dark Violet"
+msgstr ""
 
-#: src/prefs.c:160
-msgid "mm"
-msgstr "mm"
+#: ../src/color-combo-menu.c:91
+msgid "Red"
+msgstr ""
 
-#: src/prefs-dialog.c:248 data/glade/prefs-dialog.glade.h:22
-#, fuzzy
-msgid "gLabels Preferences"
-msgstr "Glabels: è¨å®?å?¼"
+#: ../src/color-combo-menu.c:92
+msgid "Orange"
+msgstr ""
 
-#.
-#. * Submenu: Order
-#.
-#: src/view.c:3570 data/ui/glabels-ui.xml.h:157
-msgid "_Order"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
 msgstr ""
 
-#.
-#. * Submenu: Rotate/Flip
-#.
-#: src/view.c:3591 data/ui/glabels-ui.xml.h:163
-#, fuzzy
-msgid "_Rotate/Flip"
-msgstr "æ??è½?"
+#: ../src/color-combo-menu.c:94
+msgid "Medium green"
+msgstr ""
 
-#.
-#. * Submenu: Align Horizontally
-#.
-#: src/view.c:3624
-msgid "Align _Horizontally"
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
 msgstr ""
 
-#.
-#. * Submenu: Align Vertically
-#.
-#: src/view.c:3663
-msgid "Align _Vertically"
+#: ../src/color-combo-menu.c:96
+msgid "Blue"
 msgstr ""
 
-#: src/view.c:3724 data/ui/glabels-ui.xml.h:140
-#, fuzzy
-msgid "_Delete"
-msgstr "å?ªé?¤"
+#: ../src/color-combo-menu.c:97
+msgid "Purple"
+msgstr ""
 
-#. Build editor.
-#: src/view-box.c:223
-#, fuzzy
-msgid "Box object properties"
-msgstr "ä¿®æ?¹æ?¹å¡?ç?©ä»¶è¨å®?"
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
 
-#. Build editor.
-#: src/view-ellipse.c:223
-#, fuzzy
-msgid "Ellipse object properties"
-msgstr "ä¿®æ?¹æ©¢å??ç?©ä»¶è¨å®?"
+#: ../src/color-combo-menu.c:100
+msgid "Gold"
+msgstr ""
 
-#. Build editor.
-#: src/view-line.c:223
-#, fuzzy
-msgid "Line object properties"
-msgstr "ä¿®æ?¹æ?¹å¡?ç?©ä»¶è¨å®?"
+#: ../src/color-combo-menu.c:101
+msgid "Yellow"
+msgstr ""
 
-#. Build editor.
-#: src/view-image.c:222
+#: ../src/color-combo-menu.c:102
 #, fuzzy
-msgid "Image object properties"
-msgstr "ä¿®æ?¹å??å??ç?©ä»¶è¨å®?"
+msgid "Green"
+msgstr "åº¦æ?¸"
 
-#. Build editor.
-#: src/view-text.c:250
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr ""
+
+#: ../src/color-combo-menu.c:104
 #, fuzzy
-msgid "Text object properties"
-msgstr "ä¿®æ?¹æ?¹å¡?ç?©ä»¶è¨å®?"
+msgid "SkyBlue"
+msgstr "æ¨£å¼?"
 
-#: src/view-text.c:562 data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "æ??å?"
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
 
-#. Build editor.
-#: src/view-barcode.c:209
+#: ../src/color-combo-menu.c:107
 #, fuzzy
-msgid "Barcode object properties"
-msgstr "ä¿®æ?¹æ?¸ç¢¼æ¢?ç?©ä»¶è¨å®?"
+msgid "Pink"
+msgstr "å??å?°"
 
-#: src/view-barcode.c:579 src/print.c:1088
-#, fuzzy
-msgid "Invalid barcode data"
-msgstr "ä¸?æ£ç¢ºç??æ?¸ç¢¼æ¢?"
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
 
-#: src/merge-properties-dialog.c:231
-#, fuzzy
-msgid "Merge Properties"
-msgstr "å??ä½µè¨å®?"
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
+msgstr ""
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "ä¾?æº?æª?"
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "åº¦æ?¸"
 
-#: src/merge-properties-dialog.c:245
-msgid "Format:"
-msgstr "æ ¼å¼?:"
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
+msgstr ""
 
-#. Location line
-#: src/merge-properties-dialog.c:273
-msgid "Location:"
-msgstr "ä½?ç½®:"
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
 
-#: src/merge-properties-dialog.c:282 src/merge-properties-dialog.c:393
-msgid "Select merge-database source"
-msgstr "é?¸æ??å??ä½µè³?æ??åº«ä¾?æº?"
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
+msgstr ""
 
-#: src/merge-properties-dialog.c:289 src/merge-properties-dialog.c:404
-msgid "N/A"
-msgstr "N/A"
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr ""
 
-#. ---- Sample Fields section ----
-#: src/merge-properties-dialog.c:300
-msgid "Record selection/preview:"
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
 msgstr ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "é?¸æ??"
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr ""
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
 msgstr ""
 
-#: src/merge-properties-dialog.c:342 data/glade/object-editor.glade.h:9
-msgid "Data"
-msgstr "è³?æ??"
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr ""
 
-#: src/print-dialog.c:266 data/ui/glabels-ui.xml.h:82
-msgid "Print"
-msgstr "å??å?°"
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr ""
 
-#: src/print-dialog.c:281
-msgid "_Job"
+#: ../src/color-combo-menu.c:126
+msgid "Black"
 msgstr ""
 
-#: src/print-dialog.c:286
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 #, fuzzy
-msgid "P_rinter"
-msgstr "å??å?°"
+msgid "Custom Color"
+msgstr "é¡?è?²:"
 
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:314
-msgid "Copies"
-msgstr "ä»½æ?¸"
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "é¡?è?²:"
 
-#. ------- Add merge control widget ------------
-#: src/print-dialog.c:322
-msgid "Document merge control"
-msgstr "æ??ä»¶å??ä½µæ?§å?¶"
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr ""
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "è¨å®?"
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
 
-#: src/print-dialog.c:351
-msgid "print crop marks"
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+#, fuzzy
+msgid "Label properties"
+msgstr "æ??å?æ¨£è²?"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
 msgstr ""
 
-#: src/print-dialog.c:553 src/print-dialog.c:592
-msgid "Print preview"
-msgstr "é ?è¦½å??å?°"
+#: ../src/file.c:272 ../src/file.c:562
+#, fuzzy
+msgid "gLabels documents"
+msgstr "Glabels: è¨å®?å?¼"
 
-#: src/template-designer.c:409 data/glade/template-designer.glade.h:73
-msgid "gLabels Template Designer"
-msgstr ""
+#: ../src/file.c:319 ../src/file.c:620
+#, fuzzy
+msgid "Empty file name selection"
+msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
 
-#: src/bc.c:60
-msgid "POSTNET (any)"
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
 msgstr ""
 
-#: src/bc.c:63
-msgid "POSTNET-5 (ZIP only)"
+#: ../src/file.c:335
+msgid "File does not exist"
 msgstr ""
 
-#: src/bc.c:66
-msgid "POSTNET-9 (ZIP+4)"
-msgstr ""
+#: ../src/file.c:410
+#, fuzzy, c-format
+msgid "Could not open file \"%s\""
+msgstr "é??å??æª?æ¡?å¤±æ??"
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
+#: ../src/file.c:413
+msgid "Not a supported file format"
 msgstr ""
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr ""
+#: ../src/file.c:491 ../src/file.c:670
+#, fuzzy, c-format
+msgid "Could not save file \"%s\""
+msgstr "ä¸?è?½å?²å?æª?æ¡?"
 
-#: src/bc.c:75
-msgid "EAN-8"
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
-#: src/bc.c:78
-msgid "EAN-8 +2"
-msgstr ""
+#: ../src/file.c:535
+#, fuzzy, c-format
+msgid "Save \"%s\" as"
+msgstr "å?²å?æ¨?ç°½ç?º..."
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr ""
+#: ../src/file.c:623
+#, fuzzy
+msgid "Please supply a valid file name"
+msgstr "è«?å¿?é??è¼¸å?¥æª?æ¡?å??ç¨±"
 
-#: src/bc.c:84
-msgid "EAN-13"
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
 msgstr ""
 
-#: src/bc.c:87
-msgid "EAN-13 +2"
+#: ../src/file.c:648
+msgid "File already exists."
 msgstr ""
 
-#: src/bc.c:90
-msgid "EAN-13 +5"
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: src/bc.c:93
-msgid "UPC (UPC-A or UPC-E)"
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: src/bc.c:96
-msgid "UPC-A"
+#: ../src/file.c:751
+msgid "Close without saving"
 msgstr ""
 
-#: src/bc.c:99
-msgid "UPC-A +2"
+#: ../src/font-combo-menu.c:137
+msgid "Recent fonts"
 msgstr ""
 
-#: src/bc.c:102
-msgid "UPC-A +5"
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
 msgstr ""
 
-#: src/bc.c:105
-msgid "UPC-E"
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
 msgstr ""
 
-#: src/bc.c:108
-msgid "UPC-E +2"
+#: ../src/font-combo-menu.c:168
+msgid "All fonts"
 msgstr ""
 
-#: src/bc.c:111
-msgid "UPC-E +5"
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
 msgstr ""
 
-#: src/bc.c:114
-msgid "ISBN"
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
 msgstr ""
 
-#: src/bc.c:117
-msgid "ISBN +5"
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 msgstr ""
 
-#: src/bc.c:120
-msgid "Code 39"
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
 msgstr ""
 
-#: src/bc.c:123
-msgid "Code 128"
-msgstr ""
+#: ../src/font-combo-menu-item.c:157
+#, fuzzy
+msgid "Sample text"
+msgstr "æ¨£æ?¬è³?æ??"
 
-#: src/bc.c:126
-msgid "Code 128C"
-msgstr ""
+#: ../src/glabels-batch.c:53
+#, fuzzy
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "è¨å®?è¼¸å?ºæª?å??ç¨± (é ?è¨ç?º\"output.ps\")"
 
-#: src/bc.c:129
-msgid "Code 128B"
-msgstr ""
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
+msgid "filename"
+msgstr "æª?æ¡?å??ç¨±"
 
-#: src/bc.c:132
-msgid "Interleaved 2 of 5"
-msgstr ""
+#: ../src/glabels-batch.c:55
+msgid "number of sheets (default=1)"
+msgstr "ç´?å¼µæ?¸ç?® (é ?è¨ç?º 1)"
 
-#: src/bc.c:135
-msgid "Codabar"
-msgstr ""
+#: ../src/glabels-batch.c:55
+msgid "sheets"
+msgstr "ç´?å¼µ"
 
-#: src/bc.c:138
-msgid "MSI"
-msgstr ""
+#: ../src/glabels-batch.c:57
+msgid "number of copies (default=1)"
+msgstr "ä»½æ?¸ (é ?è¨ç?º 1)"
 
-#: src/bc.c:141
-msgid "Plessey"
-msgstr ""
+#: ../src/glabels-batch.c:57
+msgid "copies"
+msgstr "ä»½æ?¸"
 
-#: src/label.c:569
-msgid "Untitled"
+#: ../src/glabels-batch.c:59
+#, fuzzy
+msgid "first label on first sheet (default=1)"
+msgstr "ç´?å¼µæ?¸ç?® (é ?è¨ç?º 1)"
+
+#: ../src/glabels-batch.c:59
+msgid "first"
 msgstr ""
 
-#: src/xml-label.c:176 src/xml-label.c:213
-msgid "xmlParseFile error"
-msgstr "xmlParseFile é?¯èª¤"
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "å?°å?ºå¤?é?? (æ¸¬è©¦æ??å?°æ©?å??æ?¸)"
 
-#: src/xml-label.c:250
-msgid "No document root"
-msgstr "æ²?æ??æ??ä»¶å§?ç«¯"
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "å??æ?¹å??å??å?° (å¦?å??å??å½±å??)"
 
-#: src/xml-label.c:264
-msgid "Importing from glabels 0.1 format"
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
 msgstr ""
 
-#: src/xml-label.c:272
-msgid "Importing from glabels 0.4 format"
+#: ../src/glabels-batch.c:67
+msgid "input file for merging"
 msgstr ""
 
-#: src/xml-label.c:279
-msgid "Importing from glabels 1.91 format"
+#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+msgid "[FILE...]"
 msgstr ""
 
-#: src/xml-label.c:282
-#, fuzzy
-msgid "bad document, unknown glabels Namespace"
-msgstr "ä¸?æ£ç¢ºç??æ??ä»¶ç¨®é¡?, æ?¾ä¸?å?° glabels æ ¼å¼?"
+#: ../src/glabels-batch.c:99
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: src/xml-label.c:311 src/xml-label-04.c:75 src/xml-label-191.c:131
+#: ../src/glabels-batch.c:107 ../src/glabels.c:89
 #, c-format
-msgid "Bad root node = \"%s\""
-msgstr "é?¯èª¤ç??å?ºç¢¼ = \"%s\""
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
 
-#: src/xml-label.c:348 src/xml-label-191.c:165
+#: ../src/glabels-batch.c:151
 #, fuzzy, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "é?¯èª¤ç??å?ºç¢¼ = \"%s\""
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "é??å??æª?æ¡?å¤±æ?? %s\n"
 
-#: src/xml-label.c:393 src/xml-label-04.c:123 src/xml-label-191.c:197
+#: ../src/glabels-batch.c:186
 #, c-format
-msgid "bad node =  \"%s\""
-msgstr "é?¯èª¤ç??ç¯?é»? = \"%s\""
-
-#: src/xml-label.c:796 src/xml-label-191.c:605
-#, fuzzy, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "é?¯èª¤ç??ç¯?é»? = \"%s\""
-
-#: src/xml-label.c:962 libglabels/xml-template.c:528
-msgid "Utf8 conversion error."
-msgstr ""
-
-#: src/xml-label.c:969 libglabels/xml-template.c:535
-msgid "Problem saving xml file."
-msgstr "å?²å? XML æª?æ¡?æ??ç?¼ç??é?¯èª¤."
+msgid "cannot open glabels file %s\n"
+msgstr "é??å??æª?æ¡?å¤±æ?? %s\n"
 
-#. This should always be an id, but just in case a name
-#. slips by!
-#: src/xml-label-191.c:680 libglabels/xml-template.c:192
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
 msgstr ""
 
-#: src/xml-label-191.c:690 libglabels/xml-template.c:202
-#, c-format
-msgid "Unknown page size id or name \"%s\""
-msgstr ""
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "å»ºç«?æ?¸ç¢¼æ¢?"
 
-#: src/merge.c:172 src/merge.c:213 src/merge.c:399 src/merge.c:402
-msgid "None"
-msgstr "æ²?æ??"
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+msgid "Barcode data"
+msgstr "æ?¸ç¢¼æ¢?è³?æ??"
 
-#: src/merge-init.c:53
+#: ../src/label-barcode.c:263
 #, fuzzy
-msgid "Text file with comma delimeters (CSV)"
-msgstr "ä»¥é??è??å??æ ¼ (CSV)"
+msgid "Barcode property"
+msgstr "ä¿®æ?¹æ?¸ç¢¼æ¢?ç?©ä»¶è¨å®?"
 
-#: src/merge-init.c:60
+#: ../src/label-barcode.c:485
 #, fuzzy
-msgid "Text file with colon delimeters"
-msgstr "ä»¥å??è??å??æ ¼"
+msgid "Barcode data empty"
+msgstr "æ?¸ç¢¼æ¢?è³?æ??"
 
-#: src/merge-init.c:67
+#: ../src/label-barcode.c:489
 #, fuzzy
-msgid "Text file with tab delimeters"
-msgstr "ä»¥ [TAB] ç?ºå??æ ¼"
+msgid "Invalid barcode data"
+msgstr "ä¸?æ£ç¢ºç??æ?¸ç¢¼æ¢?"
 
-#: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11
+#: ../src/label-box.c:156
 #, fuzzy
-msgid "File:"
-msgstr "å¡«æ»¿"
+msgid "Create box object"
+msgstr "å»ºç«?æ?°ç??æ??å?ç?©ä»¶"
 
-#: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "è³?æ??å?¼:"
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../data/ui/property-bar.ui.h:3
+msgid "Fill color"
+msgstr ""
 
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "ç´?å¼µ:"
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+msgid "Line color"
+msgstr ""
 
-#: src/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "æ¨?ç°½"
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:9
+msgid "Line width"
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "ç?±:"
+#: ../src/label.c:402
+msgid "Untitled"
+msgstr ""
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "å?°:"
+#: ../src/label.c:705 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "å??ä½µè¨å®?"
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr "ç?±ç¦?ç°½é??ç´?"
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "å?ªé?¤"
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "å?¨é¦?å¼µç´?"
+#: ../src/label.c:1230 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "å¸¶å?ºå?°å??é?¢"
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "ä»½æ?¸:"
+#: ../src/label.c:1266 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "æ?¾å?¨æ??åº?"
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "æ ¡å°?"
+#: ../src/label.c:1307
+msgid "Rotate"
+msgstr "æ??è½?"
 
-#: src/wdgt-media-select.c:269 data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "æ??è¿°:"
+#: ../src/label.c:1342 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "æ??è½?"
 
-#: src/wdgt-media-select.c:279 data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "ç´?å¼µå¤§å°?:"
+#: ../src/label.c:1375 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "æ??è½?"
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "æ¨?ç°½å¤§å°?:"
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr ""
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "ç??é?¢:"
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr ""
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d (æ¯?é ? %d)"
+#: ../src/label.c:1485 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "å°?ç½®:"
 
-#: src/wdgt-media-select.c:582
-#, fuzzy, c-format
-msgid "%d per sheet"
-msgstr "%d x %d (æ¯?é ? %d)"
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr ""
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr ""
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: ../src/label.c:1679 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "å°?ç½®:"
 
-#: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
 msgstr ""
 
-#: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
 msgstr ""
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "æ??è½?"
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr ""
 
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
+#: ../src/label.c:1922 ../src/ui.c:415
 #, fuzzy
-msgid "custom"
-msgstr "è?ªè¨?æ¬?ä½?é?°"
+msgid "Center vertically"
+msgstr "ä¸?è?¬"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr ""
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
+#: ../src/label-ellipse.c:160
 #, fuzzy
-msgid "Custom Color:"
-msgstr "é¡?è?²:"
+msgid "Create ellipse object"
+msgstr "ç?«ç·?ç?©ä»¶"
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr ""
+#: ../src/label-image.c:200 ../src/ui.c:312
+msgid "Create image object"
+msgstr "å»ºç«?å½±å??ç?©ä»¶"
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-msgstr ""
+#: ../src/label-image.c:333 ../src/label-image.c:474
+#, fuzzy
+msgid "Set image"
+msgstr "é??è¨å??å??å¤§å°?"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr ""
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "ç?«ç·?ç?©ä»¶"
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
 msgstr ""
 
-#: src/mygal/color-palette.c:582
-msgid "dark green #2"
-msgstr ""
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "ç´?å¼µå¤§å°?:"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
+#: ../src/label-object.c:1185
+msgid "Shadow state"
 msgstr ""
 
-#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
-msgid "dark blue"
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
 msgstr ""
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
+#: ../src/label-object.c:1276
+msgid "Shadow color"
 msgstr ""
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
 msgstr ""
 
-#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr ""
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "å»ºç«?æ?°ç??æ??å?ç?©ä»¶"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
+#: ../src/label-text.c:451
+msgid "Typing"
 msgstr ""
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr ""
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "ä¸?è¦?å?²å?"
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr ""
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+#, fuzzy
+msgid "Font size"
+msgstr "ä¸?è¦?å?²å?"
 
-#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr ""
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "ä¸?è¦?å?²å?"
 
-#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
-msgid "blue"
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
 msgstr ""
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr ""
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "å°?ç½®:"
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
+#: ../src/label-text.c:754
+msgid "Line spacing"
 msgstr ""
 
-#: src/mygal/color-palette.c:599
-msgid "red"
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
 msgstr ""
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
+#: ../src/label-text.c:931
+msgid "Auto shrink"
 msgstr ""
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+msgctxt "Brand"
+msgid "Any"
 msgstr ""
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
 msgstr ""
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
 msgstr ""
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
 msgstr ""
 
-#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
-msgid "purple"
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
 msgstr ""
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
 msgstr ""
 
-#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#: ../src/media-select.c:1157
 #, fuzzy
-msgid "magenta"
-msgstr "å??å??"
+msgid "No custom templates found."
+msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
 msgstr ""
 
-#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
-msgid "yellow"
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
 msgstr ""
 
-#: src/mygal/color-palette.c:612
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
 #, fuzzy
-msgid "green"
-msgstr "åº¦æ?¸"
-
-#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr ""
+msgid "Couldn't open addressbook."
+msgstr "é??å??æª?æ¡?å¤±æ??"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr ""
+#: ../src/merge-evolution.c:348
+#, fuzzy
+msgid "Couldn't list available fields."
+msgstr "ä¸?è?½å?²å?æª?æ¡?"
 
-#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
-msgid "red purple"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
 msgstr ""
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
 msgstr ""
 
-#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
-msgid "pink"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
 msgstr ""
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
 msgstr ""
 
-#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
-msgid "light yellow"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
 msgstr ""
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
 msgstr ""
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
 msgstr ""
 
-#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
-msgid "light blue"
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
 msgstr ""
 
-#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
-msgid "light purple"
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
 msgstr ""
 
-#: src/mygal/color-palette.c:626
-msgid "white"
+#: ../src/merge-init.c:119
+msgid "Evolution Addressbook"
 msgstr ""
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
+#: ../src/merge-init.c:125
+msgid "VCards"
 msgstr ""
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr ""
+#: ../src/merge-properties-dialog.c:282
+#, fuzzy
+msgid "Merge Properties"
+msgstr "å??ä½µè¨å®?"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr ""
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "é?¸æ??å??ä½µè³?æ??åº«ä¾?æº?"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr ""
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "é?¸æ??"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
 msgstr ""
 
-#: libglabels/paper.c:361
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+msgid "Data"
+msgstr "è³?æ??"
+
+#. Translators: "Fixed" here means that for the given document-merge method, there are
+#. * no further choices to further define the source of data.  E.g. if you select the
+#. * evolution-data-server, there are no further choices -- the source is "Fixed."
+#.
+#: ../src/merge-properties-dialog.c:443
 #, fuzzy
-msgid "No paper files found!"
-msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
+msgid "Fixed"
+msgstr "æ¬?ä½?"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr ""
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "é?¸æ??"
 
-#: data/ui/glabels-ui.xml.h:3
-msgid "Align _Horizontal"
-msgstr ""
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "æ¨?ç°½æ?¹å??"
 
-#: data/ui/glabels-ui.xml.h:4
-msgid "Align _Vertical"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr ""
+#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
+#: ../src/ui-property-bar.c:280
+#, fuzzy
+msgid "Default"
+msgstr "å?ªé?¤"
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr ""
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+#, fuzzy
+msgid "Object properties"
+msgstr "æ??å?æ¨£è²?"
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr ""
+#: ../src/object-editor.c:309
+#, fuzzy
+msgid "Box object properties"
+msgstr "ä¿®æ?¹æ?¹å¡?ç?©ä»¶è¨å®?"
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr ""
+#: ../src/object-editor.c:328
+#, fuzzy
+msgid "Ellipse object properties"
+msgstr "ä¿®æ?¹æ©¢å??ç?©ä»¶è¨å®?"
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr ""
+#: ../src/object-editor.c:347
+#, fuzzy
+msgid "Line object properties"
+msgstr "ä¿®æ?¹æ?¹å¡?ç?©ä»¶è¨å®?"
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr ""
+#: ../src/object-editor.c:364
+#, fuzzy
+msgid "Image object properties"
+msgstr "ä¿®æ?¹å??å??ç?©ä»¶è¨å®?"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr ""
+#: ../src/object-editor.c:381
+#, fuzzy
+msgid "Text object properties"
+msgstr "ä¿®æ?¹æ?¹å¡?ç?©ä»¶è¨å®?"
 
-#: data/ui/glabels-ui.xml.h:14
+#: ../src/object-editor.c:403
 #, fuzzy
-msgid "Center align"
-msgstr "ä¸?è?¬"
+msgid "Barcode object properties"
+msgstr "ä¿®æ?¹æ?¸ç¢¼æ¢?ç?©ä»¶è¨å®?"
 
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
-msgstr ""
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "æ??å?¥å??ä½µå??"
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr ""
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+#, fuzzy
+msgid "No Fill"
+msgstr "å¡«æ»¿"
 
-#: data/ui/glabels-ui.xml.h:17
-msgid "Change the visibility of markup lines in the current window"
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:18
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr ""
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "å??å??"
 
-#: data/ui/glabels-ui.xml.h:19
-msgid "Change the visibility of the grid in the current window"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:20
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr ""
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
+#, fuzzy
+msgid "No Line"
+msgstr "æ²?æ??"
 
-#: data/ui/glabels-ui.xml.h:21
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr ""
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+#, fuzzy
+msgid "gLabels Preferences"
+msgstr "Glabels: è¨å®?å?¼"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr ""
+#. ===================================================================
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+#: ../templates/misc-iso-templates.xml.h:34
+msgid "Labels"
+msgstr "æ¨?ç°½"
 
-#: data/ui/glabels-ui.xml.h:23
+#: ../src/stock.c:70
 #, fuzzy
-msgid "Close the current file"
-msgstr "å?²å?ç?¾å?¨æª?æ¡?"
+msgid "_Select Mode"
+msgstr "é?¸æ??"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr ""
+#: ../src/stock.c:71
+#, fuzzy
+msgid "_Text"
+msgstr "æ??å?"
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
-msgstr ""
+#: ../src/stock.c:72
+#, fuzzy
+msgid "_Line"
+msgstr "ç·?"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr ""
+#: ../src/stock.c:73
+#, fuzzy
+msgid "_Box"
+msgstr "ç??å?"
 
-#: data/ui/glabels-ui.xml.h:27
+#: ../src/stock.c:74
 #, fuzzy
-msgid "Copy the selection"
-msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
+msgid "_Ellipse"
+msgstr "æ©¢å??å½¢"
 
-#: data/ui/glabels-ui.xml.h:28
+#: ../src/stock.c:75
 #, fuzzy
-msgid "Create a custom template"
-msgstr "ç?«ç·?ç?©ä»¶"
+msgid "_Image"
+msgstr "å??å??"
 
-#: data/ui/glabels-ui.xml.h:29
+#: ../src/stock.c:76
 #, fuzzy
-msgid "Create a new document"
-msgstr "ç?«ç·?ç?©ä»¶"
+msgid "Bar_code"
+msgstr "æ?¸ç¢¼æ¢?"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "å»ºç«?æ?¸ç¢¼æ¢?"
+#: ../src/stock.c:77
+#, fuzzy
+msgid "_Merge Properties"
+msgstr "å??ä½µè¨å®?"
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "å»ºç«?æ?°ç??ç??å?/æ?¹å½¢ç?©ä»¶"
+#: ../src/stock.c:78
+#, fuzzy
+msgid "Object _Properties"
+msgstr "æ??å?æ¨£è²?"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "å»ºç«?æ©¢å??å½¢/å??å½¢ç?©ä»¶"
+#: ../src/stock.c:79
+#, fuzzy
+msgid "Bring to _Front"
+msgstr "å¸¶å?ºå?°å??é?¢"
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "å»ºç«?å½±å??ç?©ä»¶"
+#: ../src/stock.c:80
+#, fuzzy
+msgid "Send to _Back"
+msgstr "æ?¾å?¨æ??åº?"
 
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
-msgstr "ç?«ç·?ç?©ä»¶"
+#: ../src/stock.c:81
+#, fuzzy
+msgid "Rotate _Left"
+msgstr "æ??è½?"
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "å»ºç«?æ?°ç??æ??å?ç?©ä»¶"
+#: ../src/stock.c:82
+#, fuzzy
+msgid "Rotate _Right"
+msgstr "æ??è½?"
 
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:37
-#, fuzzy
-msgid "Customize"
-msgstr "è?ªè¨?æ¬?ä½?é?°"
-
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
+#: ../src/stock.c:85
+msgid "_Lefts"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
+#: ../src/stock.c:86
+msgid "_Rights"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
+#: ../src/stock.c:87
+msgid "_Centers"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:42
-msgid "Cut"
+#: ../src/stock.c:88
+#, fuzzy
+msgid "_Tops"
+msgstr "å·¥å?· (&_T)"
+
+#: ../src/stock.c:89
+msgid "Bottoms"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:43
-msgid "Cut the selection"
+#: ../src/stock.c:90
+msgid "Centers"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:44
-msgid "Decrease magnification"
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:45
-msgid "Delete"
-msgstr "å?ªé?¤"
+#: ../src/stock.c:95 ../src/stock.c:97
+#, fuzzy
+msgid "Linked"
+msgstr "ç·?"
 
-#: data/ui/glabels-ui.xml.h:46
+#: ../src/stock.c:96 ../src/stock.c:98
 #, fuzzy
-msgid "Delete the selected objects"
-msgstr "å»ºç«?æ?°ç??æ??å?ç?©ä»¶"
+msgid "Not Linked"
+msgstr "æ²?æ??"
 
-#: data/ui/glabels-ui.xml.h:47
-msgid "Drawing toolbar"
+#: ../src/template-designer.c:404
+msgid "New gLabels Template"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
+#: ../src/template-designer.c:461
+msgid "Welcome"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:49
-msgid "Dump the UI Xml description"
-msgstr ""
+#: ../src/template-designer.c:500
+#, fuzzy
+msgid "Name and Description"
+msgstr "æ??è¿°:"
 
-#: data/ui/glabels-ui.xml.h:50
-msgid "Edit merge properties"
-msgstr "ä¿®æ?¹å??ä½µè¨å®?"
+#: ../src/template-designer.c:548
+#, fuzzy
+msgid "Page Size"
+msgstr "ç´?å¼µå¤§å°?:"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
+#: ../src/template-designer.c:614
+#, fuzzy
+msgid "Label or Card Shape"
+msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
+
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
+
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "æ¨?ç°½å¤§å°?:"
+
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:56
+#: ../src/template-designer.c:1000
 #, fuzzy
-msgid "Font name"
-msgstr "ä¸?è¦?å?²å?"
+msgid "Layout(s)"
+msgstr "ç??é?¢:"
+
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:57
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
+msgstr ""
+
+#: ../src/template-designer.c:1423
+msgid "Brand and part# match an existing template!"
+msgstr ""
+
+#. Menu entries.
+#: ../src/ui.c:93
 #, fuzzy
-msgid "Font selector"
-msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
+msgid "_File"
+msgstr "å¡«æ»¿"
 
-#: data/ui/glabels-ui.xml.h:58
+#: ../src/ui.c:94
 #, fuzzy
-msgid "Font size"
-msgstr "ä¸?è¦?å?²å?"
+msgid "Open Recent _Files"
+msgstr "é??å??æª?æ¡?"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
+#: ../src/ui.c:95
+msgid "_Edit"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:60
-msgid "Increase magnification"
+#: ../src/ui.c:96
+#, fuzzy
+msgid "_View"
+msgstr "æ?°å¢? (&_N)"
+
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
+#: ../src/ui.c:99
+msgid "Customize Properties Toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
+#: ../src/ui.c:100
+msgid "_Objects"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:66
-msgid "Lower object to bottom"
+#: ../src/ui.c:101
+#, fuzzy
+msgid "_Create"
+msgstr "å»ºç«?æ?°ç??æ??å?ç?©ä»¶"
+
+#: ../src/ui.c:102
+msgid "_Order"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
+#: ../src/ui.c:103
+#, fuzzy
+msgid "_Rotate/Flip"
+msgstr "æ??è½?"
+
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:68
-msgid "Main toolbar"
+#: ../src/ui.c:105
+msgid "Align _Vertical"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:69
-msgid "Markup"
+#: ../src/ui.c:106
+msgid "_Help"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:70
-#, fuzzy
-msgid "Modify document properties"
-msgstr "ä¿®æ?¹æ??ä»¶å??ä½µè¨å®?"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+msgid "Context Menu"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:71
-#, fuzzy
-msgid "New"
+#: ../src/ui.c:115
+msgid "_New"
 msgstr "æ?°å¢? (&_N)"
 
-#: data/ui/glabels-ui.xml.h:72
+#: ../src/ui.c:117
 #, fuzzy
-msgid "Object property editor"
-msgstr "æ??å?æ¨£è²?"
-
-#: data/ui/glabels-ui.xml.h:73
-msgid "Only show icons in the drawing toolbar"
-msgstr ""
+msgid "Create a new file"
+msgstr "ç?«ç·?ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:74
-msgid "Only show icons in the main toolbar"
-msgstr ""
+#: ../src/ui.c:122
+#, fuzzy
+msgid "_Open..."
+msgstr "é??å??"
 
-#: data/ui/glabels-ui.xml.h:76
+#: ../src/ui.c:124
 msgid "Open a file"
 msgstr "é??å??æª?æ¡?"
 
-#: data/ui/glabels-ui.xml.h:77
+#: ../src/ui.c:129
 #, fuzzy
-msgid "Open the glabels manual"
-msgstr "é??å??æ¨?ç°½"
+msgid "_Save"
+msgstr "å?¦å?ç?º..."
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste"
-msgstr ""
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "å?²å?ç?¾å?¨æª?æ¡?"
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Paste the clipboard"
-msgstr ""
+#: ../src/ui.c:136
+#, fuzzy
+msgid "Save _As..."
+msgstr "å?¦å?ç?º..."
 
-#: data/ui/glabels-ui.xml.h:80
+#: ../src/ui.c:138
 #, fuzzy
-msgid "Pr_eferences..."
-msgstr "Glabels: è¨å®?å?¼"
+msgid "Save the current file to a different name"
+msgstr "å?²å?ç?¾å?¨æª?æ¡?"
 
-#: data/ui/glabels-ui.xml.h:81
+#: ../src/ui.c:143
 #, fuzzy
-msgid "Preferences"
-msgstr "Glabels: è¨å®?å?¼"
+msgid "_Print..."
+msgstr "å??å?°"
 
-#: data/ui/glabels-ui.xml.h:83
+#: ../src/ui.c:145
 #, fuzzy
 msgid "Print the current file"
 msgstr "å??å?°ç?¾æ??æª?æ¡?"
 
-#: data/ui/glabels-ui.xml.h:84
+#: ../src/ui.c:150
 #, fuzzy
-msgid "Proper_ties..."
+msgid "Properties..."
 msgstr "æ??å?æ¨£è²?"
 
-#: data/ui/glabels-ui.xml.h:85
+#: ../src/ui.c:152
 #, fuzzy
-msgid "Properties"
-msgstr "æ??å?æ¨£è²?"
+msgid "Modify document properties"
+msgstr "ä¿®æ?¹æ??ä»¶å??ä½µè¨å®?"
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Property toolbar"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit"
+#: ../src/ui.c:159
+#, fuzzy
+msgid "Create a custom template"
+msgstr "ç?«ç·?ç?©ä»¶"
+
+#: ../src/ui.c:164
+msgid "_Close"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:88
-msgid "Quit the program"
+#: ../src/ui.c:166
+#, fuzzy
+msgid "Close the current file"
+msgstr "å?²å?ç?¾å?¨æª?æ¡?"
+
+#: ../src/ui.c:171
+msgid "_Quit"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:89
-msgid "Raise object to top"
+#: ../src/ui.c:173
+msgid "Quit the program"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:90
-msgid "Recent _Files"
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:91
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
 msgid "Redo"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:92
-msgid "Redo the undone action"
+#: ../src/ui.c:194
+msgid "Cut"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:93
-msgid "Remove all selections"
-msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
-
-#: data/ui/glabels-ui.xml.h:95
-#, no-c-format
-msgid "Restore scale to 100%"
+#: ../src/ui.c:196
+msgid "Cut the selection"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:96
-msgid "Right align"
+#: ../src/ui.c:201
+msgid "Copy"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:99
-msgid "Rotate object 90 clockwise"
-msgstr ""
+#: ../src/ui.c:203
+#, fuzzy
+msgid "Copy the selection"
+msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Rotate object 90 counter-clockwise"
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:101
+#: ../src/ui.c:217
 #, fuzzy
-msgid "Save"
-msgstr "å?¦å?ç?º..."
+msgid "Delete the selected objects"
+msgstr "å»ºç«?æ?°ç??æ??å?ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save As"
-msgstr "å?¦å?ç?º..."
+#: ../src/ui.c:222
+#, fuzzy
+msgid "Select All"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/ui/glabels-ui.xml.h:103
+#: ../src/ui.c:224
 #, fuzzy
-msgid "Save _As..."
-msgstr "å?¦å?ç?º..."
+msgid "Select all objects"
+msgstr "é?¸æ??, ç§»å??å??ä¿®æ?¹ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:104
+#: ../src/ui.c:229
 #, fuzzy
-msgid "Save the current file"
-msgstr "å?²å?ç?¾å?¨æª?æ¡?"
+msgid "Un-select All"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
+
+#: ../src/ui.c:236
+#, fuzzy
+msgid "Preferences"
+msgstr "Glabels: è¨å®?å?¼"
 
-#: data/ui/glabels-ui.xml.h:105
-msgid "Save the current file with a different name"
+#: ../src/ui.c:238
+msgid "Configure the application"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:106
+#: ../src/ui.c:245
 #, fuzzy
-msgid "Select All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+msgid "Zoom in"
+msgstr "æ?¾å¤§"
+
+#: ../src/ui.c:247
+msgid "Increase magnification"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:107
+#: ../src/ui.c:252
 #, fuzzy
-msgid "Select _All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+msgid "Zoom out"
+msgstr "ç¸®å°?"
+
+#: ../src/ui.c:254
+msgid "Decrease magnification"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:108
+#: ../src/ui.c:259
 #, fuzzy
-msgid "Select all objects"
-msgstr "é?¸æ??, ç§»å??å??ä¿®æ?¹ç?©ä»¶"
+msgid "Zoom 1 to 1"
+msgstr "1:1 é¡¯ç¤º"
+
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
+msgstr ""
+
+#: ../src/ui.c:266
+#, fuzzy
+msgid "Zoom to fit"
+msgstr "1:1 é¡¯ç¤º"
+
+#: ../src/ui.c:268
+msgid "Set scale to fit window"
+msgstr ""
+
+#: ../src/ui.c:275
+#, fuzzy
+msgid "Select Mode"
+msgstr "é?¸æ??"
 
-#: data/ui/glabels-ui.xml.h:109
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "é?¸æ??, ç§»å??å??ä¿®æ?¹ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Set drawing toolbar button style according to desktop default"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Text"
+msgstr "æ??å?"
+
+#: ../src/ui.c:289
+#, fuzzy
+msgid "Box"
+msgstr "ç??å?"
+
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "å»ºç«?æ?°ç??ç??å?/æ?¹å½¢ç?©ä»¶"
+
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Line"
+msgstr "ç·?"
+
+#: ../src/ui.c:303
+#, fuzzy
+msgid "Ellipse"
+msgstr "æ©¢å??å½¢"
+
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "å»ºç«?æ©¢å??å½¢/å??å½¢ç?©ä»¶"
+
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
+msgid "Image"
+msgstr "å??å??"
+
+#: ../src/ui.c:317
+#, fuzzy
+msgid "Barcode"
+msgstr "æ?¸ç¢¼æ¢?"
+
+#: ../src/ui.c:326
+msgid "Raise object to top"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:112
-msgid "Set main toolbar button style according to desktop default"
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show _Tooltips"
+#: ../src/ui.c:340
+msgid "Rotate object 90 degrees counter-clockwise"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:114
-msgid "Show both icons and texts in the drawing toolbar"
+#: ../src/ui.c:347
+msgid "Rotate object 90 degrees clockwise"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show both icons and texts in the main toolbar"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Show tooltips in the drawing toolbar"
+#: ../src/ui.c:361
+msgid "Flip object vertically"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Show tooltips in the main toolbar"
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Show tooltips in the property toolbar"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "Template Designer"
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Template _Designer..."
+#: ../src/ui.c:389
+#, fuzzy
+msgid "Align objects to top edges"
+msgstr "ä¿®æ?¹æ?¹å¡?ç?©ä»¶è¨å®?"
+
+#: ../src/ui.c:396
+msgid "Align objects to bottom edges"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Text color"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:122
-#, fuzzy
-msgid "U_n-select All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr ""
+
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr ""
+
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "ä¿®æ?¹å??ä½µè¨å®?"
+
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:123
+#: ../src/ui.c:433
 #, fuzzy
-msgid "Un-select All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+msgid "Open glabels manual"
+msgstr "é??å??æ¨?ç°½"
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Undo"
+#: ../src/ui.c:438
+msgid "About..."
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Undo the last action"
+#: ../src/ui.c:440
+msgid "About glabels"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:126
-#, fuzzy
-msgid "Zoom _1:1"
-msgstr "1:1 é¡¯ç¤º"
+#: ../src/ui.c:450
+msgid "Property toolbar"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:127
-#, fuzzy
-msgid "Zoom _In"
-msgstr "æ?¾å¤§"
+#: ../src/ui.c:452
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:128
-#, fuzzy
-msgid "Zoom _Out"
-msgstr "ç¸®å°?"
+#: ../src/ui.c:458
+msgid "Grid"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:129
-#, fuzzy
-msgid "Zoom to _fit"
-msgstr "1:1 é¡¯ç¤º"
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:130
-msgid "Zoom to fit window"
+#: ../src/ui.c:466
+msgid "Markup"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:131
-msgid "_About..."
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Bottoms"
+#: ../src/ui.c:479
+msgid "Main toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:135
-msgid "_Close"
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Contents"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:137
-msgid "_Copy"
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:138
-#, fuzzy
-msgid "_Create Object"
-msgstr "å»ºç«?æ?°ç??æ??å?ç?©ä»¶"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Debug"
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:141
-msgid "_Desktop Default"
+#: ../src/ui-commands.c:1142
+msgid "or visit http://glabels.org/";
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_Drawing Toolbar"
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Edit"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:145
+#: ../src/ui-commands.c:1161
 #, fuzzy
-msgid "_File"
-msgstr "å¡«æ»¿"
+msgid ""
+"gLabels is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"gLabels is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+msgstr ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 
-#: data/ui/glabels-ui.xml.h:146
-msgid "_Grid"
+#: ../src/ui-commands.c:1190
+#, fuzzy
+msgid "glabels"
+msgstr "æ¨?ç°½"
+
+#: ../src/warning-handler.c:69
+#, fuzzy
+msgid "gLabels Error!"
+msgstr "Glabels: è¨å®?å?¼"
+
+#: ../src/window.c:284
+msgid "(none) - gLabels"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:147
-msgid "_Help"
+#: ../src/window.c:485
+msgid "(modified)"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:148
-msgid "_Icon"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "é?¯èª¤ç??å?ºç¢¼ = \"%s\""
+
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "é?¯èª¤ç??ç¯?é»? = \"%s\""
+
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
+msgid "xmlParseFile error"
+msgstr "xmlParseFile é?¯èª¤"
+
+#: ../src/xml-label.c:274
+msgid "No document root"
+msgstr "æ²?æ??æ??ä»¶å§?ç«¯"
+
+#: ../src/xml-label.c:282
+msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Main Toolbar"
+#: ../src/xml-label.c:291
+msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:153
-#, fuzzy
-msgid "_Merge Properties..."
-msgstr "å??ä½µè¨å®?"
+#: ../src/xml-label.c:301
+#, fuzzy, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "ä¸?æ£ç¢ºç??æ??ä»¶ç¨®é¡?, æ?¾ä¸?å?° glabels æ ¼å¼?"
 
-#: data/ui/glabels-ui.xml.h:154
-msgid "_New"
-msgstr "æ?°å¢? (&_N)"
+#: ../src/xml-label.c:370
+#, fuzzy, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "é?¯èª¤ç??å?ºç¢¼ = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Objects"
+#: ../src/xml-label.c:868
+#, fuzzy, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "é?¯èª¤ç??ç¯?é»? = \"%s\""
+
+#: ../src/xml-label.c:944
+#, c-format
+msgid "Unknown embedded file format: \"%s\""
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:156
-#, fuzzy
-msgid "_Open..."
-msgstr "é??å??"
+#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr ""
+
+#: ../src/xml-label.c:1157
+msgid "Problem saving xml file."
+msgstr "å?²å? XML æª?æ¡?æ??ç?¼ç??é?¯èª¤."
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Paste"
+#. Create and append an "Other" entry.
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
+msgid "Other"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:159
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
 #, fuzzy
-msgid "_Print..."
-msgstr "å??å?°"
+msgid "User defined"
+msgstr "æ??å?¥å??ä½µå??"
 
-#: data/ui/glabels-ui.xml.h:160
-msgid "_Property Toolbar"
+#: ../libglabels/db.c:665
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Quit"
+#: ../libglabels/db.c:1057
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:164
-#, fuzzy
-msgid "_Save"
-msgstr "å?¦å?ç?º..."
+#: ../libglabels/db.c:2097
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
+
+#: ../libglabels/db.c:2164
+#, c-format
+msgid "%s full page label"
+msgstr ""
+
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#.
+#. * Translators: 1st %d = number of labels across a page,
+#. *              2nd %d = number of labels down a page,
+#. *              3rd %d = total number of labels on a page (sheet).
+#.
+#: ../libglabels/template.c:727
+#, fuzzy, c-format
+msgid "%d Ã? %d (%d per sheet)"
+msgstr "%d x %d (æ¯?é ? %d)"
+
+#. Translators: %d is the total number of labels on a page (sheet).
+#: ../libglabels/template.c:732
+#, fuzzy, c-format
+msgid "%d per sheet"
+msgstr "%d x %d (æ¯?é ? %d)"
 
-#: data/ui/glabels-ui.xml.h:168
+#: ../libglabels/template.c:802 ../libglabels/template.c:808
+#: ../libglabels/template.c:818 ../libglabels/template.c:824
 #, fuzzy
-msgid "_View"
-msgstr "æ?°å¢? (&_N)"
+msgid "diameter"
+msgstr "æ¯«ç±³"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
+#. The ids are identical to the absolute length units supported in
+#. the CSS2 Specification (Section 4.3.2)
+#. This table must be sorted exactly as the enumerations in lglUnits
+#. [LGL_UNITS_POINT]
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "é»?"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "è?±å¯¸"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
+
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:2 data/glade/object-editor.glade.h:1
-#: data/glade/template-designer.glade.h:5
-msgid "*"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Default page size</span>"
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Fill</span>"
+#. This should always be an id, but just in case a name
+#. slips by!
+#: ../libglabels/xml-template.c:244
+#, c-format
+msgid "Unknown page size id \"%s\", trying as name"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</span>"
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Text</span>"
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:7
-msgid "<span weight=\"bold\">Units</span>"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:8 data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "å°?ç½®:"
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:9 data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "é¡?è?²:"
+#.
+#. * Local Variables:       -- emacs
+#. * mode: C                -- emacs
+#. * c-basic-offset: 8      -- emacs
+#. * tab-width: 8           -- emacs
+#. * indent-tabs-mode: nil  -- emacs
+#. * End:                   -- emacs
+#.
+#: ../data/ui/merge-properties-dialog.ui.h:1
+msgid "Format:"
+msgstr "æ ¼å¼?:"
 
-#: data/glade/prefs-dialog.glade.h:10
-msgid "Font:"
-msgstr "å?å??:"
+#: ../data/ui/merge-properties-dialog.ui.h:2
+msgid "Location:"
+msgstr "ä½?ç½®:"
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "ISO A4"
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Record selection/preview"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:12
-msgid "Inches"
-msgstr "è?±å¯¸"
+#: ../data/ui/merge-properties-dialog.ui.h:4
+#, fuzzy
+msgid "Select all"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/glade/prefs-dialog.glade.h:13 data/glade/object-editor.glade.h:19
-msgid "Line Spacing:"
+#: ../data/ui/merge-properties-dialog.ui.h:5
+msgid "Source"
+msgstr "ä¾?æº?æª?"
+
+#: ../data/ui/merge-properties-dialog.ui.h:6
+#, fuzzy
+msgid "Unselect all"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr ""
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:14
+#: ../data/ui/media-select.ui.h:3
 #, fuzzy
-msgid "Locale"
-msgstr "æ¯?ä¾?:"
+msgid "Custom"
+msgstr "è?ªè¨?æ¬?ä½?é?°"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "æ¯«ç±³"
+#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
+#: ../data/ui/template-designer.ui.h:42
+msgid "Page size:"
+msgstr "ç´?å¼µå¤§å°?:"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "é»?"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/glade/prefs-dialog.glade.h:18
-msgid "Select default properties for new objects."
+#: ../data/ui/new-label-dialog.ui.h:1
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "æ??è¿°:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "æ¨?ç°½å¤§å°?:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "ç??é?¢:"
+
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "æ ¼å¼?:"
+
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:20 data/templates/paper-sizes.xml.h:25
-msgid "US Letter"
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:21 data/glade/object-editor.glade.h:29
-#: data/glade/template-designer.glade.h:72
-msgid "Width:"
-msgstr "é??åº¦:"
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "æ??è½?"
 
-#: data/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
 msgstr ""
 
-#: data/glade/object-editor.glade.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
+msgid "Alignment:"
+msgstr "å°?ç½®:"
+
+#: ../data/ui/object-editor.ui.h:4
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Angle:"
 msgstr "è§?åº¦:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Checksum"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
+msgid "Color:"
+msgstr "é¡?è?²:"
+
+#: ../data/ui/object-editor.ui.h:9
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:10
 #, fuzzy
 msgid "Family:"
 msgstr "å¡«æ»¿"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
+#, fuzzy
+msgid "File:"
+msgstr "å¡«æ»¿"
+
+#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "å¡«æ»¿"
 
-#: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "é«?åº¦:"
 
-#: data/glade/object-editor.glade.h:14
-msgid "Image"
-msgstr "å??å??"
-
-#: data/glade/object-editor.glade.h:15
-msgid "Insert merge field"
-msgstr "æ??å?¥å??ä½µå??"
+#: ../data/ui/object-editor.ui.h:15
+msgid "Key:"
+msgstr "è³?æ??å?¼:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Length:"
 msgstr "é?·åº¦:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "ç·?"
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
+msgid "Line Spacing:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:19
 msgid "Literal:"
 msgstr "æ??å?:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
+#: ../data/ui/object-editor.ui.h:20
+msgid "Opacity:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Reset image size"
 msgstr "é??è¨å??å??å¤§å°?"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:23
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:24
 msgid "Size"
 msgstr "å¤§å°?"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:25
 #, fuzzy
 msgid "Size:"
 msgstr "å¤§å°?"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:26
 #, fuzzy
 msgid "Style"
 msgstr "æ¨£å¼?"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:27
 #, fuzzy
 msgid "Style:"
 msgstr "æ¨£å¼?"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "é??åº¦:"
+
+#: ../data/ui/object-editor.ui.h:30
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:31
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:32
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:34
 msgid "degrees"
 msgstr "åº¦æ?¸"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:35
 msgid "dialog1"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:36
 msgid "digits:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:37
 #, fuzzy
 msgid "format:"
 msgstr "æ ¼å¼?:"
 
-#: data/glade/template-designer.glade.h:1
-msgid "  "
+#: ../data/ui/prefs-dialog.ui.h:1
+msgid "   "
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "Default page size"
+msgstr "é ?è¨ç´?å¼µå¤§å°?"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "Font:"
+msgstr "å?å??:"
+
+#: ../data/ui/prefs-dialog.ui.h:7
+msgid "ISO A4"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:2
+#: ../data/ui/prefs-dialog.ui.h:8
+msgid "Inches"
+msgstr "è?±å¯¸"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+#, fuzzy
+msgid "Locale"
+msgstr "æ¯?ä¾?:"
+
+#: ../data/ui/prefs-dialog.ui.h:12
+msgid "Millimeters"
+msgstr "æ¯«ç±³"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Object defaults"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Points"
+msgstr "é»?"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Select default properties for new objects."
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Select locale specific behavior."
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:19
+msgid "Units"
+msgstr ""
+
+#: ../data/ui/property-bar.ui.h:1
+msgid "Bold"
+msgstr ""
+
+#: ../data/ui/property-bar.ui.h:2
+#, fuzzy
+msgid "Center align"
+msgstr "ä¸?è?¬"
+
+#: ../data/ui/property-bar.ui.h:7
+msgid "Left align"
+msgstr ""
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Right align"
+msgstr ""
+
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:6
 #, fuzzy
 msgid "1. Width:"
 msgstr "é??åº¦:"
 
-#: data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:7
 #, fuzzy
 msgid "2. Height:"
 msgstr "é«?åº¦:"
 
-#: data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:19
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:21
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:22
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -2024,23 +2434,19 @@ msgid ""
 "or \"Back\" to continue editing this design."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:30
-msgid "Design Completed"
-msgstr ""
-
-#: data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:32
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:34
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:35
+#: ../data/ui/template-designer.ui.h:32
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -2049,500 +2455,1016 @@ msgid ""
 "The second example illustrates when two layouts are needed."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:40
-msgid "Label Size (CD/DVD)"
-msgstr ""
-
-#: data/glade/template-designer.glade.h:41
-#, fuzzy
-msgid "Label Size (Round)"
-msgstr "æ¨?ç°½å¤§å°?:"
-
-#: data/glade/template-designer.glade.h:42
-#, fuzzy
-msgid "Label or Card Shape"
-msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
-
-#: data/glade/template-designer.glade.h:43
-msgid "Label or Card Size (Rectangular)"
-msgstr ""
-
-#: data/glade/template-designer.glade.h:44
+#: ../data/ui/template-designer.ui.h:37
 #, fuzzy
 msgid "Layout #1"
 msgstr "ç??é?¢:"
 
-#: data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:38
 #, fuzzy
 msgid "Layout #2"
 msgstr "ç??é?¢:"
 
-#: data/glade/template-designer.glade.h:46
-#, fuzzy
-msgid "Layout(s)"
-msgstr "ç??é?¢:"
-
-#: data/glade/template-designer.glade.h:47
-#, fuzzy
-msgid "Name and Description"
-msgstr "æ??è¿°:"
-
-#: data/glade/template-designer.glade.h:48
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:49
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:50
-msgid "Number of Layouts"
-msgstr ""
-
-#: data/glade/template-designer.glade.h:51
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:52
-#, fuzzy
-msgid "Page Size"
-msgstr "ç´?å¼µå¤§å°?:"
-
-#: data/glade/template-designer.glade.h:54
-msgid "Part #:"
-msgstr ""
-
-#: data/glade/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:44
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:56
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:46
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:47
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:59
+#: ../data/ui/template-designer.ui.h:48
 msgid "Please select the basic shape of the labels or cards."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:60
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please select the page size of the template stationery."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:61
+#: ../data/ui/template-designer.ui.h:50
 #, fuzzy
 msgid "Print test sheet"
 msgstr "å?¨é¦?å¼µç´?"
 
-#: data/glade/template-designer.glade.h:62
+#: ../data/ui/template-designer.ui.h:51
 msgid "Rectangular or square (can have rounded corners)"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:63
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:64
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:66
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
 msgstr ""
 
-#: data/glade/template-designer.glade.h:68
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr ""
 
-#: data/glade/template-designer.glade.h:69
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
 "This dialog will assist you in the creation of a custom gLabels template."
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "Collate"
+msgstr "æ ¡å°?"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "Copies"
+msgstr "ä»½æ?¸"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "Copies:"
+msgstr "ä»½æ?¸:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+#, fuzzy
+msgid "Merge Control"
+msgstr "æ??ä»¶å??ä½µæ?§å?¶"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
+msgid "Options"
+msgstr "è¨å®?"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "ç´?å¼µ:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "ç?±ç¦?ç°½é??ç´?"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
+msgid "from:"
+msgstr "ç?±:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "å?¨é¦?å¼µç´?"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "å?°:"
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:1
+msgid "Create labels, business cards and media covers"
+msgstr ""
+
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+msgid "gLabels Label Designer 3"
+msgstr ""
+
+#: ../data/mime/glabels-3.0.xml.in.h:1
+#, fuzzy
+msgid "gLabels Project File"
+msgstr "æ??å?æ¨£è²?"
+
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr ""
+
+#. Other ISO A series sizes
+#: ../templates/paper-sizes.xml.h:4
 msgid "A0"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:2
+#: ../templates/paper-sizes.xml.h:5
 msgid "A1"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:3
+#: ../templates/paper-sizes.xml.h:6
 msgid "A10"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:4
+#: ../templates/paper-sizes.xml.h:7
 msgid "A2"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:5
+#: ../templates/paper-sizes.xml.h:8
 msgid "A3"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:6
+#. Most popular (at top of list)
+#: ../templates/paper-sizes.xml.h:10
 msgid "A4"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:7
+#: ../templates/paper-sizes.xml.h:11
 msgid "A5"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:8
+#: ../templates/paper-sizes.xml.h:12
 msgid "A6"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:9
+#: ../templates/paper-sizes.xml.h:13
 msgid "A7"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:10
+#: ../templates/paper-sizes.xml.h:14
 msgid "A8"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:11
+#: ../templates/paper-sizes.xml.h:15
 msgid "A9"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:12
+#. ISO B series sizes
+#: ../templates/paper-sizes.xml.h:17
 msgid "B0"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:13
+#: ../templates/paper-sizes.xml.h:18
 msgid "B1"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:14
+#: ../templates/paper-sizes.xml.h:19
 msgid "B10"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:15
+#: ../templates/paper-sizes.xml.h:20
 msgid "B2"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:16
+#: ../templates/paper-sizes.xml.h:21
 msgid "B3"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:17
+#: ../templates/paper-sizes.xml.h:22
 msgid "B4"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:18
+#: ../templates/paper-sizes.xml.h:23
 msgid "B5"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:19
+#: ../templates/paper-sizes.xml.h:24
 msgid "B6"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:20
+#: ../templates/paper-sizes.xml.h:25
 msgid "B7"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:21
+#: ../templates/paper-sizes.xml.h:26
 msgid "B8"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:22
+#: ../templates/paper-sizes.xml.h:27
 msgid "B9"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:23
+#: ../templates/paper-sizes.xml.h:28
+msgid "C5"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:29
+msgid "C6"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:30
+msgid "DL"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:31
+msgid "Monarch Envelope"
+msgstr ""
+
+#: ../templates/paper-sizes.xml.h:32
 msgid "US Executive"
 msgstr ""
 
-#: data/templates/paper-sizes.xml.h:24
+#. Other US paper sizes
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:1
-#: data/templates/zweckform-iso-templates.xml.h:1
+#: ../templates/categories.xml.h:1
+msgid "Any card"
+msgstr ""
+
+#: ../templates/categories.xml.h:2
+#, fuzzy
+msgid "Any label"
+msgstr "é??å??æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
+msgid "Business cards"
+msgstr ""
+
+#: ../templates/categories.xml.h:4
+msgid "CD/DVD or other media"
+msgstr ""
+
+#: ../templates/categories.xml.h:5
+msgid "Mailing/shipping products"
+msgstr ""
+
+#: ../templates/categories.xml.h:6
+#, fuzzy
+msgid "Rectangular labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
+#, fuzzy
+msgid "Round labels"
+msgstr "ç?±ç¦?ç°½é??ç´?"
+
+#: ../templates/categories.xml.h:8
+#, fuzzy
+msgid "Square labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/maco-us-templates.xml.h:2
+#: ../templates/misc-iso-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 ""
 
-#: data/templates/avery-us-templates.xml.h:2
-#: data/templates/avery-iso-templates.xml.h:2
-#: data/templates/zweckform-iso-templates.xml.h:3
-#: data/templates/misc-us-templates.xml.h:2
-#: data/templates/misc-iso-templates.xml.h:9
+#. ===================================================================
+#. ============================================================
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/misc-us-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:3
+#. ===================================================================
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:6
+#: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:16
+#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:8
+#, fuzzy
+msgid "CD/DVD Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:4
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:10
+#, fuzzy
+msgid "CD/DVD Labels (Spine Labels)"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:12
+#: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:5
+#. the LSK labels can be torn in half down the center
+#: ../templates/avery-us-templates.xml.h:14
+#, fuzzy
+msgid "Divider Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:16
+#: ../templates/avery-other-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:4
+#, fuzzy
+msgid "File Folder Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 #, fuzzy
 msgid "Filing Labels"
 msgstr "æ¨?ç°½"
 
-#: data/templates/avery-us-templates.xml.h:6
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:20
+#: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:7
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:22
+#, fuzzy
+msgid "ID Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:24
+msgid "Index Cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:26
 #, fuzzy
 msgid "Large Round Labels"
 msgstr "ç?±ç¦?ç°½é??ç´?"
 
-#: data/templates/avery-us-templates.xml.h:8
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:9
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:30
+msgid "Post cards"
+msgstr ""
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:32
+#: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:10
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:34
+#: ../templates/maco-us-templates.xml.h:3
+#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/worldlabel-us-templates.xml.h:9
+#, fuzzy
+msgid "Round Labels"
+msgstr "ç?±ç¦?ç°½é??ç´?"
+
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/avery-us-templates.xml.h:36
+#: ../templates/uline-us-templates.xml.h:2
+#: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:11
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:38
 #, fuzzy
 msgid "Small Round Labels"
 msgstr "ç?±ç¦?ç°½é??ç´?"
 
-#: data/templates/avery-us-templates.xml.h:12
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:40
 #, fuzzy
 msgid "Square Labels"
 msgstr "æ¨?ç°½"
 
-#: data/templates/avery-us-templates.xml.h:13
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:42
+msgid "Tent Cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:44
+#: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr ""
 
-#: data/templates/avery-us-templates.xml.h:14
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/worldlabel-us-templates.xml.h:12
 msgid "Video Tape Spine Labels"
 msgstr ""
 
-#: data/templates/avery-iso-templates.xml.h:1
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:4
 msgid "Address labels"
 msgstr ""
 
-#: data/templates/avery-iso-templates.xml.h:3
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:6
+#, fuzzy
+msgid "Allround labels"
+msgstr "ç?±ç¦?ç°½é??ç´?"
+
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:10
 msgid "CD Booklet"
 msgstr ""
 
-#: data/templates/avery-iso-templates.xml.h:4
+#. ===============================================================
+#: ../templates/avery-iso-templates.xml.h:12
 msgid "CD Inlet"
 msgstr ""
 
-#: data/templates/avery-iso-templates.xml.h:5
-#: data/templates/zweckform-iso-templates.xml.h:4
-#: data/templates/misc-us-templates.xml.h:4
-#: data/templates/misc-iso-templates.xml.h:10
-#, fuzzy
-msgid "CD/DVD Labels"
-msgstr "æ¨?ç°½"
-
-#: data/templates/avery-iso-templates.xml.h:6
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:18
 msgid "Diskette labels"
 msgstr ""
 
-#: data/templates/avery-iso-templates.xml.h:7
-#: data/templates/zweckform-iso-templates.xml.h:7
-#: data/templates/misc-iso-templates.xml.h:17
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Mailing Labels"
 msgstr ""
 
-#: data/templates/avery-iso-templates.xml.h:8
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:22
 #, fuzzy
 msgid "Mailing labels"
 msgstr "æ¨?ç°½"
 
-#: data/templates/avery-iso-templates.xml.h:9
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:24
 msgid "Mini Address Labels"
 msgstr ""
 
-#: data/templates/avery-iso-templates.xml.h:10
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:26
+#, fuzzy
+msgid "Mini Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:28
 #, fuzzy
 msgid "Shipping labels"
 msgstr "é??å??æ¨?ç°½"
 
-#: data/templates/zweckform-iso-templates.xml.h:2
-msgid "Allround Labels"
+#: ../templates/brother-other-templates.xml.h:1
+msgid "Multi Purpose Labels 17mm x 54mm"
 msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:5
-msgid "Correction and Cover-up Labels"
-msgstr ""
+#: ../templates/brother-other-templates.xml.h:2
+#, fuzzy
+msgid "Shipping Labels 62mm x 100mm"
+msgstr "é??å??æ¨?ç°½"
 
-#: data/templates/zweckform-iso-templates.xml.h:6
-msgid "Lever Arch File Labels"
+#.
+#. *********************************************************************
+#. *********************************************************************
+#. 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.
+#.
+#. One difference from typical templates is that the template size is
+#. not the actual media size - it is the size of the printable area,
+#. which is smaller than the media size.  This is because (at least with
+#. the Brother driver) coordinates are relative the corner of this area.
+#.
+#. *********************************************************************
+#. *********************************************************************
+#.
+#: ../templates/brother-other-templates.xml.h:20
+msgid "Standard Address Labels 29mm x 90mm"
 msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:8
-msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:2
+msgid "3.5in Diskette"
 msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:9
-msgid "Rectangular Copier Labels"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:6
+msgid "File Folder"
 msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:10
-#: data/templates/misc-iso-templates.xml.h:22
-msgid "Rectangular Labels"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:8
+msgid "Hanging Folder"
 msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:11
-msgid "Video Labels (back)"
-msgstr ""
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:10
+#, fuzzy
+msgid "Large Address Labels"
+msgstr "ç?±ç¦?ç°½é??ç´?"
+
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:14
+#, fuzzy
+msgid "Shipping Address Labels"
+msgstr "é??å??æ¨?ç°½"
 
-#: data/templates/misc-us-templates.xml.h:1
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:2
 msgid "Business Card CD"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:3
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
 msgid "CD Template Rectangles"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:5
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
 msgid "CD/DVD Labels (Face Only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:6
-#: data/templates/misc-iso-templates.xml.h:11
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "CD/DVD Labels (face only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:7
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:14
+#, fuzzy
+msgid "Cassette Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:16
 #, fuzzy
 msgid "DLT Labels"
 msgstr "æ¨?ç°½"
 
-#: data/templates/misc-us-templates.xml.h:8
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:18
+msgid "Jewel Case Booklet"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:9
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:10
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:11
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:12
-#: data/templates/misc-iso-templates.xml.h:21
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:42
 msgid "PRO CD Labels 2-up (face only)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:13
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr ""
 
-#: data/templates/misc-us-templates.xml.h:14
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:1
-msgid "Agipa 119488: Business Cards"
-msgstr ""
-
-#: data/templates/misc-iso-templates.xml.h:2
-msgid "Allround Labels --24"
-msgstr ""
-
-#: data/templates/misc-iso-templates.xml.h:3
-msgid "Allround Labels --44"
-msgstr ""
-
-#: data/templates/misc-iso-templates.xml.h:4
-msgid "Allround Labels --64"
-msgstr ""
-
-#: data/templates/misc-iso-templates.xml.h:5
-msgid "Allround Labels --65"
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
+msgid "Allround Labels"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:6
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:7
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:8
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:12
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:14
+#, fuzzy
+msgid "CD Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:13
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:14
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:15
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:16
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:18
-msgid "Mailing Labels --14"
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:30
+#, fuzzy
+msgid "General Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:32
+msgid "Inkjet/Laser Labels 70x37mm"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:19
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:20
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr ""
 
-#: data/templates/misc-iso-templates.xml.h:23
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:44
+#: ../templates/zweckform-iso-templates.xml.h:24
+msgid "Rectangular Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr ""
 
-#: data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers."
+#. ===================================================================
+#: ../templates/misc-other-templates.xml.h:2
+#, fuzzy
+msgid "Multi-Purpose Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+msgid "Address Labels (STAMPIT)"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "é??å??æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:10
+msgid "Business cards glossy, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:12
+msgid "Business cards high glossy"
 msgstr ""
 
-#: data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+msgid "Business cards punched"
 msgstr ""
 
-#: data/mime/glabels.keys.in.h:1 data/mime/glabels.xml.in.h:1
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+msgid "Business cards punched dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+msgid "Business cards punched glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
 #, fuzzy
-msgid "gLabels Project File"
-msgstr "æ??å?æ¨£è²?"
+msgid "Floppy disk labels"
+msgstr "é??å??æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+msgid "Foldable business cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:26
+msgid "Foldable business cards glossy/dull"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:34
+msgid "Membership cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:36
+msgid "Membership cards, both sides printable"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:38
+msgid "Name plates"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:40
+msgid "Passport photo labels glossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
+msgid "Photo labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:44
+msgid "Photo labels semiglossy"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:48
+#, fuzzy
+msgid "SD card labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Self-adhesive film transparent"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:52
+msgid "Self-adhesive film weatherproof"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:54
+msgid "Self-adhesive labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:56
+msgid "Self-adhesive window film"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:10
+msgid "Correction and Cover-up Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:12
+#, fuzzy
+msgid "File Back Labels"
+msgstr "æ¨?ç°½"
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:14
+msgid "Lever Arch File Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:18
+msgid "Multi-purpose Stick+Lift Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:20
+msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:22
+msgid "Rectangular Copier Labels"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/zweckform-iso-templates.xml.h:26
+msgid "Video Labels (back)"
+msgstr ""
+
+#~ msgid "print this message"
+#~ msgstr "å??å?°é??å??è¨?æ?¯"
+
+#~ msgid "print the version of glabels-batch being used"
+#~ msgstr "å??å?°å?º glabels-batch ç??ç??æ?¬è³?è¨?"
+
+#~ msgid "[OPTION...] GLABELS_FILE..."
+#~ msgstr "[é?¸é ?...] GLABELS_FILE..."
+
+#~ msgid "missing glabels file\n"
+#~ msgstr "æ²?æ??è¼¸å?¥ glabels ç??æª?æ¡?\n"
+
+#~ msgid "Media Type"
+#~ msgstr "åª?é«?ç¨®é¡?"
+
+#~ msgid "Open"
+#~ msgstr "é??å??"
+
+#, fuzzy
+#~ msgid "_Delete"
+#~ msgstr "å?ªé?¤"
+
+#, fuzzy
+#~ msgid "P_rinter"
+#~ msgstr "å??å?°"
+
+#~ msgid "Print preview"
+#~ msgstr "é ?è¦½å??å?°"
+
+#, fuzzy
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "ä»¥é??è??å??æ ¼ (CSV)"
+
+#, fuzzy
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "ä»¥å??è??å??æ ¼"
+
+#, fuzzy
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "ä»¥ [TAB] ç?ºå??æ ¼"
+
+#~ msgid "%s x %s %s"
+#~ msgstr "%s x %s %s"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#, fuzzy
+#~ msgid "magenta"
+#~ msgstr "å??å??"
+
+#, fuzzy
+#~ msgid "No paper files found!"
+#~ msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
+
+#, fuzzy
+#~ msgid "Customize"
+#~ msgstr "è?ªè¨?æ¬?ä½?é?°"
+
+#, fuzzy
+#~ msgid "Font selector"
+#~ msgstr "ç§»é?¤æ??æ??é?¸æ??é ?"
+
+#, fuzzy
+#~ msgid "New"
+#~ msgstr "æ?°å¢? (&_N)"
+
+#, fuzzy
+#~ msgid "Object property editor"
+#~ msgstr "æ??å?æ¨£è²?"
+
+#, fuzzy
+#~ msgid "Pr_eferences..."
+#~ msgstr "Glabels: è¨å®?å?¼"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "æ??å?æ¨£è²?"
+
+#, fuzzy
+#~ msgid "Save"
+#~ msgstr "å?¦å?ç?º..."
+
+#~ msgid "Save As"
+#~ msgstr "å?¦å?ç?º..."
+
+#, fuzzy
+#~ msgid "Select _All"
+#~ msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+
+#, fuzzy
+#~ msgid "U_n-select All"
+#~ msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+
+#, fuzzy
+#~ msgid "_Merge Properties..."
+#~ msgstr "å??ä½µè¨å®?"
 
 #, fuzzy
 #~ msgid "Object _Properties..."
@@ -2551,9 +3473,6 @@ msgstr "æ??å?æ¨£è²?"
 #~ msgid "Display units"
 #~ msgstr "é¡¯ç¤ºå?®ä½?"
 
-#~ msgid "Default page size"
-#~ msgstr "é ?è¨ç´?å¼µå¤§å°?"
-
 #~ msgid "Outline"
 #~ msgstr "å¤?é??"
 
@@ -2567,10 +3486,6 @@ msgstr "æ??å?æ¨£è²?"
 #~ msgstr "ä¿?ç??ç?¾æ??ç??å¤§å°?æ¯?ä¾?"
 
 #, fuzzy
-#~ msgid "CD Labels"
-#~ msgstr "æ¨?ç°½"
-
-#, fuzzy
 #~ msgid "Open %s"
 #~ msgstr "é??å??"
 
@@ -2610,24 +3525,12 @@ msgstr "æ??å?æ¨£è²?"
 #~ msgid "Image format not currently supported"
 #~ msgstr "å??å??æ ¼å¼?ä¸¦æ²?æ??æ?¯æ?´"
 
-#~ msgid "Barcode data"
-#~ msgstr "æ?¸ç¢¼æ¢?è³?æ??"
-
-#~ msgid "%"
-#~ msgstr "%"
-
 #~ msgid "Show text with barcode"
 #~ msgstr "é¡¯ç¤ºæ?¸ç¢¼æ¢?æ??å?"
 
-#~ msgid "Fields"
-#~ msgstr "æ¬?ä½?"
-
 #~ msgid "Column"
 #~ msgstr "å??"
 
-#~ msgid "Sample data"
-#~ msgstr "æ¨£æ?¬è³?æ??"
-
 #~ msgid "Make a new, empty label"
 #~ msgstr "è£½ä½?æ?°æª?, ç©ºç??æ¨£ç°½"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c35bc7b..4ebd3a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -123,13 +123,8 @@ glabels_3_SOURCES = 			\
 	bc.h				\
 	bc-gnubarcode.c			\
 	bc-gnubarcode.h			\
-<<<<<<< HEAD
 	bc-zint.c			\
 	bc-zint.h 			\
-=======
-	bc-zint.c		\
-	bc-zint.h 	\
->>>>>>> Forwardporting changes for zint barcode support
 	bc-postnet.c			\
 	bc-postnet.h			\
 	bc-iec16022.c			\
@@ -255,13 +250,8 @@ glabels_3_batch_SOURCES = 		\
 	bc.h				\
 	bc-gnubarcode.c			\
 	bc-gnubarcode.h			\
-<<<<<<< HEAD
 	bc-zint.c			\
 	bc-zint.h			\
-=======
-	bc-zint.c		\
-	bc-zint.h		\
->>>>>>> Forwardporting changes for zint barcode support
 	bc-postnet.c			\
 	bc-postnet.h			\
 	bc-iec16022.c			\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]