[glabels/docs] Updated po files to allow me to push this branch.



commit 7bfdd7a84a187ac821e0626b88a26796220520fa
Author: Jim Evins <evins snaught com>
Date:   Thu May 27 22:37:29 2010 -0400

    Updated po files to allow me to push this branch.

 po/ca.po    | 3132 +++++++++++++++++++++++++-------------------
 po/cs.po    | 3408 ++++++++++++++++++++++++++++--------------------
 po/da.po    |  982 +++++++++------
 po/de.po    |   27 +-
 po/eo.po    | 3937 ++++++++++++++++++++++++++++++++++---------------------
 po/es.po    |   31 +-
 po/fr.po    |    4 +-
 po/it.po    | 3790 +++++++++++++++++++++++++++++++++--------------------
 po/ja.po    | 3410 ++++++++++++++++++++++++++++--------------------
 po/ko.po    | 4223 ++++++++++++++++++++++++++++++++++++-----------------------
 po/nb.po    |  921 ++++++++------
 po/pl.po    | 1952 ++++++++++++++++------------
 po/pt.po    |  836 +++++++-----
 po/pt_BR.po | 3958 ++++++++++++++++++++++++++++++++++----------------------
 po/ru.po    | 3062 ++++++++++++++++++++++++-------------------
 po/sl.po    | 3627 ++++++++++++++++++++++++++++-----------------------
 po/sv.po    | 1957 +++++++++++++++++-----------
 po/zh_CN.po | 3159 +++++++++++++++++++++++++-------------------
 po/zh_TW.po | 3577 ++++++++++++++++++++++++++++++--------------------
 19 files changed, 27249 insertions(+), 18744 deletions(-)
---
diff --git a/po/ca.po b/po/ca.po
index 5812736..2bac3b5 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-05-27 22:36-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,1099 @@ 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/glabels.c:91
-msgid "- gLabels label designer"
-msgstr "- dissenyador d'etiquetes gLabels"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (només codi postal ZIP)"
 
-#: ../src/glabels-batch.c:54
+#: ../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/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
+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 "Codi 39"
+
+#: ../src/bc.c:134
+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
+msgid "Interleaved 2 of 5"
+msgstr "Interfoliat 2 de 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
+#, fuzzy
+msgid "Code 93"
+msgstr "Codi 39"
+
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:176
+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:584 ../src/label.c:628
+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:52
 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:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "nom de fitxer"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr "nombre de fulls (valor predeterminat = 1"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr "fulls"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr "nombre de còpies (valor predeterminat = 1"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "còpies"
 
-#: ../src/glabels-batch.c:60
+#: ../src/glabels-batch.c:58
 msgid "first label on first sheet (default=1)"
 msgstr "la primera etiqueta al primer full"
 
-#: ../src/glabels-batch.c:60
+#: ../src/glabels-batch.c:58
 msgid "first"
 msgstr "primer"
 
-#: ../src/glabels-batch.c:62 ../data/builder/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../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:66
 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:68 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[FITXER...]"
 
-#: ../src/glabels-batch.c:142
+#: ../src/glabels-batch.c:98
+msgid "Print files created with gLabels."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/glabels-batch.c:149
 #, 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:184
 #, 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:483
+msgid "Barcode data empty"
+msgstr "Les dades del codi de barres estan buides"
+
+#: ../src/label-barcode.c:487
+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:399
+msgid "Untitled"
+msgstr "Sense títol"
+
+#: ../src/label.c:702 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Propietats de fusió"
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "Porta al primer pla"
+
+#: ../src/label.c:1253 ../src/ui.c:331
+msgid "Send to back"
+msgstr "Porta al fons"
+
+#: ../src/label.c:1294
+#, fuzzy
+msgid "Rotate"
+msgstr "Girat"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Gira a l'esquerra"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Gira a la dreta"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "Capgira horitzontalment"
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "Capgira verticalment"
+
+#: ../src/label.c:1472 ../src/ui.c:366
+msgid "Align left"
+msgstr "Alinea a l'esquerra"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr "Alinea a la dreta"
+
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Alinea als centre horitzontals"
+
+#: ../src/label.c:1666 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Alinea a les vores superiors"
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Alinea a les vores inferiors"
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Alinea als centre verticals"
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "Centra horitzontalment"
+
+#: ../src/label.c:1909 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "Centra verticalment"
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../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:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Crea un objecte d'imatge"
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Dades de la llibreta d'adreces predeterminada de l'Evolution"
+
+#: ../src/merge-init.c:110
+#, 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:9
+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:6
+#: ../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:1422
+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>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -333,399 +1243,289 @@ 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:29
 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:18
 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:15
 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 +1538,85 @@ 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:323
 #, 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:406
 #, 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:189 ../src/xml-label.c:227
 msgid "xmlParseFile error"
 msgstr "Error de la funció xmlParseFile"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:264
 msgid "No document root"
 msgstr "No hi ha cap arrel del document"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:272
 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:281
 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:291
 #, 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:360
 #, 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:856
 #, 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:1097 ../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:1104
 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1459,7 +1624,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:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1467,7 +1632,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:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1475,12 +1640,58 @@ 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:2128
+#, 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 ""
+
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d per full"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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:40
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "punts"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../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 +1708,420 @@ 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
+#.
+#. * 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>Selecció de registres/previsualització</b>"
 
-#: ../data/builder/merge-properties-dialog.glade.h:2
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "<b>Source</b>"
 msgstr "<b>Font</b>"
 
-#: ../data/builder/merge-properties-dialog.glade.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "Ubicació:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../data/builder/merge-properties-dialog.glade.h:6
+#: ../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/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Categoria:"
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "Retalla"
 
-#: ../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: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/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
 
-#: ../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:6
+#, fuzzy
+msgid "Search all"
+msgstr "Selecciona-ho tot"
+
+#: ../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 "Descripció:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+#, fuzzy
+msgid "Label size:"
+msgstr "Mida de la pàgina:"
 
-#: ../data/builder/object-editor.glade.h:2
+#: ../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/builder/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/builder/object-editor.glade.h:4
+#: ../data/ui/object-editor.ui.h:3
 msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
 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/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Alineació:"
 
-#: ../data/builder/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 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:6
 msgid "Angle:"
 msgstr "Angle:"
 
-#: ../data/builder/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:7
 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:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Color:"
 
-#: ../data/builder/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "Habilita l'ombra"
 
-#: ../data/builder/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Família:"
 
-#: ../data/builder/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Fitxer:"
 
-#: ../data/builder/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Emplenat"
 
-#: ../data/builder/object-editor.glade.h:15
-#: ../data/builder/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:14 ../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:16
 msgid "Key:"
 msgstr "Clau:"
 
-#: ../data/builder/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Llargada:"
 
-#: ../data/builder/object-editor.glade.h:21
-#: ../data/builder/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "Espaiat de línia:"
 
-#: ../data/builder/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Literal:"
 
-#: ../data/builder/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "Opacitat:"
 
-#: ../data/builder/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Posició"
 
-#: ../data/builder/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:23
 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:24
 msgid "Shadow"
 msgstr "Ombra"
 
-#: ../data/builder/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Mida"
 
-#: ../data/builder/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Mida:"
 
-#: ../data/builder/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Estil"
 
-#: ../data/builder/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr "Desplaçament X:"
 
-#: ../data/builder/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "Desplaçament Y:"
 
-#: ../data/builder/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "graus"
 
-#: ../data/builder/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:36
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "dígits:"
 
-#: ../data/builder/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../data/ui/prefs-dialog.ui.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
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">Emplenat</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">Línia</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">Text</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">Unitats</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Tipus de lletra"
 
-#: ../data/builder/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "A4 de l'ISO"
 
-#: ../data/builder/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Polzades"
 
-#: ../data/builder/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "Localització"
 
-#: ../data/builder/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Mil·límetres"
 
-#: ../data/builder/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "Valors predeterminats dels objectes"
 
-#: ../data/builder/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Punts"
 
-#: ../data/builder/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 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:18
 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:19 ../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/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 +2139,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 +2166,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 +2194,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 +2206,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 +2214,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 +2242,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 +2250,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 +2265,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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "<b>Opcions</b>"
 
-#: ../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 "<b>Merge Control</b>"
+msgstr "<b>Control d'impressió (fusió)</b>"
 
-#: ../data/builder/template-designer.glade.h:65
-msgid "layout_page"
-msgstr "layout_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "<b>Options</b>"
+msgstr "<b>Opcions</b>"
 
-#: ../data/builder/template-designer.glade.h:66
-msgid "name_page"
-msgstr "name_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "Compagina"
 
-#: ../data/builder/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "nlayouts_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+msgstr "Còpies"
 
-#: ../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 +2494,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 +2712,475 @@ 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 "Select A File"
+#~ msgstr "Seleccioneu un fitxer"
+
+#~ 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..3dcf5ef 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-05-27 22:36-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,1120 @@ 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/glabels.c:91
-msgid "- gLabels label designer"
-msgstr "- návrháÅ? etiket gLabels"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (pouze PSÄ?)"
 
-#: ../src/glabels-batch.c:54
+#: ../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
+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 "Prokládaný 2 z 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
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:176
+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/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:584 ../src/label.c:628
+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:52
 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:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "název souboru"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr "poÄ?et stran (výchozí=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr "stran"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr "poÄ?et kopií (výchozí = 1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "kopií"
 
-#: ../src/glabels-batch.c:60
+#: ../src/glabels-batch.c:58
 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:58
 msgid "first"
 msgstr "první"
 
-#: ../src/glabels-batch.c:62 ../data/glade/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../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:66
 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:68 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[SOUBORâ?¦]"
+
+#: ../src/glabels-batch.c:98
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: ../src/glabels-batch.c:142
+#: ../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 ""
+
+#: ../src/glabels-batch.c:149
 #, 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:184
 #, 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:483
+msgid "Barcode data empty"
+msgstr "Data pro Ä?árový kód jsou prázdná"
+
+#: ../src/label-barcode.c:487
+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:399
+msgid "Untitled"
+msgstr "Nepojmenovaný"
+
+#: ../src/label.c:702 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Vlastnosti sluÄ?ování"
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Smazat"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "PÅ?enést dopÅ?edu"
+
+#: ../src/label.c:1253 ../src/ui.c:331
+msgid "Send to back"
+msgstr "PÅ?enést dozadu"
+
+#: ../src/label.c:1294
+msgid "Rotate"
+msgstr "OtoÄ?it"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "OtoÄ?it doleva"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "OtoÄ?it doprava"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "PÅ?eklopit vodorovnÄ?"
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "PÅ?eklopit svisle"
+
+#: ../src/label.c:1472 ../src/ui.c:366
+msgid "Align left"
+msgstr "Zarovnat doleva"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr "Zarovnat doprava"
+
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Zarovnat vodorovnÄ? na stÅ?ed"
+
+#: ../src/label.c:1666 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Zarovnat nahoru"
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Zarovnat dolů"
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Zarovnat svisle na stÅ?ed"
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "VystÅ?edit vodorovnÄ?"
+
+#: ../src/label.c:1909 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "VystÅ?edit  svisle"
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../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:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "VytvoÅ?it objekt s obrázkem"
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Data z výchozího adresáÅ?e Evolution"
+
+#: ../src/merge-init.c:110
+#, 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:9
+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:6
+#: ../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:1422
+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>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -335,394 +1267,286 @@ 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:29
 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:18
 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:15
 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 +1557,85 @@ 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:323
 #, 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:406
 #, 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:189 ../src/xml-label.c:227
 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:264
 msgid "No document root"
 msgstr "Schází koÅ?en dokumentu"
 
-#: ../src/xml-label.c:278
+#: ../src/xml-label.c:272
 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:281
 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:291
 #, 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:360
 #, 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:856
 #, 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:1097 ../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:1104
 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1476,7 +1643,7 @@ msgstr ""
 "Nelze najít definice velikostí papíru. Možná není správnÄ? nainstalovaná "
 "knihovna libglabels!"
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1484,7 +1651,7 @@ msgstr ""
 "Nelze najít definice kategorií. Možná není správnÄ? nainstalovaná knihovna "
 "libglabels!"
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1492,12 +1659,58 @@ 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:2128
+#, 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 ""
+
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d na stránku"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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:40
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "body"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../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 +1726,421 @@ 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
+#.
+#. * 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>VýbÄ?r/náhled záznamu</b>"
 
-#: ../data/glade/merge-properties-dialog.glade.h:2
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "<b>Source</b>"
 msgstr "<b>Zdroj</b>"
 
-#: ../data/glade/merge-properties-dialog.glade.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "Formát:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "UmístÄ?ní:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Vybrat vše"
 
-#: ../data/glade/merge-properties-dialog.glade.h:6
+#: ../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/glade/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>Orientace etikety</b>"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Kategorie:"
 
-#: ../data/glade/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>Typ média</b>"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "vlastní"
 
-#: ../data/glade/object-editor.glade.h:2
+#: ../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/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/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/glade/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/glade/object-editor.glade.h:4
+#: ../data/ui/object-editor.ui.h:3
 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:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Zarovnání:"
 
-#: ../data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 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:6
 msgid "Angle:"
 msgstr "Ã?hel:"
 
-#: ../data/glade/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:7
 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:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Barva:"
 
-#: ../data/glade/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "Zapnout stín"
 
-#: ../data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Rodina:"
 
-#: ../data/glade/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Soubor:"
 
-#: ../data/glade/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:13
 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:14 ../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:16
 msgid "Key:"
 msgstr "KlíÄ?:"
 
-#: ../data/glade/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:17
 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:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "Å?ádkování:"
 
-#: ../data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Znaky:"
 
-#: ../data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "Krytí:"
 
-#: ../data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Pozice"
 
-#: ../data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:23
 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:24
 msgid "Shadow"
 msgstr "Stín"
 
-#: ../data/glade/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Velikost"
 
-#: ../data/glade/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Velikost:"
 
-#: ../data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr "Posun X:"
 
-#: ../data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/glade/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "Posun Y:"
 
-#: ../data/glade/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/glade/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "stupnÄ?"
 
-#: ../data/glade/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:36
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "Ä?íslic:"
 
-#: ../data/glade/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../data/ui/prefs-dialog.ui.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
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">VýplÅ?</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">Obrys</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">Text</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">Jednotky</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Písmo:"
 
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Palce"
 
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "Národní prostÅ?edí"
 
-#: ../data/glade/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Milimetry"
 
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "Výchozí hodnoty objektu"
 
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Body"
 
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 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:18
 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:19 ../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/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 +2158,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 +2184,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 +2223,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 +2231,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 +2259,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 +2267,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 +2281,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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "<b>Volby</b>"
 
-#: ../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 "<b>Merge Control</b>"
+msgstr "<b>Ovládání tisku (sluÄ?ování)</b>"
 
-#: ../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 "<b>Options</b>"
+msgstr "<b>Volby</b>"
 
-#: ../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:4
+msgid "Collate"
+msgstr "SeÅ?adit"
 
-#: ../data/glade/template-designer.glade.h:68
-msgid "pg_size_page"
-msgstr "karta_velikost_strany"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+msgstr "Kopie:"
 
-#: ../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 +2727,556 @@ 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 "Select A File"
+#~ msgstr "VýbÄ?r souboru"
+
+#~ 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 4eb028c..cebb33b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels glabels_2_2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-23 22:54+0100\n"
+"POT-Creation-Date: 2010-05-27 22:36-0400\n"
 "PO-Revision-Date: 2010-02-20 14:52+0000\n"
 "Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -18,136 +18,140 @@ msgstr ""
 "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 "POSTNET (alle)"
 
-#: ../src/bc.c:68
+#: ../src/bc.c:69
 msgid "POSTNET-5 (ZIP only)"
 msgstr "POSTNET-5 (kun ZIP)"
 
-#: ../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 (alle)"
 
-#: ../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 eller UPC-E)"
 
-#: ../src/bc.c:106
+#: ../src/bc.c:107
 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
 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
 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
 msgid "Code 39"
 msgstr "Kode 39"
 
-#: ../src/bc.c:133
+#: ../src/bc.c:134
 msgid "Code 128"
 msgstr "Kode 128"
 
-#: ../src/bc.c:136
+#: ../src/bc.c:137
 msgid "Code 128C"
 msgstr "Kode 128C"
 
-#: ../src/bc.c:139
+#: ../src/bc.c:140
 msgid "Code 128B"
 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:142
+#: ../src/bc.c:143
 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:145
+#: ../src/bc.c:146
 msgid "Codabar"
 msgstr "Codabar"
 
-#: ../src/bc.c:148
+#: ../src/bc.c:149
 msgid "MSI"
 msgstr "MSI"
 
 # navn? The Plessey Company plc was a British-based international electronics, defence and telecommunications company.
-#: ../src/bc.c:151
+#: ../src/bc.c:152
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:154
+#: ../src/bc.c:155
 #, fuzzy
 msgid "Code 93"
 msgstr "Kode 39"
 
-#: ../src/bc.c:161
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:168
+#: ../src/bc.c:176
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -292,42 +296,42 @@ msgstr "hvid"
 msgid "White"
 msgstr "hvid"
 
-#: ../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 "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
 #, fuzzy
 msgid "Custom Color"
 msgstr "Tilpasset farve:"
 
-#: ../src/color-combo-menu.c:314
+#: ../src/color-combo-menu.c:319
 #, fuzzy, c-format
 msgid "Custom Color #%u"
 msgstr "Tilpasset farve:"
@@ -336,80 +340,80 @@ msgstr "Tilpasset farve:"
 msgid "gLabels Fatal Error!"
 msgstr "gLabels - fatal fejl!"
 
-#: ../src/file.c:86
+#: ../src/file.c:84
 msgid "New Label or Card"
 msgstr "Ny etiket eller kort"
 
-#: ../src/file.c:190 ../src/label.c:584 ../src/label.c:628
+#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
 msgid "Label properties"
 msgstr "Etiketegenskaber"
 
-#: ../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 "Dokumenter for gLabels"
 
-#: ../src/file.c:348 ../src/file.c:649
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
 msgstr "Tøm filnavnsmarkering"
 
-#: ../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 "Vælg venligst en fil eller angiv et gyldigt filnavn"
 
-#: ../src/file.c:364
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "Fil eksisterer ikke"
 
-#: ../src/file.c:439
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Kunne ikke åbne fil \"%s\""
 
-#: ../src/file.c:442
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr "Ikke et understøttet filformat"
 
-#: ../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 "Kunne ikke gemme fil \"%s\""
 
-#: ../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 "Fejl opstod under gemmning. Filen er ikke gemt."
 
-#: ../src/file.c:564
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Gem \"%s\" som"
 
-#: ../src/file.c:652
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr "Angiv venligst et gyldigt filnavn"
 
-#: ../src/file.c:673
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Overskriv fil \"%s\"?"
 
-#: ../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 "Gem ændringer til dokument \"%s\" før lukning?"
 
-#: ../src/file.c:777
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr "Dine ændringer vil gå tabt, hvis du ikke gemmer dem."
 
-#: ../src/file.c:780
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "Luk uden at gemme"
 
@@ -494,19 +498,16 @@ msgstr "første etiket på første ark (standard=1)"
 msgid "first"
 msgstr "første"
 
-#: ../src/glabels-batch.c:60
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:60 ../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/builder/print-op-dialog-custom-widget.builder.h:12
+#: ../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 "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/builder/print-op-dialog-custom-widget.builder.h:11
+#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "udskriv beskæringsmærker"
 
@@ -558,11 +559,11 @@ msgstr "Stregkodedata er tomme"
 msgid "Barcode property"
 msgstr "Egenskaber for stregkodeobjekt"
 
-#: ../src/label-barcode.c:482
+#: ../src/label-barcode.c:483
 msgid "Barcode data empty"
 msgstr "Stregkodedata er tomme"
 
-#: ../src/label-barcode.c:486
+#: ../src/label-barcode.c:487
 msgid "Invalid barcode data"
 msgstr "Ugyldige stregkodedata"
 
@@ -572,17 +573,17 @@ msgid "Create box object"
 msgstr "Opret tekstobjekt"
 
 #: ../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 "Fyld farve"
 
 #: ../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 "Linjefarve"
 
 #: ../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 "Linjebredde"
 
@@ -710,87 +711,105 @@ msgstr "Skygge"
 msgid "Shadow opacity"
 msgstr "Skygge"
 
-#: ../src/label-text.c:266 ../src/ui.c:284
+#: ../src/label-text.c:279 ../src/ui.c:284
 msgid "Create text object"
 msgstr "Opret tekstobjekt"
 
-#: ../src/label-text.c:438
+#: ../src/label-text.c:451
 #, fuzzy
 msgid "Typing"
 msgstr "lilla"
 
 # skrifttypefamilie
-#: ../src/label-text.c:573 ../data/builder/property-bar.builder.h:4
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
 msgid "Font family"
 msgstr "Skriftfamilie"
 
 # skrifttypestørrelse
-#: ../src/label-text.c:611 ../data/builder/property-bar.builder.h:5
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: ../src/label-text.c:644
+#: ../src/label-text.c:655
 #, fuzzy
 msgid "Font weight"
 msgstr "Roter til højre"
 
-#: ../src/label-text.c:677 ../data/builder/property-bar.builder.h:6
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/label-text.c:710
+#: ../src/label-text.c:721
 #, fuzzy
 msgid "Align text"
 msgstr "Juster venstre"
 
-#: ../src/label-text.c:743
+#: ../src/label-text.c:754
 #, fuzzy
 msgid "Line spacing"
 msgstr "Linjemellemrum:"
 
-#: ../src/label-text.c:776 ../data/builder/property-bar.builder.h:11
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Tekstfarve"
 
-#: ../src/label-text.c:920
+#: ../src/label-text.c:931
 msgid "Auto shrink"
 msgstr ""
 
-#: ../src/media-select.c:307 ../src/media-select.c:311
-#: ../src/media-select.c:316 ../src/media-select.c:325
-#: ../src/media-select.c:328 ../src/media-select.c:422
-#: ../src/media-select.c:635 ../src/media-select.c:644
+#: ../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 "Alle"
 
-#: ../src/media-select.c:670
-#, c-format
-msgid "%d per sheet"
-msgstr "%d per ark"
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "Alle"
 
-#: ../src/media-select.c:719 ../src/media-select.c:725
-#: ../src/media-select.c:735 ../src/media-select.c:741
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
 #, fuzzy
-msgid "diameter"
-msgstr "%s %s diameter"
+msgctxt "Category"
+msgid "Any"
+msgstr "Alle"
 
-#: ../src/media-select.c:824
+#: ../src/media-select.c:968
 msgid "No recent templates found."
 msgstr "Ingen seneste skabeloner fundet."
 
-#: ../src/media-select.c:826
-msgid "Try selecting a template from the \"Search all templates\" page."
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
 msgstr "Forsøg med at vælge en skabelon fra siden \"Søg i alle skabeloner\"."
 
-#: ../src/media-select.c:912
+#. 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 "Intet resultat."
 
-#: ../src/media-select.c:914
+#: ../src/media-select.c:1063
 msgid "Try selecting a different brand, page size or category."
 msgstr "Forsøg med at vælge et andet mærke, sidestørrrelse eller kategori."
 
-#: ../src/merge.c:169 ../src/merge.c:210 ../src/merge.c:374 ../src/merge.c:377
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Ingen seneste skabeloner fundet."
+
+#: ../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"
 
@@ -854,7 +873,7 @@ msgstr "Sammenføj egenskaber"
 msgid "Select merge-database source"
 msgstr "Vælg sammenføj-databasekilde"
 
-#: ../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 "-"
 
@@ -866,24 +885,38 @@ msgstr "Vælg"
 msgid "Record/Field"
 msgstr "Optag/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:9
 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 "Rettet"
 
-#: ../src/new-label-dialog.c:114
-msgid "<b>Media type</b>"
-msgstr "<b>Medietype</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:124
-msgid "<b>Label orientation</b>"
-msgstr "<b>Etiketorientering</b>"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Vælg tilstand"
+
+#: ../src/new-label-dialog.c:215
+msgid "Choose Orientation"
+msgstr ""
 
-#: ../src/object-editor-bc-page.c:92 ../src/object-editor-shadow-page.c:93
+#: ../src/new-label-dialog.c:229
+#, fuzzy
+msgid "Review"
+msgstr "Sidestø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"
@@ -946,27 +979,17 @@ msgstr "%s (*.%s)"
 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 "Indstillinger for 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:6
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../src/rotate-label-button.c:122
-#, fuzzy
-msgid "Normal"
-msgstr "Format:"
-
-#: ../src/rotate-label-button.c:133
-#, fuzzy
-msgid "Rotated"
-msgstr "Roter"
-
 #: ../src/stock.c:70
 msgid "_Select Mode"
 msgstr "_Vælg tilstand"
@@ -1067,51 +1090,57 @@ msgid "Not Linked"
 msgstr "Ikke forbundet"
 
 #: ../src/template-designer.c:404
-msgid "gLabels Template Designer"
+#, fuzzy
+msgid "New gLabels Template"
 msgstr "gLabels - skabelondesigner"
 
-#: ../src/template-designer.c:459
+#: ../src/template-designer.c:461
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../src/template-designer.c:498
+#: ../src/template-designer.c:500
 msgid "Name and Description"
 msgstr "Navn og beskrivelse"
 
-#: ../src/template-designer.c:546
+#: ../src/template-designer.c:548
 msgid "Page Size"
 msgstr "Sidestørrelse"
 
-#: ../src/template-designer.c:612
+#: ../src/template-designer.c:614
 msgid "Label or Card Shape"
 msgstr "Etiket- eller kortform"
 
-#: ../src/template-designer.c:658
+#: ../src/template-designer.c:661
 msgid "Label or Card Size"
 msgstr "Etiket- eller kortstørrelse"
 
 # rund eller afrundet!
-#: ../src/template-designer.c:754
+#: ../src/template-designer.c:760
 msgid "Label Size (round)"
 msgstr "Etiketstørrelse (rund)"
 
-#: ../src/template-designer.c:832
+#: ../src/template-designer.c:841
 msgid "Label Size (CD/DVD)"
 msgstr "Etiketstørrelse (cd/dvd)"
 
-#: ../src/template-designer.c:920
+#: ../src/template-designer.c:932
 msgid "Number of Layouts"
 msgstr "Antal layout"
 
-#: ../src/template-designer.c:984
+#: ../src/template-designer.c:1000
 msgid "Layout(s)"
 msgstr "Layout"
 
-#: ../src/template-designer.c:1089
+#: ../src/template-designer.c:1105
 msgid "Design Completed"
 msgstr "Design færdigt"
 
-#: ../src/template-designer.c:1266
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "gLabels - skabelondesigner"
+
+#: ../src/template-designer.c:1422
 msgid ""
 "<span foreground='red' weight='bold'>Brand and part# match an existing "
 "template!</span>"
@@ -1349,8 +1378,7 @@ 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/builder/object-editor.builder.h:30
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
 msgid "Text"
 msgstr "Tekst"
 
@@ -1362,7 +1390,7 @@ msgstr "Boks"
 msgid "Create box/rectangle object"
 msgstr "Opret boks-/rektangelobjekt"
 
-#: ../src/ui.c:296 ../data/builder/object-editor.builder.h:19
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
 msgid "Line"
 msgstr "Linje"
 
@@ -1374,7 +1402,7 @@ msgstr "Ellipse"
 msgid "Create ellipse/circle object"
 msgstr "Opret ellipse-/cirkelobjekt"
 
-#: ../src/ui.c:310 ../data/builder/object-editor.builder.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
 msgid "Image"
 msgstr "Billede"
 
@@ -1498,24 +1526,24 @@ msgstr "Tegneværktøjsbjælke"
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "�ndr synligheden på tegneværktøjsbjælken i det nuværende vindue"
 
-#: ../src/ui-commands.c:1134
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "Glabels har modtaget bidrag fra:"
 
-#: ../src/ui-commands.c:1140
+#: ../src/ui-commands.c:1141
 msgid "See the file AUTHORS for additional credits,"
 msgstr "Se filen AUTHORS for yderligere oversigt over bidragydere,"
 
-#: ../src/ui-commands.c:1141
+#: ../src/ui-commands.c:1142
 #, fuzzy
 msgid "or visit http://glabels.org/";
 msgstr "eller besøg http://glabels.sourceforge.net/";
 
-#: ../src/ui-commands.c:1153
+#: ../src/ui-commands.c:1154
 msgid "A label and business card creation program.\n"
 msgstr "Et program til oprettelse af etiketter og forretningskort.\n"
 
-#: ../src/ui-commands.c:1157
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr ""
 "Joe Hansen, 2010.\n"
@@ -1523,7 +1551,7 @@ msgstr ""
 "Dansk-gruppen <dansk dansk-gruppen dk>\n"
 "Mere info: http://www.dansk-gruppen.dk";
 
-#: ../src/ui-commands.c:1160
+#: ../src/ui-commands.c:1161
 #, fuzzy
 msgid ""
 "gLabels is free software: you can redistribute it and/or modify\n"
@@ -1546,7 +1574,7 @@ msgstr ""
 "omkring SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÃ?L. Yderligere\n"
 "detaljer kan læses i GNU General Public License.\n"
 
-#: ../src/ui-commands.c:1187
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "glabels"
 
@@ -1603,7 +1631,7 @@ msgstr "dårlig knude i dokumentknude =  \"%s\""
 msgid "bad node in Data node =  \"%s\""
 msgstr "dårlig knude i dataknude =  \"%s\""
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:785
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Utf8 - konverteringsfejl."
 
@@ -1613,16 +1641,19 @@ msgid "Problem saving xml file."
 msgstr "Problem under gemning af xml-fil."
 
 #. 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 "Anden"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:128
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "Brugerdefineret"
 
-#: ../libglabels/db.c:488
+#: ../libglabels/db.c:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1630,7 +1661,7 @@ msgstr ""
 "Kunne ikke finde definitioner for papirstørrelse. Libglabels er måske ikke "
 "installeret korrekt!"
 
-#: ../libglabels/db.c:880
+#: ../libglabels/db.c:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1638,35 +1669,46 @@ msgstr ""
 "Kunne ikke finde definitioner for kategorier. Libglabels er måske ikke "
 "installeret korrekt!"
 
-#: ../libglabels/db.c:1755
+#: ../libglabels/db.c:2061
 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:1822
-#, c-format
-msgid "Generic %s full page template"
+#: ../libglabels/db.c:2128
+#, fuzzy, c-format
+msgid "%s full page label"
 msgstr "Generisk %s hel sideskabelon"
 
-#: ../libglabels/template.c:148
+#: ../libglabels/template.c:156
 #, c-format
 msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr ""
 
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d per ark"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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/builder/object-editor.builder.h:41
-#: ../data/builder/prefs-dialog.builder.h:22
+#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:40
+#: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr "punkter"
 
 #. [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:39
+#: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr "tommer"
 
@@ -1685,32 +1727,32 @@ msgstr ""
 msgid "picas"
 msgstr ""
 
-#: ../libglabels/xml-template.c:226
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr "Manglende navn eller mærke-/delattributter."
 
 #. This should always be an id, but just in case a name
 #. slips by!
-#: ../libglabels/xml-template.c:247
+#: ../libglabels/xml-template.c:244
 #, c-format
 msgid "Unknown page size id \"%s\", trying as name"
 msgstr "Ukendt sidestørrelse-id \"%s\", forsøger som navn"
 
-#: ../libglabels/xml-template.c:259
+#: ../libglabels/xml-template.c:256
 #, c-format
 msgid "Unknown page size id or name \"%s\""
 msgstr "Ukendt sidestørrelse-id eller navn \"%s\""
 
-#: ../libglabels/xml-template.c:278
+#: ../libglabels/xml-template.c:275
 msgid "Forward references not supported."
 msgstr ""
 
-#: ../libglabels/xml-template.c:730
+#: ../libglabels/xml-template.c:747
 msgid ""
 "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr "Mangler krævet mærke- eller delattribut, forsøger forældet navn."
 
-#: ../libglabels/xml-template.c:740
+#: ../libglabels/xml-template.c:757
 msgid "Name attribute also missing."
 msgstr "Navneattribut mangler også."
 
@@ -1722,332 +1764,401 @@ msgstr "Navneattribut mangler også."
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "<b>Record selection/preview</b>"
 msgstr "<b>Optag markering/forhåndsvisning</b>"
 
-#: ../data/builder/merge-properties-dialog.builder.h:2
+#: ../data/ui/merge-properties-dialog.ui.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:3
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "Placering:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Vælg alle"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Fravælg alle"
 
-#: ../data/builder/object-editor.builder.h:2
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+msgstr "Mærke:"
+
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
+msgstr "Kategori:"
+
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "tilpasset"
+
+#: ../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
+#, fuzzy
+msgid "Recent"
+msgstr "Seneste skabeloner"
+
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Vælg alle"
+
+#: ../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 "Beskrivelse:"
+
+#: ../data/ui/new-label-dialog.ui.h:3
+#, fuzzy
+msgid "Label size:"
+msgstr "Sidestørrelse:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+#, fuzzy
+msgid "Layout:"
+msgstr "Layout"
+
+#: ../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 "Del #:"
+
+#: ../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 "Roter"
+
+#: ../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.builder.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/builder/object-editor.builder.h:4
+#: ../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/builder/object-editor.builder.h:5
-#: ../data/builder/prefs-dialog.builder.h:7
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr "Tillader automatisk at sammenføjning kan formindske tekst"
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Vinkel:"
 
 # Tjekbeløb
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "Kontrolsum"
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Farve:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "Slå skygge til"
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Familie:"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Fil:"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Fyld"
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Højde:"
 
-#: ../data/builder/object-editor.builder.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Nøgle:"
 
-#: ../data/builder/object-editor.builder.h:18
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Længde:"
 
-#: ../data/builder/object-editor.builder.h:20
-#: ../data/builder/prefs-dialog.builder.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "Linjemellemrum:"
 
-#: ../data/builder/object-editor.builder.h:21
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Bogstavelig:"
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "Ugennemsigtighed:"
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Placering"
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "Nulstil billedstørrelse"
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:24
 msgid "Shadow"
 msgstr "Skygge"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr "X-forskydning:"
 
-#: ../data/builder/object-editor.builder.h:33
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "Y-forskydning:"
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "grader"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr "dialog 1"
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "tal:"
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../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/builder/prefs-dialog.builder.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">Fyld</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">Linje</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">Tekst</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">Enheder</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Skrifttype:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Tommer"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "Sprog"
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Millimeter"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "Objektstandarder"
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Punkter"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr "Vælg standardegenskaber for nye objekter."
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:18
 msgid "Select locale specific behavior."
 msgstr "Vælg opførsel specifikt efter lokalt område."
 
-#: ../data/builder/prefs-dialog.builder.h:19 ../templates/paper-sizes.xml.h:35
+#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Fed"
 
-#: ../data/builder/property-bar.builder.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "Centrumjustering"
 
-#: ../data/builder/property-bar.builder.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "Venstrejustering"
 
-#: ../data/builder/property-bar.builder.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "Højrejustering"
 
-#: ../data/builder/template-designer.builder.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(f.eks., \"E-post-etiketter,\" \"Forretningskort,\" ...)"
 
-#: ../data/builder/template-designer.builder.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(f.eks., 8163A)"
 
-#: ../data/builder/template-designer.builder.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(f.eks, Carlsberg, LEGO, ...)"
 
-#: ../data/builder/template-designer.builder.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. Ydre radius:"
 
-#: ../data/builder/template-designer.builder.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. Radius:"
 
-#: ../data/builder/template-designer.builder.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Bredde:"
 
-#: ../data/builder/template-designer.builder.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. Højde:"
 
-#: ../data/builder/template-designer.builder.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. Indre radius:"
 
-#: ../data/builder/template-designer.builder.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. Overskud (overudskrivning tilladt):"
 
-#: ../data/builder/template-designer.builder.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. Klippebredde:"
 
-#: ../data/builder/template-designer.builder.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Margen"
 
-#: ../data/builder/template-designer.builder.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. Rund (radius på hjørne):"
 
 # ingen forslag på open-tran
-#: ../data/builder/template-designer.builder.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. Klippehøjde:"
 
-#: ../data/builder/template-designer.builder.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. Vandret affald (overudskrivning tilladt):"
 
-#: ../data/builder/template-designer.builder.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. Lodret affald (overudskrivning tilladt):"
 
-#: ../data/builder/template-designer.builder.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. Affald (overudskrivning tilladt):"
 
-#: ../data/builder/template-designer.builder.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Margen"
 
-#: ../data/builder/template-designer.builder.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "Mærke/producent:"
 
-#: ../data/builder/template-designer.builder.h:19
+#: ../data/ui/template-designer.ui.h:19
 msgid "CD/DVD (including credit card CDs)"
 msgstr "Cd/dvd (inklusiv kreditkorts-cd'er)"
 
-#: ../data/builder/template-designer.builder.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -2065,23 +2176,19 @@ msgstr ""
 "Ellers kan du trykke \"Afbryd\" for at droppe dit design\n"
 "eller \"Tilbage\" for at fortsætte med at redigere dette design."
 
-#: ../data/builder/template-designer.builder.h:27
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: ../data/builder/template-designer.builder.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "Afstand fra venstre hjørne (x0):"
 
-#: ../data/builder/template-designer.builder.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "Afstand fra øverste hjørne (y0):"
 
-#: ../data/builder/template-designer.builder.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "Vandret afstand (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"
@@ -2095,37 +2202,29 @@ msgstr ""
 "gitter. De fleste skabeloner skal kun bruge et layout, som i det første\n"
 "eksempel. Det andet eksempel illustrerer hvornår 2 layout er nødvendige."
 
-#: ../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"
 
 # hvad er dette?
-#: ../data/builder/template-designer.builder.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "Antal på tværs (nx):"
 
 # hvad er dette?
-#: ../data/builder/template-designer.builder.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "Antal ned (ny):"
 
-#: ../data/builder/template-designer.builder.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "Antal layout:"
 
-#: ../data/builder/template-designer.builder.h:42
-msgid "Page size:"
-msgstr "Sidestørrelse:"
-
-#: ../data/builder/template-designer.builder.h:43
-msgid "Part #:"
-msgstr "Del #:"
-
-#: ../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."
@@ -2133,18 +2232,18 @@ msgstr ""
 "Indtast venligst den følgende identifikationsinformation om den stationære "
 "skabelon."
 
-#: ../data/builder/template-designer.builder.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "Indtast venligst den følgende layoutinformation."
 
-#: ../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 ""
 "Indtast de følgende størrelsesparametre på en enkelt etiket i din skabelon."
 
-#: ../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."
@@ -2152,28 +2251,28 @@ msgstr ""
 "Indtast venligst de følgende størrelsesparametre på en enkelt etiket eller "
 "kort i din skabelon."
 
-#: ../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 "Vælg venligst den grundlæggende form på etiketterne eller kortene."
 
-#: ../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 "Vælg venligst sidestørrelsen på den stationære skabelon."
 
-#: ../data/builder/template-designer.builder.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Udskriv testark"
 
-#: ../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 firkant (kan have afrundede hjørner)"
 
 # rund eller afrundet
-#: ../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."
@@ -2181,7 +2280,7 @@ msgstr ""
 "Skabeloner der\n"
 "kræver to layout."
 
-#: ../data/builder/template-designer.builder.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2189,11 +2288,11 @@ msgstr ""
 "Skabeloner der kun\n"
 "kræver et layout."
 
-#: ../data/builder/template-designer.builder.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "Lodret afstand (dy):"
 
-#: ../data/builder/template-designer.builder.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2203,99 +2302,59 @@ msgstr ""
 "\n"
 "Denne guide vil assistere dig i oprettelsen af en tilpasset gLabels-skabelon."
 
-#: ../data/builder/template-designer.builder.h:62
-msgid "cd_size_page"
-msgstr "cd_størrelse_side"
-
-#: ../data/builder/template-designer.builder.h:63
-msgid "finish_page"
-msgstr "afslut_side"
-
-#: ../data/builder/template-designer.builder.h:65
-msgid "layout_page"
-msgstr "layout_side"
-
-#: ../data/builder/template-designer.builder.h:66
-msgid "name_page"
-msgstr "navn_side"
-
-#: ../data/builder/template-designer.builder.h:67
-msgid "nlayouts_page"
-msgstr "nlayout_side"
-
-# ingen ide om de her
-#: ../data/builder/template-designer.builder.h:68
-msgid "pg_size_page"
-msgstr "pg_størrelse_side"
-
-#: ../data/builder/template-designer.builder.h:69
-msgid "rect_size_page"
-msgstr "rect_størrelse_side"
-
-#: ../data/builder/template-designer.builder.h:70
-msgid "round_size_page"
-msgstr "rund_størrelse_side"
-
-#: ../data/builder/template-designer.builder.h:71
-msgid "shape_page"
-msgstr "form_side"
-
-#: ../data/builder/template-designer.builder.h:72
-msgid "start_page"
-msgstr "start_side"
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
 #, fuzzy
 msgid "<b>Copies</b>"
 msgstr "<b>Indstillinger</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 #, fuzzy
 msgid "<b>Merge Control</b>"
 msgstr "<b>Udskrivningskontrol (sammenføj)</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
 msgid "<b>Options</b>"
 msgstr "<b>Indstillinger</b>"
 
 # oversættelse hentet fra dia
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 msgid "Collate"
 msgstr "Saml ind"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
+#: ../data/ui/print-op-dialog-custom-widget.ui.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
 msgid "Sheets:"
 msgstr "Ark:"
 
-#: ../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 "Start på etiket"
 
-#: ../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 "på 1. ark"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:14
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
 msgid "to:"
 msgstr "til:"
 
-#: ../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 "Opret etiketter, forretningskort og mediecovere"
 
-#: ../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 "gLabels' etiketdesigner"
 
-#: ../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 "gLabels' projektfil"
 
@@ -2428,7 +2487,8 @@ msgstr "Ethvert kort"
 msgid "Any label"
 msgstr "Enhver etiket"
 
-#: ../templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "Forretningskort"
 
@@ -2444,7 +2504,8 @@ msgstr "Post-/forsendelsesprodukter"
 msgid "Rectangular labels"
 msgstr "Rektangulære etiketter"
 
-#: ../templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "Afrundede etiketter"
 
@@ -2460,6 +2521,7 @@ msgstr "Firkantede etiketter"
 #: ../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"
@@ -2485,6 +2547,7 @@ msgstr "Forretningskort"
 #: ../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"
@@ -2570,7 +2633,7 @@ msgstr "Returadresseetiketter"
 #. ===================================================================
 #: ../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 "Runde etiketter"
@@ -2640,7 +2703,7 @@ msgstr "Disketteetiketter"
 #. ===============================================================
 #. ===================================================================
 #: ../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"
@@ -2752,35 +2815,41 @@ msgid "DLT Labels"
 msgstr "DLT-etiketter"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:20
+#: ../templates/misc-us-templates.xml.h:18
+#, fuzzy
+msgid "Jewel Case Booklet"
+msgstr "Cd-brochure"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:22
 msgid "Microtube labels"
 msgstr "Mikrotubeetiketter"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:22
+#: ../templates/misc-us-templates.xml.h:24
 msgid "Mini-CD Labels"
 msgstr "Mini-cd-etiketter"
 
-#: ../templates/misc-us-templates.xml.h:23
+#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr "PRO CD-etiketter 2-up (kun cd-ryg)"
 
-#: ../templates/misc-us-templates.xml.h:24
+#: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "PRO CD-etiketter 2-up (kun front)"
 
 #. ===================================================================
-#: ../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 "PRO CD-etiketter 2-up (kun front)"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:30
+#: ../templates/misc-us-templates.xml.h:32
 msgid "Slimline CD Case (rightside up)"
 msgstr "Tynd cd-kasette (vendt korrekt)"
 
-#: ../templates/misc-us-templates.xml.h:31
+#: ../templates/misc-us-templates.xml.h:33
 msgid "Slimline CD Case (upside down)"
 msgstr "Tynd cd-kasette (omvendt)"
 
@@ -2864,6 +2933,12 @@ msgstr "Rektangulære etiketter"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:46
+#, fuzzy
+msgid "Universal Labels"
+msgstr "Generelle etiketter"
+
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "Videoetiketter (kun front)"
 
@@ -2873,6 +2948,141 @@ msgid "Multi-Purpose Labels"
 msgstr "Etiketter til flere formål"
 
 #. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Adresseetiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Disketteetiketter"
+
+#. ===================================================================
+#: ../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 "Forretningskort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Forretningskort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Forretningskort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Forretningskort"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Allroundetiketter"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Forretningskort"
+
+#. ===================================================================
+#: ../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
+#, fuzzy
+msgid "Name plates"
+msgstr "navn_side"
+
+#. ===================================================================
+#: ../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 "Firkantede 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
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "Firkantede etiketter"
+
+#. ===================================================================
+#: ../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 "Rettelses- og overdækningsetiketter"
@@ -2912,6 +3122,43 @@ msgstr "Rektangulær Copieretiketter"
 msgid "Video Labels (back)"
 msgstr "Video-etiketter (bagside)"
 
+#~ msgid "<b>Media type</b>"
+#~ msgstr "<b>Medietype</b>"
+
+#~ msgid "<b>Label orientation</b>"
+#~ msgstr "<b>Etiketorientering</b>"
+
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ msgid "cd_size_page"
+#~ msgstr "cd_størrelse_side"
+
+#~ msgid "finish_page"
+#~ msgstr "afslut_side"
+
+#~ msgid "layout_page"
+#~ msgstr "layout_side"
+
+#~ msgid "nlayouts_page"
+#~ msgstr "nlayout_side"
+
+# ingen ide om de her
+#~ msgid "pg_size_page"
+#~ msgstr "pg_størrelse_side"
+
+#~ msgid "rect_size_page"
+#~ msgstr "rect_størrelse_side"
+
+#~ msgid "round_size_page"
+#~ msgstr "rund_størrelse_side"
+
+#~ msgid "shape_page"
+#~ msgstr "form_side"
+
+#~ msgid "start_page"
+#~ msgstr "start_side"
+
 #~ msgid "- gLabels label designer"
 #~ msgstr "- glabels etiketdesigner"
 
@@ -2954,9 +3201,6 @@ msgstr "Video-etiketter (bagside)"
 #~ msgid "%.5g %s diameter"
 #~ msgstr "%.5g %s diameter"
 
-#~ msgid "custom"
-#~ msgstr "tilpasset"
-
 #~ msgid "Choose Custom Color"
 #~ msgstr "Vælg tilpasset farve"
 
@@ -3042,12 +3286,6 @@ msgstr "Video-etiketter (bagside)"
 #~ msgid "Text Color"
 #~ msgstr "Tekstfarve"
 
-#~ msgid "Brand:"
-#~ msgstr "Mærke:"
-
-#~ msgid "Category:"
-#~ msgstr "Kategori:"
-
 #~ msgid "Search all templates"
 #~ msgstr "Søg i alle skabeloner"
 
diff --git a/po/de.po b/po/de.po
index df6fc14..a386eab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 2.3.0\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
-"POT-Creation-Date: 2010-05-24 23:49+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-27 22:36-0400\n"
 "PO-Revision-Date: 2010-05-25 17:31+0100\n"
 "Last-Translator: Mario Blättermann <mariobl gnome org>\n"
 "Language-Team: German <gnome-de gnome org>\n"
@@ -332,7 +332,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 +382,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"
@@ -712,20 +714,17 @@ msgstr "Automatisch schrumpfen"
 
 #: ../src/media-select.c:349 ../src/media-select.c:353
 #: ../src/media-select.c:502 ../src/media-select.c:701
-#| msgid "Any"
 msgctxt "Brand"
 msgid "Any"
 msgstr "Beliebig"
 
 #: ../src/media-select.c:358 ../src/media-select.c:871
-#| msgid "Any"
 msgctxt "Page size"
 msgid "Any"
 msgstr "Beliebig"
 
 #: ../src/media-select.c:367 ../src/media-select.c:370
 #: ../src/media-select.c:880
-#| msgid "Any"
 msgctxt "Category"
 msgid "Any"
 msgstr "Beliebig"
@@ -798,7 +797,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"
@@ -865,7 +865,7 @@ msgstr "Ausrichtung wählen"
 msgid "Review"
 msgstr "�berprüfen"
 
-#: ../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"
@@ -1435,7 +1435,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"
@@ -1443,7 +1444,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"
@@ -2174,7 +2176,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."
diff --git a/po/eo.po b/po/eo.po
index cda51ce..dc13a53 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-05-27 22:36-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,2150 @@ 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
+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
+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
+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
+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
+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
+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
+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
+#, 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 "GS1-128"
+msgstr ""
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:109
-msgid "Send to _Back"
-msgstr "_Sendu MalantaÅ­en"
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:96
-msgid "Rotate _Left"
-msgstr "Turnu _Maldekstren"
+#: ../src/bc.c:176
+msgid "IEC18004 (QRCode)"
+msgstr ""
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:97
-msgid "Rotate _Right"
-msgstr "Turnu _Dekstren"
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
+msgstr "DefaÅ­lto"
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
-msgstr "Renversu _Horizontale"
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "malhela ruÄ?o"
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
-msgstr "Renversu _Vertikale"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:147
-msgid "_Lefts"
-msgstr "_Maldekstre"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:159
-msgid "_Rights"
-msgstr "_Dekstre"
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "malhela verdo"
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:131
-msgid "_Centers"
-msgstr "_Centre"
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:164
-msgid "_Tops"
-msgstr "_Supre"
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/stock.c:84
-msgid "Bottoms"
-msgstr "Sube"
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "malhela bluo"
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr "Centre"
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "Refaru"
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
-msgstr "Ce_ntrita Etikedo"
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "oranÄ?a koloro"
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
-msgstr "Koloro de plenigo"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
 
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
-msgstr "Koloro de linio"
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "nebrila verdo"
 
-#: src/stock.c:90 src/stock.c:92
-msgid "Linked"
-msgstr "Kunligita"
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
 
-#: src/stock.c:91 src/stock.c:93
-msgid "Not Linked"
-msgstr "Neniu Kunligo"
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "bluo"
 
-#: src/ui-property-bar.c:345 src/object-editor.c:499
-msgid "Default"
-msgstr "DefaÅ­lto"
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "violo"
 
-#: src/ui-property-bar.c:360 src/object-editor.c:512
-msgid "No fill"
-msgstr "Neniu Plenigo"
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
 
-#: src/ui-property-bar.c:375 src/object-editor.c:505
-msgid "No line"
-msgstr "Neniu Linio"
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "oro"
 
-#: src/ui-sidebar.c:180
-msgid "Object properties"
-msgstr "Ecoj de objekto"
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "flavo"
 
-#: 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:102
+#, fuzzy
+msgid "Green"
+msgstr "verdo"
 
-#: src/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
-msgstr "aÅ­ vizitu http://glabels.sourceforge.net/";
+#: ../src/color-combo-menu.c:103
+#, fuzzy
+msgid "Cyan"
+msgstr "cejano"
 
-#: src/commands.c:409
-msgid " "
-msgstr " "
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "Ä?ielbluo"
 
-#: src/commands.c:424
-msgid "glabels"
-msgstr "glabels"
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
 
-#: src/file.c:100
-msgid "New Label or Card"
-msgstr "Nova Etikedo aÅ­ Karto"
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "rozkoloro"
 
-#: src/file.c:132 src/file.c:304
-msgid "Media Type"
-msgstr "Speco de plurmedio"
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
 
-#: src/file.c:138 src/file.c:310
-msgid "Label orientation"
-msgstr "Orientado de etikedo"
+#: ../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/file.c:269
+#: ../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:584 ../src/label.c:628
 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:52
+#, 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:52 ../src/glabels-batch.c:66
+msgid "filename"
+msgstr "dosiernomo"
 
-#. Build editor.
-#: src/view-line.c:224
-msgid "Line object properties"
-msgstr "Ecoj de Linio"
+#: ../src/glabels-batch.c:54
+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:54
+msgid "sheets"
+msgstr "folioj"
 
-#. Build editor.
-#: src/view-text.c:251
-msgid "Text object properties"
-msgstr "Ecoj de Teksto"
+#: ../src/glabels-batch.c:56
+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:56
+msgid "copies"
+msgstr "ekzempleroj"
 
-#. Build editor.
-#: src/view-barcode.c:210
-msgid "Barcode object properties"
-msgstr "Ecoj de Strekkodo"
+#: ../src/glabels-batch.c:58
+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:58
+msgid "first"
+msgstr "unua"
 
-#: src/merge-properties-dialog.c:231
-msgid "Merge Properties"
-msgstr "Ecoj de Kunfando"
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../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:66
+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:68 ../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:98
+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: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 ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "Elektu"
+#: ../src/glabels-batch.c:149
+#, 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:184
+#, 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:483
+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:487
+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:399
+msgid "Untitled"
+msgstr "Sen nomo"
 
-#: src/bc.c:66
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP/CAP+4)"
+#: ../src/label.c:702 ../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:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Forigu"
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr "EAN (iu ajn)"
+#: ../src/label.c:1217 ../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:1253 ../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:1294
+msgid "Rotate"
+msgstr "Rotacio"
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
+#: ../src/label.c:1329 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "Turnu _Maldekstren"
 
-#: src/bc.c:84
-msgid "EAN-13"
-msgstr "EAN-13"
+#: ../src/label.c:1362 ../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:1397 ../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:1432 ../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:1472 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "AlliniÄ?o:"
 
-#: src/bc.c:96
-msgid "UPC-A"
-msgstr "UPC-A"
+#: ../src/label.c:1529 ../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:1590 ../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:1666 ../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:1723 ../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:1784 ../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:1862 ../src/ui.c:408
+#, fuzzy
+msgid "Center horizontally"
+msgstr "Renversu objekton horizontale"
 
-#: src/bc.c:114
-msgid "ISBN"
-msgstr "ISBN"
+#: ../src/label.c:1909 ../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:2595 ../src/label.c:2637 ../src/label.c:2663 ../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:161 ../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:265 ../src/label-image.c:336
+#, 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
-msgid "None"
-msgstr "Nenio"
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "Neniu modelo estis trovita!"
 
-#: src/merge-init.c:53
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Teksta dosiero kun komo kiel disigilo (CSV)"
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
 
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
-msgstr "Teksta dosiero kun komo kiel disigilo"
+#. 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/merge-init.c:67
-msgid "Text file with tab delimeters"
-msgstr "Teksta dosiero kun TAB kiel disigilo"
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
 
-#: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11
-msgid "File:"
-msgstr "Dosiero:"
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Neniu modelo estis trovita!"
 
-#: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "Å?losilo:"
+#: ../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/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "Folioj:"
+#. 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/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "Etikedoj"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "de:"
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+#, fuzzy
+msgid "Couldn't open addressbook."
+msgstr "Estas neeble malfermi dosieron \"%s\""
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "Ä?is:"
+#: ../src/merge-evolution.c:348
+#, fuzzy
+msgid "Couldn't list available fields."
+msgstr "estas neeble konservi dosieron \"%s\""
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr "Starto en etikedo"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr ""
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "en 1a folio"
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "Ekzempleroj:"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "LaÅ­kajere"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
 
-#: src/wdgt-media-select.c:269 data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "Priskribo:"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-media-select.c:279 data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "Grando de paÄ?o:"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "Grando de etikedo:"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "Aspekto:"
+#: ../src/merge-init.c:104
+msgid "Evolution Addressbook"
+msgstr ""
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d  (%d por folio)"
+#: ../src/merge-init.c:110
+msgid "VCards"
+msgstr ""
 
-#: src/wdgt-media-select.c:582
-#, c-format
-msgid "%d per sheet"
-msgstr "%d por folio"
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Ecoj de Kunfando"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../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:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s diametro"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Elektu"
 
-#: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s diametro"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Rikordo/Kampo"
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "Rotacio"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+msgid "Data"
+msgstr "Datumoj"
 
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
-msgid "custom"
-msgstr "personigita"
+#. 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:"
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
-msgid "Custom Color:"
-msgstr "Personigita Koloro:"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr "Elektu personigitan koloron"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Modu_so de Elektado"
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-msgstr "nigro"
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "Orientado de etikedo"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr "hela bruna koloro"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
-msgstr "malhela oro"
+#: ../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:582
-msgid "dark green #2"
-msgstr "malhela verdo #2"
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "Ecoj de objekto"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
-msgstr "mararmea bluo"
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "Ecoj de Fako"
 
-#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr "malhela bluo"
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "Ecoj de Elipso"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr "viola koloro #2"
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "Ecoj de Linio"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr "tre malhela grizo"
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "Ecoj de Bildo"
 
-#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr "malhela ruÄ?o"
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "Ecoj de Teksto"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
-msgstr "ruÄ?-oranÄ?o"
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "Ecoj de Strekkodo"
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr "oro"
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Enigu campon de kunfando"
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr "malhela verdo"
+#: ../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:593 src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr "nebrila bluo"
+#: ../src/object-editor-image-page.c:278
+#, fuzzy
+msgid "All Files"
+msgstr "Ä?iuj dosieroj"
 
-#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
-msgid "blue"
-msgstr "bluo"
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "Bildo"
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr "nebrila violo"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr ""
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-msgstr "malhela grizo"
+#: ../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:599
-msgid "red"
-msgstr "ruÄ?o"
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "Agordoj de gLabels"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr "oranÄ?a koloro"
+#. ===================================================================
+#: ../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 "Etikedoj"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr "limeta koloro"
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "Modu_so de Elektado"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr "nebrila verdo"
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "_Teksto"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr "nebrila bluo #2"
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "_Linio"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr "Ä?ielbluo #2"
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "_Fako"
 
-#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
-msgid "purple"
-msgstr "violo"
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "_Elipso"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr "grizo"
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "_Bildo"
 
-#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
-msgid "magenta"
-msgstr "intense karmezina"
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "Strek_kodo"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
-msgstr "brila oranÄ?o"
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "Ecoj de Ku_nfando"
 
-#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
-msgid "yellow"
-msgstr "flavo"
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "Ecoj de _Objekto"
 
-#: src/mygal/color-palette.c:612
-msgid "green"
-msgstr "verdo"
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "Portu _Fronten"
 
-#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr "cejano"
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "_Sendu MalantaÅ­en"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr "brila bluo"
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "Turnu _Maldekstren"
 
-#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
-msgid "red purple"
-msgstr "ruÄ?-violo"
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "Turnu _Dekstren"
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
-msgstr "hela grizo"
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "Renversu _Horizontale"
 
-#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
-msgid "pink"
-msgstr "rozkoloro"
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "Renversu _Vertikale"
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
-msgstr "hela oranÄ?o"
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "_Maldekstre"
 
-#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr "hela flavo"
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "_Dekstre"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
-msgstr "hela verdo"
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "_Centre"
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
-msgstr "hela cejano"
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "_Supre"
 
-#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
-msgid "light blue"
-msgstr "hela bluo"
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "Sube"
 
-#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
-msgid "light purple"
-msgstr "hela violo"
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "Centre"
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr "blanko"
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "Ce_ntrita Etikedo"
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
-msgstr "viol-bluo"
+#: ../src/stock.c:95 ../src/stock.c:97
+msgid "Linked"
+msgstr "Kunligita"
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr "malhela violo"
+#: ../src/stock.c:96 ../src/stock.c:98
+msgid "Not Linked"
+msgstr "Neniu Kunligo"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr "Ä?ielbluo"
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "Desegnilo de modeloj por gLabels"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr "Ä?enerala %s plena paÄ?o"
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr ""
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "Neniu modelo estis trovita!"
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "Nomo kaj Priskribo"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr "Aliaĵoj"
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Grando de paÄ?o"
 
-#: libglabels/paper.c:361
-msgid "No paper files found!"
-msgstr "Neniu papera dosiero estis trovita!!"
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Formo de etikedo aÅ­ de karto"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
-msgstr "Pri glabels"
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "Formo de etikedo aÅ­ de karto"
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr "Pri..."
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "Grando de etikedo (Ronda)"
 
-#: data/ui/glabels-ui.xml.h:3
-msgid "Align _Horizontal"
-msgstr "LaÅ­linnigu _Horizontale"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Grando de etikedo (KD/DVD)"
 
-#: data/ui/glabels-ui.xml.h:4
-msgid "Align _Vertical"
-msgstr "LaÅ­linnigu _Verticale"
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "Nombro da Aspektoj"
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr "LaÅ­linnigu objektojn sube"
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "Aspekto(j)"
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr "LaÅ­linnigu objektojn laÅ­ horizontala centro"
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "Fino de Projektado"
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr "LaÅ­linnigu objektojn laÅ­ maldekstra rando"
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Desegnilo de modeloj por gLabels"
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr "LaÅ­linnigu objektojn laÅ­ dekstra rando"
+#: ../src/template-designer.c:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr "LaÅ­linnigu objektojn supre"
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "_Dosiero"
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr "LaÅ­liniigu objektojn laÅ­ verticala centro"
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "Fre_Å?aj Dosieroj"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr "Dika"
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "R_edaktu"
 
-#: data/ui/glabels-ui.xml.h:14
-msgid "Center align"
-msgstr "LaÅ­liniiÄ?u centre"
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "_Videbligo"
 
-#: 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:97
+msgid "Customize Main Toolbar"
+msgstr "Personigu Ä?efan ilarstangon"
 
-#: 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:98
+msgid "Customize Drawing Toolbar"
+msgstr "Personigu ilarstangon de desegno"
 
-#: 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:99
+#, fuzzy
+msgid "Customize Properties Toolbar"
+msgstr "Personigu ilarstangon de ecoj"
 
-#: 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:100
+msgid "_Objects"
+msgstr "_Objektoj"
 
-#: 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:101
+#, fuzzy
+msgid "_Create"
+msgstr "_Centre"
 
-#: 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:102
+msgid "_Order"
+msgstr "_Ordo"
 
-#: 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"
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "_Rotacio/Renverso"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr "Fermu"
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
+msgstr "LaÅ­linnigu _Horizontale"
 
-#: data/ui/glabels-ui.xml.h:23
-msgid "Close the current file"
-msgstr "Fermu la nunan dosieron"
+#: ../src/ui.c:105
+msgid "Align _Vertical"
+msgstr "LaÅ­linnigu _Verticale"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr "Agordu la programon"
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "_Helpilo"
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+#, fuzzy
+msgid "Context Menu"
 msgstr "Entenoj"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr "Kopiu"
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "_Nova"
 
-#: data/ui/glabels-ui.xml.h:27
-msgid "Copy the selection"
-msgstr "Kopiu la elektaĵon"
+#: ../src/ui.c:117
+#, fuzzy
+msgid "Create a new file"
+msgstr "Kreu novan dokumenton"
 
-#: data/ui/glabels-ui.xml.h:28
-msgid "Create a custom template"
-msgstr "Kreu personigitan modelon"
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "M_alfermu..."
 
-#: data/ui/glabels-ui.xml.h:29
-msgid "Create a new document"
-msgstr "Kreu novan dokumenton"
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "Malfermu iun dosieron"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "Keu strekkodan objekton"
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "_Konservu"
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "Kreu objekton de areo/rektangulo"
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "Konservu la nunan dosieron"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "Kreu objekton de elipse/circlo"
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "Konservu kiel..."
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "Kreu bildan objekton"
+#: ../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:34
-msgid "Create line object"
-msgstr "Kreu linian objekton"
+#: ../src/ui.c:143
+msgid "_Print..."
+msgstr "_Presu..."
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "Kreu tekstan objekton"
+#: ../src/ui.c:145
+msgid "Print the current file"
+msgstr "Presu la nunan dosieron"
 
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
-msgstr "El_tondu"
+#: ../src/ui.c:150
+#, fuzzy
+msgid "Properties..."
+msgstr "E_coj..."
 
-#: data/ui/glabels-ui.xml.h:37
-msgid "Customize"
-msgstr "Personigu"
+#: ../src/ui.c:152
+msgid "Modify document properties"
+msgstr "Radaktu ecojn de dokumento"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
-msgstr "Personigu ilarstangon de desegno"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr "_Desegnilo de Modeloj..."
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
-msgstr "Personigu Ä?efan ilarstangon"
+#: ../src/ui.c:159
+msgid "Create a custom template"
+msgstr "Kreu personigitan modelon"
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
-msgstr "Personigu ilarstangon de ecoj"
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "_Fermu"
+
+#: ../src/ui.c:166
+msgid "Close the current file"
+msgstr "Fermu la nunan dosieron"
+
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "_Eliro"
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
-msgstr "Personigu ilarstangojn"
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "Eliru el programo"
+
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "Malfaru"
 
-#: data/ui/glabels-ui.xml.h:42
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr "Refaru"
+
+#: ../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"
 
-#: data/ui/glabels-ui.xml.h:46
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
+msgstr "Enmetu la poÅ?on"
+
+#: ../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:29
+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:18
+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:15
+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"
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Show _Tooltips"
-msgstr "Mon_tru Sugestojn"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+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:1141
+msgid "See the file AUTHORS for additional credits,"
+msgstr "Vidigu la dosieron nomitan AUTHORS por pluaj informoj,"
 
-#: 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:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
+msgstr "aÅ­ vizitu http://glabels.sourceforge.net/";
 
-#: 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:1154
+msgid "A label and business card creation program.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show tooltips in the property toolbar"
-msgstr "Vidigu sugestojn en la ilarstango de ecoj"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Template Designer"
-msgstr "Desegnilo de Modeloj"
+#: ../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:117
-msgid "Template _Designer..."
-msgstr "_Desegnilo de Modeloj..."
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "glabels"
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Text color"
-msgstr "Koloro de teksto"
+#: ../src/warning-handler.c:69
+#, fuzzy
+msgid "gLabels Error!"
+msgstr "Agordoj de gLabels"
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "U_n-select All"
-msgstr "Malelektu Ä?io_n"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(nenio) - gLabels"
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Un-select All"
-msgstr "Malelektu Ä?ion"
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(modifita)"
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Undo"
-msgstr "Malfaru"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "Nekorekta radika nodo = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:122
-msgid "Undo the last action"
-msgstr "Nuligu lastan agon"
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "nekorekta nodo = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:123
-msgid "Zoom _1:1"
-msgstr "Zomo je _1:1"
+#: ../src/xml-label.c:189 ../src/xml-label.c:227
+msgid "xmlParseFile error"
+msgstr "Eraro de xml-dosiero de sintaksa analizo"
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Zoom _In"
-msgstr "_Zomo"
+#: ../src/xml-label.c:264
+msgid "No document root"
+msgstr "Neniu radika dokumento"
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Zoom _Out"
-msgstr "_Malzomo"
+#: ../src/xml-label.c:272
+msgid "Importing from glabels 0.1 format"
+msgstr "Importante el formato de glabels 0.1"
 
-#: data/ui/glabels-ui.xml.h:126
-msgid "Zoom to _fit"
-msgstr "AlÄ?ustigu"
+#: ../src/xml-label.c:281
+msgid "Importing from glabels 0.4 format"
+msgstr "Importante el formato de glabels 0.4"
 
-#: data/ui/glabels-ui.xml.h:127
-msgid "Zoom to fit window"
-msgstr "AlÄ?ustigu al la fenestro"
+#: ../src/xml-label.c:291
+#, fuzzy, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "Nekorekta dokumento, nekonata Nomospaco de glabels"
 
-#: data/ui/glabels-ui.xml.h:128
-msgid "_About..."
-msgstr "_Pri..."
+#: ../src/xml-label.c:360
+#, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "nekorekta nodo en nodo de Dokumeto = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:129
-msgid "_Bottoms"
-msgstr "Su_be"
+#: ../src/xml-label.c:856
+#, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "nekorekta nodo en nodo de Datumoj = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Close"
-msgstr "_Fermu"
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr "eraro de konvertado en Utf8."
 
-#: data/ui/glabels-ui.xml.h:133
-msgid "_Contents"
-msgstr "_Entenoj"
+#: ../src/xml-label.c:1104
+msgid "Problem saving xml file."
+msgstr "Problemo laÅ­ konservo de xml-dosiero"
 
-#: data/ui/glabels-ui.xml.h:134
-msgid "_Copy"
-msgstr "_Kopiu"
+#. 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:135
-msgid "_Create Object"
-msgstr "_Kreu Objekton"
+#. 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:136
-msgid "_Debug"
-msgstr "_Sencimigo"
+#: ../libglabels/db.c:650
+msgid ""
+"Unable to locate paper size definitions.  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:1042
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Drawing Toolbar"
-msgstr "Ilarstango de _Desegno"
+#: ../libglabels/db.c:2061
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:140
-msgid "_Edit"
-msgstr "R_edaktu"
+#: ../libglabels/db.c:2128
+#, fuzzy, c-format
+msgid "%s full page label"
+msgstr "Ä?enerala %s plena paÄ?o"
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_File"
-msgstr "_Dosiero"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Grid"
-msgstr "_Krado"
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d por folio"
 
-#: data/ui/glabels-ui.xml.h:144
-msgid "_Help"
-msgstr "_Helpilo"
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s diametro"
 
-#: data/ui/glabels-ui.xml.h:145
-msgid "_Icon"
-msgstr "_Ikono"
+#. 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 "punktoj"
 
-#: data/ui/glabels-ui.xml.h:149
-msgid "_Main Toolbar"
-msgstr "_Ä?efa Ilarstango"
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "coloj"
 
-#: data/ui/glabels-ui.xml.h:150
-msgid "_Merge Properties..."
-msgstr "_Kunfandu Ecojn..."
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
 
-#: data/ui/glabels-ui.xml.h:151
-msgid "_New"
-msgstr "_Nova"
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Objects"
-msgstr "_Objektoj"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:153
-msgid "_Open..."
-msgstr "M_alfermu..."
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Paste"
-msgstr "_Enmetu"
+#. 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:156
-msgid "_Print..."
-msgstr "_Presu..."
+#: ../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:157
-msgid "_Property Toolbar"
-msgstr "Ilarstango de Eco_j"
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Quit"
-msgstr "_Eliro"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Save"
-msgstr "_Konservu"
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:165
-msgid "_View"
-msgstr "_Videbligo"
+#.
+#. * 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
+#, fuzzy
+msgid "<b>Record selection/preview</b>"
+msgstr "Elektado/AntaÅ­montro de rikordo:"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
-msgstr "   "
+#: ../data/ui/merge-properties-dialog.ui.h:2
+#, fuzzy
+msgid "<b>Source</b>"
+msgstr "Fonto"
 
-#: 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:3
+msgid "Format:"
+msgstr "Formato:"
 
-#: 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:4
+msgid "Location:"
+msgstr "LokiÄ?o:"
 
-#: 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:5
+#, fuzzy
+msgid "Select all"
+msgstr "Elektu Ä?ion"
 
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linio</span>"
+#: ../data/ui/merge-properties-dialog.ui.h:6
+#, fuzzy
+msgid "Unselect all"
+msgstr "Malelektu Ä?ion"
 
-#: 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:1
+msgid "Brand:"
+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:2
+msgid "Category:"
+msgstr ""
 
-#: 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:3
+#, fuzzy
+msgid "Custom"
+msgstr "personigita"
 
-#: data/glade/prefs-dialog.glade.h:9 data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "Koloro:"
+#: ../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:10
-msgid "Font:"
-msgstr "Tiparo:"
+#: ../data/ui/media-select.ui.h:5
+#, fuzzy
+msgid "Recent"
+msgstr "Fre_Å?aj Dosieroj"
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "ISO A4"
-msgstr "ISO A4"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Elektu Ä?ion"
 
-#: data/glade/prefs-dialog.glade.h:12
-msgid "Inches"
-msgstr "Coloj"
+#: ../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:13 data/glade/object-editor.glade.h:19
-msgid "Line Spacing:"
-msgstr "Interspaco:"
+#: ../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:14
-msgid "Locale"
-msgstr "Nacia"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Grando de etikedo:"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "Milimetroj"
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "Aspekto:"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
-msgstr "DefaÅ­ltoj de objekto"
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "Formato:"
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "Punktoj"
+#: ../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:18
-msgid "Select default properties for new objects."
-msgstr "Elektu defaÅ­ltajn ecojn por novaj objektoj."
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
-msgstr "Elektu nacian specifan agmanieron."
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "Rotacio"
 
-#. 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:10
+msgid "Select orientation of label content."
+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:11
+msgid "Similar products:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:3
+#: ../data/ui/object-editor.ui.h:3
 msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Xxx ecoj de objekto</span>"
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+msgid "Alignment:"
+msgstr "AlliniÄ?o:"
+
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Angulo:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "Kontrolsumo"
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+msgid "Color:"
+msgstr "Koloro:"
+
+#: ../data/ui/object-editor.ui.h:10
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Familio:"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:12
+msgid "File:"
+msgstr "Dosiero:"
+
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Plenigo"
 
-#: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:14 ../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:16
+msgid "Key:"
+msgstr "Å?losilo:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Longo:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "Linio"
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+msgid "Line Spacing:"
+msgstr "Interspaco:"
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Literalo:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
-msgstr "Å?argu bildon"
+#: ../data/ui/object-editor.ui.h:21
+msgid "Opacity:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "LokiÄ?o"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "Restarigu grandon de bildo"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:24
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Grando"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Grando:"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Stilo"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:28
 msgid "Style:"
 msgstr "Stilo:"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:30 ../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:31
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:33
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "gradoj"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr "fenestr1"
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "ciferoj:"
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:38
 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:2
+msgid "<span weight=\"bold\">Default page size</span>"
+msgstr "<span weight=\"bold\">DefaÅ­lta grando de paÄ?o</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:3
+msgid "<span weight=\"bold\">Fill</span>"
+msgstr "<span weight=\"bold\">Plenigo</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "<span weight=\"bold\">Line</span>"
+msgstr "<span weight=\"bold\">Linio</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:5
+msgid "<span weight=\"bold\">Text</span>"
+msgstr "<span weight=\"bold\">Teksto</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "<span weight=\"bold\">Units</span>"
+msgstr "<span weight=\"bold\">Unitoj</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Font:"
+msgstr "Tiparo:"
+
+#: ../data/ui/prefs-dialog.ui.h:10
+msgid "ISO A4"
+msgstr "ISO A4"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Inches"
+msgstr "Coloj"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Locale"
+msgstr "Nacia"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Millimeters"
+msgstr "Milimetroj"
 
-#: data/glade/template-designer.glade.h:2
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Object defaults"
+msgstr "DefaÅ­ltoj de objekto"
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Points"
+msgstr "Punktoj"
+
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Select default properties for new objects."
+msgstr "Elektu defaÅ­ltajn ecojn por novaj objektoj."
+
+#: ../data/ui/prefs-dialog.ui.h:18
+msgid "Select locale specific behavior."
+msgstr "Elektu nacian specifan agmanieron."
+
+#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr "US·Letero"
+
+#: ../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 +2181,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 +2202,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 +2247,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 +2275,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 +2283,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 +2297,1137 @@ msgstr ""
 "\n"
 "Tio helpos vin por krei personigitan modelon por gLabels."
 
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "Ekzempleroj"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "<b>Merge Control</b>"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Opcioj"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "LaÅ­kajere"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+msgstr "Ekzempleroj:"
+
+#: ../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"
+
 #. ===================================================================
-#: data/templates/avery-us-templates.xml.h:2
-#: data/templates/zweckform-iso-templates.xml.h:2
+#: ../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"
+
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../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 "Document merge control"
+#~ msgstr "Kontrolo de kunfando de dokumento"
+
+#~ 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 "%d x %d  (%d per sheet)"
+#~ msgstr "%d x %d  (%d por folio)"
+
+#~ 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 "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ 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 a9b3fb6..16935a2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,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-05-24 23:49+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-27 22:36-0400\n"
 "PO-Revision-Date: 2010-05-26 08:45+0200\n"
 "Last-Translator: Jorge González <jorgegonz svn gnome org>\n"
 "Language-Team: Español <gnome-es-list gnome org>\n"
@@ -271,31 +271,26 @@ msgstr "Blanco"
 
 #: ../src/color-combo-menu.c:117
 #, fuzzy, no-c-format
-#| msgid "10\\% Gray"
 msgid "10% Gray"
 msgstr "10\\% Gris"
 
 #: ../src/color-combo-menu.c:119
 #, fuzzy, no-c-format
-#| msgid "25\\% Gray"
 msgid "25% Gray"
 msgstr "25\\% Gris"
 
 #: ../src/color-combo-menu.c:121
 #, fuzzy, no-c-format
-#| msgid "40\\% Gray"
 msgid "40% Gray"
 msgstr "40\\% Gris"
 
 #: ../src/color-combo-menu.c:123
 #, fuzzy, no-c-format
-#| msgid "50\\% Gray"
 msgid "50% Gray"
 msgstr "50\\% Gris"
 
 #: ../src/color-combo-menu.c:125
 #, fuzzy, no-c-format
-#| msgid "60\\% Gray"
 msgid "60% Gray"
 msgstr "60\\% Gris"
 
@@ -732,14 +727,12 @@ msgstr "Autocontraer"
 #: ../src/media-select.c:349 ../src/media-select.c:353
 #: ../src/media-select.c:502 ../src/media-select.c:701
 #, fuzzy
-#| msgid "Any"
 msgctxt "Brand"
 msgid "Any"
 msgstr "Cualquiera"
 
 #: ../src/media-select.c:358 ../src/media-select.c:871
 #, fuzzy
-#| msgid "Any"
 msgctxt "Page size"
 msgid "Any"
 msgstr "Cualquiera"
@@ -747,7 +740,6 @@ msgstr "Cualquiera"
 #: ../src/media-select.c:367 ../src/media-select.c:370
 #: ../src/media-select.c:880
 #, fuzzy
-#| msgid "Any"
 msgctxt "Category"
 msgid "Any"
 msgstr "Cualquiera"
@@ -885,7 +877,6 @@ msgstr "Seleccionar producto"
 
 #: ../src/new-label-dialog.c:215
 #, fuzzy
-#| msgid "Label orientation"
 msgid "Choose Orientation"
 msgstr "Orientación de la etiqueta"
 
@@ -893,7 +884,7 @@ msgstr "Orientación de la etiqueta"
 msgid "Review"
 msgstr "Revisar"
 
-#: ../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"
@@ -1781,7 +1772,6 @@ msgstr "Tamaño de la página:"
 
 #: ../data/ui/media-select.ui.h:5
 #, fuzzy
-#| msgid "Recent _Files"
 msgid "Recent"
 msgstr "Archivos _recientes"
 
@@ -2921,14 +2911,12 @@ msgstr "Etiquetas multipropósito"
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:4
 #, fuzzy
-#| msgid "Address Labels"
 msgid "Address Labels (STAMPIT)"
 msgstr "Etiquetas de dirección"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:6
 #, fuzzy
-#| msgid "Diskette labels"
 msgid "Bottle labels"
 msgstr "Etiquetas de disquette"
 
@@ -2940,42 +2928,36 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:12
 #, fuzzy
-#| msgid "Business cards"
 msgid "Business cards high glossy"
 msgstr "Tarjetas de negocio"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:14
 #, fuzzy
-#| msgid "Business cards"
 msgid "Business cards punched"
 msgstr "Tarjetas de negocio"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:16
 #, fuzzy
-#| msgid "Business cards"
 msgid "Business cards punched dull"
 msgstr "Tarjetas de negocio"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:18
 #, fuzzy
-#| msgid "Business cards"
 msgid "Business cards punched glossy"
 msgstr "Tarjetas de negocio"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:22
 #, fuzzy
-#| msgid "Allround labels"
 msgid "Floppy disk labels"
 msgstr "Etiquetas redondas"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:24
 #, fuzzy
-#| msgid "Business cards"
 msgid "Foldable business cards"
 msgstr "Tarjetas de negocio"
 
@@ -2987,21 +2969,18 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:28
 #, fuzzy
-#| msgid "Labels"
 msgid "Labels A4"
 msgstr "Etiquetas"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:30
 #, fuzzy
-#| msgid "Labels"
 msgid "Labels A5"
 msgstr "Etiquetas"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:32
 #, fuzzy
-#| msgid "Labels"
 msgid "Labels A6"
 msgstr "Etiquetas"
 
@@ -3018,7 +2997,6 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:38
 #, fuzzy
-#| msgid "name_page"
 msgid "Name plates"
 msgstr "nombre_de_la_página"
 
@@ -3030,7 +3008,6 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:42
 #, fuzzy
-#| msgid "About glabels"
 msgid "Photo labels"
 msgstr "Acerca de glabels"
 
@@ -3042,7 +3019,6 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:48
 #, fuzzy
-#| msgid "Square labels"
 msgid "SD card labels"
 msgstr "Etiquetas cuadradas"
 
@@ -3059,7 +3035,6 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:54
 #, fuzzy
-#| msgid "Square labels"
 msgid "Self-adhesive labels"
 msgstr "Etiquetas cuadradas"
 
diff --git a/po/fr.po b/po/fr.po
index 05bb005..022c1f0 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-05-27 22:36-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"
diff --git a/po/it.po b/po/it.po
index 09e23b7..dcd6ea5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,1840 +4,2169 @@
 # 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-05-27 22:36-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
+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
+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
+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
+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
+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
+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
+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
+#, 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 "GS1-128"
+msgstr ""
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:109
-msgid "Send to _Back"
-msgstr "Porta in _secondo piano"
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:96
-msgid "Rotate _Left"
-msgstr "Ruota a sinistra"
+#: ../src/bc.c:176
+msgid "IEC18004 (QRCode)"
+msgstr ""
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:97
-msgid "Rotate _Right"
-msgstr "Ruota a destra"
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
+msgstr "Predefinito"
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
-msgstr "Capovolgi _orizzontalmente"
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "rosso scuro"
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
-msgstr "Capovolgi _verticalmente"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:147
-msgid "_Lefts"
-msgstr "_Sinistra"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:159
-msgid "_Rights"
-msgstr "_Destra"
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "verde scuro"
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:131
-msgid "_Centers"
-msgstr "_Centro"
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:164
-msgid "_Tops"
-msgstr "_In alto"
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/stock.c:84
-msgid "Bottoms"
-msgstr "In basso"
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "blu scuro"
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr "Centrato"
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "Ripeti"
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
-msgstr "Etichetta ce_ntrata"
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "arancione"
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
-msgstr "Colore di riempimento"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
 
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
-msgstr "Colore Linea"
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "verde scuro"
 
-#: src/stock.c:90 src/stock.c:92
-msgid "Linked"
-msgstr "Collegato"
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
 
-#: src/stock.c:91 src/stock.c:93
-msgid "Not Linked"
-msgstr "Nessun collegamento"
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "blu"
 
-#: src/ui-property-bar.c:345 src/object-editor.c:499
-msgid "Default"
-msgstr "Predefinito"
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "viola"
 
-#: src/ui-property-bar.c:360 src/object-editor.c:512
-msgid "No fill"
-msgstr "Nessun riempimento"
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
 
-#: src/ui-property-bar.c:375 src/object-editor.c:505
-msgid "No line"
-msgstr "Nessuna linea"
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "oro"
 
-#: src/ui-sidebar.c:180
-msgid "Object properties"
-msgstr "Proprietà oggetto"
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "giallo"
 
-#: 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:102
+#, fuzzy
+msgid "Green"
+msgstr "verde"
 
-#: src/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
-msgstr "oppure visita http://glabels.sourceforge.net/";
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr ""
 
-#: src/commands.c:409
-msgid " "
-msgstr " "
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "Stile"
 
-#: src/commands.c:424
-msgid "glabels"
-msgstr "glabels"
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
 
-#: src/file.c:100
-msgid "New Label or Card"
-msgstr "Nuova etichetta o scheda"
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "rosa"
 
-#: src/file.c:132 src/file.c:304
-msgid "Media Type"
-msgstr "Tipo media"
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
 
-#: src/file.c:138 src/file.c:310
-msgid "Label orientation"
-msgstr "Orientazione etichetta"
+#: ../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/file.c:269
+#: ../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:175 ../src/label.c:584 ../src/label.c:628
 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:52
+#, 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:52 ../src/glabels-batch.c:66
+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:54
+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:54
+msgid "sheets"
+msgstr "fogli"
 
-#: src/view-text.c:563 data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "Testo"
+#: ../src/glabels-batch.c:56
+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:56
+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:58
+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:58
+msgid "first"
+msgstr "primo"
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "Sorgente"
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../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:66
+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:68 ../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:98
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "Seleziona"
+#: ../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 ""
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
-msgstr "Record/campo"
+#: ../src/glabels-batch.c:149
+#, 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:184
+#, 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:483
+msgid "Barcode data empty"
 msgstr ""
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "Opzioni"
+#: ../src/label-barcode.c:487
+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:399
+msgid "Untitled"
+msgstr "Senza nome"
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
+#: ../src/label.c:702 ../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:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Cancella"
 
-#: src/bc.c:75
-msgid "EAN-8"
-msgstr "EAN-8"
+#: ../src/label.c:1217 ../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:1253 ../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:1294
+msgid "Rotate"
+msgstr "Girare"
 
-#: src/bc.c:84
-msgid "EAN-13"
-msgstr "EAN-13"
+#: ../src/label.c:1329 ../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:1362 ../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:1397 ../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:1432 ../src/ui.c:359
+#, fuzzy
+msgid "Flip vertically"
+msgstr "Capovolgi _verticalmente"
 
-#: src/bc.c:96
-msgid "UPC-A"
-msgstr "UPC-A"
+#: ../src/label.c:1472 ../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:1529 ../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:1590 ../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:1666 ../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:1723 ../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:1784 ../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:1862 ../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:1909 ../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:2595 ../src/label.c:2637 ../src/label.c:2663 ../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:161 ../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:265 ../src/label-image.c:336
+#, 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"
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "rosa"
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "Nome font"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Dimesione·font"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Nome font"
+
+#: ../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:272
-msgid "Importing from glabels 0.4 format"
+#: ../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:279
-msgid "Importing from glabels 1.91 format"
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
 msgstr ""
 
-#: src/xml-label.c:282
-msgid "bad document, unknown glabels Namespace"
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
 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\""
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "Nessun modello trovato!"
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
 msgstr ""
 
-#: src/xml-label.c:348 src/xml-label-191.c:165
-#, c-format
-msgid "bad node in Document node =  \"%s\""
+#. 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.c:393 src/xml-label-04.c:123 src/xml-label-191.c:197
-#, c-format
-msgid "bad node =  \"%s\""
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
 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: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/xml-label.c:962 libglabels/xml-template.c:535
-msgid "Utf8 conversion error."
-msgstr "Conversione di errore Utf8."
+#. 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/xml-label.c:969 libglabels/xml-template.c:542
-msgid "Problem saving xml file."
-msgstr "Problema nel salvataggio del file xml"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+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"
+#: ../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-evolution.c:384
+msgid "Couldn't get contacts."
 msgstr ""
 
-#: src/xml-label-191.c:690 libglabels/xml-template.c:209
-#, c-format
-msgid "Unknown page size id or name \"%s\""
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
 msgstr ""
 
-#: src/merge.c:172 src/merge.c:213 src/merge.c:399 src/merge.c:402
-msgid "None"
-msgstr "Nessuno"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: src/merge-init.c:53
-msgid "Text file with comma delimeters (CSV)"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
 msgstr ""
 
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
 msgstr ""
 
-#: src/merge-init.c:67
-msgid "Text file with tab delimeters"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
 msgstr ""
 
-#: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11
-msgid "File:"
-msgstr "File:"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "Chiave:"
+#: ../src/merge-init.c:104
+msgid "Evolution Addressbook"
+msgstr ""
 
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "Fogli:"
+#: ../src/merge-init.c:110
+msgid "VCards"
+msgstr ""
 
-#: src/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "Etichette"
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Proprietà di unione"
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "da:"
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Seleziona sorgente unione-database"
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "a:"
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr ""
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Seleziona"
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "nel 1° foglio"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Record/campo"
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "Copie:"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+msgid "Data"
+msgstr "Dati"
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "Fascicoli"
+#. 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:269 data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "Descrizione:"
+#. 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:279 data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "Dimensioni·pagina:"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Modalità di _selezione"
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "Dimensioni etichetta:"
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "Orientazione etichetta"
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "Layout:"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d  (%d per foglio)"
+#: ../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"
 
-#: src/wdgt-media-select.c:582
-#, c-format
-msgid "%d per sheet"
-msgstr "%d per foglio"
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "Proprietà oggetto"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "Proprietà dell'oggetto area"
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "Proprietà dell'oggetto Ellisse"
 
-#: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s diametro"
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "Proprietà dell'oggetto Linea"
 
-#: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s diametro"
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "Proprietà dell'oggetto Immagine"
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "Girare"
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "Proprietà dell'oggetto Testo"
 
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
-msgid "custom"
-msgstr "personalizzato"
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "Proprietà dell'oggetto Codice a barre"
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
-msgid "Custom Color:"
-msgstr "Colore personalizzato:"
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Inserisci campo unione"
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr "Scegli colore personalizzato"
+#: ../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:579
-msgid "black"
-msgstr "nero"
+#: ../src/object-editor-image-page.c:278
+#, fuzzy
+msgid "All Files"
+msgstr "Tutti i file"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr "Marrone chiaro"
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "Immagine"
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
 msgstr ""
 
-#: src/mygal/color-palette.c:582
-msgid "dark green #2"
-msgstr "verde scuro #2"
+#: ../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:583
-msgid "navy"
-msgstr ""
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "Preferenze gLabels"
 
-#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr "blu scuro"
+#. ===================================================================
+#: ../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 "Etichette"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr ""
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "Modalità di _selezione"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr ""
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "_Testo"
 
-#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr "rosso scuro"
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "_Linea"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
-msgstr ""
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "_Area"
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr "oro"
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "_Ellisse"
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr "verde scuro"
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "_Immagine"
 
-#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr ""
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "_Codice a barre"
 
-#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
-msgid "blue"
-msgstr "blu"
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "Proprietà di _unione"
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr ""
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "_Proprietà·Oggetto"
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-msgstr ""
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "Porta in _primo piano"
 
-#: src/mygal/color-palette.c:599
-msgid "red"
-msgstr "rosso"
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "Porta in _secondo piano"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr "arancione"
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "Ruota a sinistra"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr "tiglio"
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "Ruota a destra"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr ""
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "Capovolgi _orizzontalmente"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr ""
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "Capovolgi _verticalmente"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr ""
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "_Sinistra"
 
-#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
-msgid "purple"
-msgstr "viola"
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "_Destra"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr "grigio"
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "_Centro"
 
-#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
-msgid "magenta"
-msgstr ""
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "_In alto"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
-msgstr ""
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "In basso"
 
-#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
-msgid "yellow"
-msgstr "giallo"
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "Centrato"
 
-#: src/mygal/color-palette.c:612
-msgid "green"
-msgstr "verde"
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "Etichetta ce_ntrata"
 
-#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr ""
+#: ../src/stock.c:95 ../src/stock.c:97
+msgid "Linked"
+msgstr "Collegato"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr ""
+#: ../src/stock.c:96 ../src/stock.c:98
+msgid "Not Linked"
+msgstr "Nessun collegamento"
 
-#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
-msgid "red purple"
-msgstr ""
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "Progettazione di modelli per gLabels"
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
+#: ../src/template-designer.c:461
+msgid "Welcome"
 msgstr ""
 
-#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
-msgid "pink"
-msgstr "rosa"
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "Nome e descrizione"
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
-msgstr ""
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "Dimensione pagina"
 
-#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr ""
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "Forma dell'etichetta o della scheda"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
-msgstr ""
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "Forma dell'etichetta o della scheda"
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
-msgstr ""
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "Dimensioni etichetta"
 
-#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
-msgid "light blue"
-msgstr "blu chiaro"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "Dimensione etichetta (CD/DVD)"
 
-#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
-msgid "light purple"
-msgstr ""
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "Numero di layout"
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr "bianco"
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "Layout"
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
-msgstr ""
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "Progettazione completata"
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr ""
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Progettazione di modelli per gLabels"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
+#: ../src/template-designer.c:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
 msgstr ""
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr ""
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "_File"
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "Nessun modello trovato!"
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "_File Recenti"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr "Altro"
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "_Modifica"
 
-#: libglabels/paper.c:361
-msgid "No paper files found!"
-msgstr "Nessun file paper trovato!"
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "_Visualizza"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
-msgstr "Informazioni su glabels"
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
+msgstr "Personalizza la barra degli strumenti principale"
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr "Informazioni..."
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
+msgstr "Personalizza la barra degli strumenti di disegno"
+
+#: ../src/ui.c:99
+#, fuzzy
+msgid "Customize Properties Toolbar"
+msgstr "Personalizza barra degli strumenti proprietà"
+
+#: ../src/ui.c:100
+msgid "_Objects"
+msgstr "_Oggetti"
+
+#: ../src/ui.c:101
+#, fuzzy
+msgid "_Create"
+msgstr "_Centro"
+
+#: ../src/ui.c:102
+msgid "_Order"
+msgstr "_Ordine"
+
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "_Ruota/capovolgi"
 
-#: data/ui/glabels-ui.xml.h:3
+#: ../src/ui.c:104
 msgid "Align _Horizontal"
 msgstr "Allineamento orizzontale"
 
-#: data/ui/glabels-ui.xml.h:4
+#: ../src/ui.c:105
 msgid "Align _Vertical"
 msgstr "Allineamento _verticale"
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr "Allinea gli oggetti in basso"
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "_Aiuto"
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr "Allinea gli oggetti nel centro orizzontale"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+#, fuzzy
+msgid "Context Menu"
+msgstr "Contenuti"
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr ""
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "_Nuovo"
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr ""
+#: ../src/ui.c:117
+#, fuzzy
+msgid "Create a new file"
+msgstr "Crea un nuovo documento"
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr ""
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "_Apri..."
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr "Allinea gli oggetti al centro verticale"
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "Apri un file"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr "Grassetto"
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "_Salva"
 
-#: data/ui/glabels-ui.xml.h:14
-msgid "Center align"
-msgstr "Allineamento centrato"
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "Salva il file corrente"
 
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
-msgstr ""
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "Salva _con nome..."
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr ""
+#: ../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: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:143
+msgid "_Print..."
+msgstr "Stampa..."
 
-#: 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:145
+msgid "Print the current file"
+msgstr "Stampa il file corrente"
 
-#: 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:150
+#, fuzzy
+msgid "Properties..."
+msgstr "Proprie_tà..."
 
-#: 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:152
+msgid "Modify document properties"
+msgstr "Modifica le proprietà del documento"
 
-#: data/ui/glabels-ui.xml.h:21
-msgid "Change the visibility of the property toolbar in the current window"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
 msgstr ""
-"Cambia la visibilità della barra degli strumenti principale nella finestra "
-"corrente"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr "Chiudi"
+#: ../src/ui.c:159
+msgid "Create a custom template"
+msgstr "Crea un modello personalizzato"
+
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "_Chiudi"
 
-#: data/ui/glabels-ui.xml.h:23
+#: ../src/ui.c:166
 msgid "Close the current file"
 msgstr "Chiudi il file corrente"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr "Configura l'applicazione"
-
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
-msgstr "Contenuti"
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "_Esci"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr "Copia"
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "Esci dal programma"
 
-#: data/ui/glabels-ui.xml.h:27
-msgid "Copy the selection"
-msgstr "Copia la selezione"
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "Annulla"
 
-#: data/ui/glabels-ui.xml.h:28
-msgid "Create a custom template"
-msgstr "Crea un modello personalizzato"
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr "Ripeti"
 
-#: data/ui/glabels-ui.xml.h:29
-msgid "Create a new document"
-msgstr "Crea un nuovo documento"
+#: ../src/ui.c:194
+msgid "Cut"
+msgstr "Taglia"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "Crea oggetto codice a barre"
+#: ../src/ui.c:196
+msgid "Cut the selection"
+msgstr "Taglia la selezione"
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "Crea oggetto area/rettangolo"
+#: ../src/ui.c:201
+msgid "Copy"
+msgstr "Copia"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "Crea oggetto ellisse/cerchio"
+#: ../src/ui.c:203
+msgid "Copy the selection"
+msgstr "Copia la selezione"
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "Crea oggetto immagine"
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
+msgstr "Incolla gli appunti"
 
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
-msgstr "Crea oggetto linea"
+#: ../src/ui.c:217
+msgid "Delete the selected objects"
+msgstr "Cancella gli oggetti selezionati"
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "Crea oggeto testo"
+#: ../src/ui.c:222
+msgid "Select All"
+msgstr "Seleziona tutto"
 
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
-msgstr "_Taglia"
+#: ../src/ui.c:224
+msgid "Select all objects"
+msgstr "Seleziona tutti gli oggetti"
 
-#: data/ui/glabels-ui.xml.h:37
-msgid "Customize"
-msgstr "Personalizza"
+#: ../src/ui.c:229
+msgid "Un-select All"
+msgstr "Deseleziona·tutto"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
-msgstr "Personalizza la barra degli strumenti di disegno"
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "Rimuovi tutte le selezioni"
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
-msgstr "Personalizza la barra degli strumenti principale"
+#: ../src/ui.c:236
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
-msgstr "Personalizza barra degli strumenti proprietà"
+#: ../src/ui.c:238
+msgid "Configure the application"
+msgstr "Configura l'applicazione"
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
-msgstr "Personalizza·le·barre degli strumenti"
+#: ../src/ui.c:245
+#, fuzzy
+msgid "Zoom in"
+msgstr "Zoom _in avanti"
 
-#: data/ui/glabels-ui.xml.h:42
-msgid "Cut"
-msgstr "Taglia"
+#: ../src/ui.c:247
+msgid "Increase magnification"
+msgstr "Incrementa ingradimento"
 
-#: data/ui/glabels-ui.xml.h:43
-msgid "Cut the selection"
-msgstr "Taglia la selezione"
+#: ../src/ui.c:252
+#, fuzzy
+msgid "Zoom out"
+msgstr "Zo_om indietro"
 
-#: data/ui/glabels-ui.xml.h:44
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr "Decrementa ingrandimento"
 
-#: data/ui/glabels-ui.xml.h:45
-msgid "Delete"
-msgstr "Cancella"
-
-#: data/ui/glabels-ui.xml.h:46
-msgid "Delete the selected objects"
-msgstr "Cancella gli oggetti selezionati"
+#: ../src/ui.c:259
+#, fuzzy
+msgid "Zoom 1 to 1"
+msgstr "Zoom _1:1"
 
-#: data/ui/glabels-ui.xml.h:47
-msgid "Drawing toolbar"
-msgstr "Barra degli strumenti di disegno"
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
+msgstr "Ripristina la scala al 100%"
 
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
-msgstr "Scarica XML"
+#: ../src/ui.c:266
+#, fuzzy
+msgid "Zoom to fit"
+msgstr "Adatta"
 
-#: data/ui/glabels-ui.xml.h:49
-msgid "Dump the UI Xml description"
-msgstr ""
+#: ../src/ui.c:268
+#, fuzzy
+msgid "Set scale to fit window"
+msgstr "Adatta alla finestra"
 
-#: data/ui/glabels-ui.xml.h:50
-msgid "Edit merge properties"
-msgstr "Modifica proprietà di unione"
+#: ../src/ui.c:275
+#, fuzzy
+msgid "Select Mode"
+msgstr "Modalità di _selezione"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
-msgstr "Capovolgi oggetto orizzontalmente"
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "Seleziona, muovi e modifica oggetti"
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
-msgstr "Capovolgi oggetto verticalmente"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+msgid "Text"
+msgstr "Testo"
 
-#: data/ui/glabels-ui.xml.h:56
-msgid "Font name"
-msgstr "Nome font"
+#: ../src/ui.c:289
+#, fuzzy
+msgid "Box"
+msgstr "_Area"
 
-#: data/ui/glabels-ui.xml.h:57
-msgid "Font selector"
-msgstr "Selettore font"
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "Crea oggetto area/rettangolo"
 
-#: data/ui/glabels-ui.xml.h:58
-msgid "Font size"
-msgstr "Dimesione·font"
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+msgid "Line"
+msgstr "Linea"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
-msgstr "Icone e _Testo"
+#: ../src/ui.c:303
+#, fuzzy
+msgid "Ellipse"
+msgstr "_Ellisse"
 
-#: data/ui/glabels-ui.xml.h:60
-msgid "Increase magnification"
-msgstr "Incrementa ingradimento"
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "Crea oggetto ellisse/cerchio"
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
-msgstr "Corsivo"
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+msgid "Image"
+msgstr "Immagine"
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
-msgstr "Allinea·a·sinistra"
+#: ../src/ui.c:317
+#, fuzzy
+msgid "Barcode"
+msgstr "_Codice a barre"
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
-msgstr "Larghezza linea"
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:66
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
-msgstr ""
+#: ../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:68
-msgid "Main toolbar"
-msgstr "Barra degli strumenti principale"
+#: ../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:69
-msgid "Markup"
-msgstr "Marcatori"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
+msgstr "Capovolgi oggetto orizzontalmente"
 
-#: data/ui/glabels-ui.xml.h:70
-msgid "Modify document properties"
-msgstr "Modifica le proprietà del documento"
+#: ../src/ui.c:361
+msgid "Flip object vertically"
+msgstr "Capovolgi oggetto verticalmente"
 
-#: data/ui/glabels-ui.xml.h:71
-msgid "New"
-msgstr "Nuovo"
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:72
-msgid "Object property editor"
-msgstr "Editor delle proprietà per l'oggetto"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
+msgstr ""
 
-#: 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:382
+msgid "Align objects to horizontal centers"
+msgstr "Allinea gli oggetti nel centro orizzontale"
 
-#: data/ui/glabels-ui.xml.h:75
-msgid "Open a file"
-msgstr "Apri un file"
+#: ../src/ui.c:389
+#, fuzzy
+msgid "Align objects to top edges"
+msgstr "Allinea gli oggetti in basso"
 
-#: data/ui/glabels-ui.xml.h:76
-msgid "Open the glabels manual"
-msgstr "Apri il manuale di glabels"
+#: ../src/ui.c:396
+#, fuzzy
+msgid "Align objects to bottom edges"
+msgstr "Allinea gli oggetti in basso"
 
-#: data/ui/glabels-ui.xml.h:77
-msgid "Paste"
-msgstr "Incolla"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
+msgstr "Allinea gli oggetti al centro verticale"
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste the clipboard"
-msgstr "Incolla gli appunti"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Pr_eferences..."
-msgstr "Pr_eferenze..."
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:80
-msgid "Preferences"
-msgstr "Preferenze"
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "Modifica proprietà di unione"
 
-#: data/ui/glabels-ui.xml.h:82
-msgid "Print the current file"
-msgstr "Stampa il file corrente"
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr "Contenuti"
 
-#: data/ui/glabels-ui.xml.h:83
-msgid "Proper_ties..."
-msgstr "Proprie_tà..."
+#: ../src/ui.c:433
+#, fuzzy
+msgid "Open glabels manual"
+msgstr "Apri il manuale di glabels"
 
-#: data/ui/glabels-ui.xml.h:84
-msgid "Properties"
-msgstr "Proprietà"
+#: ../src/ui.c:438
+msgid "About..."
+msgstr "Informazioni..."
 
-#: data/ui/glabels-ui.xml.h:85
+#: ../src/ui.c:440
+msgid "About glabels"
+msgstr "Informazioni su glabels"
+
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr "Proprietà della barra degli strumenti"
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Quit"
-msgstr "Esci"
-
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit the program"
-msgstr "Esci dal programma"
-
-#: data/ui/glabels-ui.xml.h:88
-msgid "Raise object to top"
-msgstr ""
-
-#: data/ui/glabels-ui.xml.h:89
-msgid "Recent _Files"
-msgstr "_File Recenti"
-
-#: data/ui/glabels-ui.xml.h:90
-msgid "Redo"
-msgstr "Ripeti"
-
-#: data/ui/glabels-ui.xml.h:91
-msgid "Redo the undone action"
+#: ../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:92
-msgid "Remove all selections"
-msgstr "Rimuovi tutte le selezioni"
-
-#: data/ui/glabels-ui.xml.h:94
-#, no-c-format
-msgid "Restore scale to 100%"
-msgstr "Ripristina la scala al 100%"
-
-#: data/ui/glabels-ui.xml.h:95
-msgid "Right align"
-msgstr "Allineamento a destra"
+#: ../src/ui.c:458
+#, fuzzy
+msgid "Grid"
+msgstr "_Griglia"
 
-#: data/ui/glabels-ui.xml.h:98
-msgid "Rotate object 90 clockwise"
-msgstr "Ruota l'oggetto di 90° in verso orario"
+#: ../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:99
-msgid "Rotate object 90 counter-clockwise"
-msgstr "Ruota l'oggetto di 90° in verso antiorario"
+#: ../src/ui.c:466
+msgid "Markup"
+msgstr "Marcatori"
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Save"
-msgstr "Salva"
+#: ../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:101
-msgid "Save As"
-msgstr "Salva con nome"
+#: ../src/ui.c:479
+msgid "Main toolbar"
+msgstr "Barra degli strumenti principale"
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save _As..."
-msgstr "Salva _con nome..."
+#: ../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:103
-msgid "Save the current file"
-msgstr "Salva il file corrente"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
+msgstr "Barra degli strumenti di disegno"
 
-#: 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: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:105
-msgid "Select All"
-msgstr "Seleziona tutto"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:106
-msgid "Select _All"
-msgstr "Seleziona tutto"
+#: ../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:107
-msgid "Select all objects"
-msgstr "Seleziona tutti gli oggetti"
+#: ../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:108
-msgid "Select, move and modify objects"
-msgstr "Seleziona, muovi e modifica oggetti"
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:110
-msgid "Set main toolbar button style according to desktop default"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Show _Tooltips"
-msgstr "Mostra suggerimenti"
+#: ../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:112
-msgid "Show both icons and texts in the main toolbar"
-msgstr "Mostra icone e testo nella barra degli strumenti principale"
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "glabels"
 
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show tooltips in the drawing toolbar"
-msgstr "Mostra suggerimenti nella barra degli strumenti di disegno"
+#: ../src/warning-handler.c:69
+#, fuzzy
+msgid "gLabels Error!"
+msgstr "Preferenze gLabels"
 
-#: data/ui/glabels-ui.xml.h:114
-msgid "Show tooltips in the main toolbar"
-msgstr "Mostra suggerimenti nella barra degli strumenti principale"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(niente) - gLabels"
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show tooltips in the property toolbar"
-msgstr "Mostra suggerimenti nella barra degli strumenti principale"
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(modificato)"
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Template Designer"
-msgstr "Progettazione modelli"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Template _Designer..."
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#, c-format
+msgid "bad node =  \"%s\""
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Text color"
-msgstr "Colore testo"
+#: ../src/xml-label.c:189 ../src/xml-label.c:227
+msgid "xmlParseFile error"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "U_n-select All"
-msgstr "Deseleziona tutto"
+#: ../src/xml-label.c:264
+msgid "No document root"
+msgstr "Nessun documento radice"
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Un-select All"
-msgstr "Deseleziona·tutto"
+#: ../src/xml-label.c:272
+msgid "Importing from glabels 0.1 format"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Undo"
-msgstr "Annulla"
+#: ../src/xml-label.c:281
+msgid "Importing from glabels 0.4 format"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:122
-msgid "Undo the last action"
-msgstr "Annulla l'ultima azione"
+#: ../src/xml-label.c:291
+#, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:123
-msgid "Zoom _1:1"
-msgstr "Zoom _1:1"
+#: ../src/xml-label.c:360
+#, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Zoom _In"
-msgstr "Zoom _in avanti"
+#: ../src/xml-label.c:856
+#, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Zoom _Out"
-msgstr "Zo_om indietro"
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr "Conversione di errore Utf8."
 
-#: data/ui/glabels-ui.xml.h:126
-msgid "Zoom to _fit"
-msgstr "Adatta"
+#: ../src/xml-label.c:1104
+msgid "Problem saving xml file."
+msgstr "Problema nel salvataggio del file xml"
 
-#: data/ui/glabels-ui.xml.h:127
-msgid "Zoom to fit window"
-msgstr "Adatta alla finestra"
+#. 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:128
-msgid "_About..."
-msgstr "Informazioni..."
+#. 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:129
-msgid "_Bottoms"
-msgstr "In basso"
+#: ../libglabels/db.c:650
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Close"
-msgstr "_Chiudi"
+#: ../libglabels/db.c:1042
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:133
-msgid "_Contents"
-msgstr "_Contenuti"
+#: ../libglabels/db.c:2061
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:134
-msgid "_Copy"
-msgstr "_Copia"
+#: ../libglabels/db.c:2128
+#, c-format
+msgid "%s full page label"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:135
-msgid "_Create Object"
-msgstr "_Crea Oggetto"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Debug"
-msgstr "_Debug"
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d per foglio"
 
-#: data/ui/glabels-ui.xml.h:138
-msgid "_Desktop Default"
-msgstr "Predefinito del desktop"
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s diametro"
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Drawing Toolbar"
-msgstr "Barra degli strumenti di disegno"
+#. 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 "punti"
 
-#: data/ui/glabels-ui.xml.h:140
-msgid "_Edit"
-msgstr "_Modifica"
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "pollici"
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_File"
-msgstr "_File"
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Grid"
-msgstr "_Griglia"
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:144
-msgid "_Help"
-msgstr "_Aiuto"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:145
-msgid "_Icon"
-msgstr "_Icone"
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:149
-msgid "_Main Toolbar"
-msgstr "Barra degli stru_menti principale"
+#. 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:150
-msgid "_Merge Properties..."
-msgstr "Proprietà di unione..."
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:151
-msgid "_New"
-msgstr "_Nuovo"
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Objects"
-msgstr "_Oggetti"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:153
-msgid "_Open..."
-msgstr "_Apri..."
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Paste"
-msgstr "Incolla"
+#.
+#. * 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
+#, fuzzy
+msgid "<b>Record selection/preview</b>"
+msgstr "Selezione/anteprima record:"
 
-#: data/ui/glabels-ui.xml.h:156
-msgid "_Print..."
-msgstr "Stampa..."
+#: ../data/ui/merge-properties-dialog.ui.h:2
+#, fuzzy
+msgid "<b>Source</b>"
+msgstr "Sorgente"
 
-#: data/ui/glabels-ui.xml.h:157
-msgid "_Property Toolbar"
-msgstr "Barra degli strumenti _proprietà"
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Format:"
+msgstr "Formato:"
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Quit"
-msgstr "_Esci"
+#: ../data/ui/merge-properties-dialog.ui.h:4
+msgid "Location:"
+msgstr "Posizione:"
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Save"
-msgstr "_Salva"
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Select all"
+msgstr "Seleziona tutto"
 
-#: data/ui/glabels-ui.xml.h:165
-msgid "_View"
-msgstr "_Visualizza"
+#: ../data/ui/merge-properties-dialog.ui.h:6
+#, fuzzy
+msgid "Unselect all"
+msgstr "Deseleziona·tutto"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
 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/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr "<span weight=\"bold\">Dimensione pagina predefinita</span>"
-
-#: data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr "<span weight=\"bold\">Riempimento</span>"
-
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</span>"
-msgstr "<span weight=\"bold\">Linea</span>"
-
-#: data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">Testo</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\">Unità</span>"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "personalizzato"
 
-#: data/glade/prefs-dialog.glade.h:8 data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "Allineamento:"
+#: ../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:9 data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "Colore:"
+#: ../data/ui/media-select.ui.h:5
+#, fuzzy
+msgid "Recent"
+msgstr "_File Recenti"
 
-#: data/glade/prefs-dialog.glade.h:10
-msgid "Font:"
-msgstr "Carattere:"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Seleziona tutto"
 
-#: 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 "Pollici"
+#: ../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:13 data/glade/object-editor.glade.h:19
-msgid "Line Spacing:"
-msgstr "Spaziatura:"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Dimensioni etichetta:"
 
-#: data/glade/prefs-dialog.glade.h:14
-msgid "Locale"
-msgstr "Impostazioni nazionali"
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "Layout:"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "Millimetri"
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "Formato:"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
-msgstr "Proprietà oggetto"
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr "Parte #:"
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "Punti"
+#: ../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 "Seleziona le proprietà predefinite per i nuovi oggetti."
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "Girare"
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
+#: ../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·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 "Larghezza:"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:3
+#: ../data/ui/object-editor.ui.h:3
 msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+msgid "Alignment:"
+msgstr "Allineamento:"
+
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Angolo:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "Checksum"
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+msgid "Color:"
+msgstr "Colore:"
+
+#: ../data/ui/object-editor.ui.h:10
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Famiglia:"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:12
+msgid "File:"
+msgstr "File:"
+
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Riempimento"
 
-#: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:14 ../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:16
+msgid "Key:"
+msgstr "Chiave:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Lunghezza:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "Linea"
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+msgid "Line Spacing:"
+msgstr "Spaziatura:"
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Letterale:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
-msgstr "Carica immagine"
+#: ../data/ui/object-editor.ui.h:21
+msgid "Opacity:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Posizione"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "Ripristina dimensioni immagine"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:24
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Dimensioni"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Stile"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:28
 msgid "Style:"
 msgstr "Stile:"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "Larghezza:"
+
+#: ../data/ui/object-editor.ui.h:31
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:33
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "gradi"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "cifre:"
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:38
 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:2
+msgid "<span weight=\"bold\">Default page size</span>"
+msgstr "<span weight=\"bold\">Dimensione pagina predefinita</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:3
+msgid "<span weight=\"bold\">Fill</span>"
+msgstr "<span weight=\"bold\">Riempimento</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "<span weight=\"bold\">Line</span>"
+msgstr "<span weight=\"bold\">Linea</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:5
+msgid "<span weight=\"bold\">Text</span>"
+msgstr "<span weight=\"bold\">Testo</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "<span weight=\"bold\">Units</span>"
+msgstr "<span weight=\"bold\">Unità</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Font:"
+msgstr "Carattere:"
+
+#: ../data/ui/prefs-dialog.ui.h:10
+msgid "ISO A4"
+msgstr "ISO A4"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Inches"
+msgstr "Pollici"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Locale"
+msgstr "Impostazioni nazionali"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Millimeters"
+msgstr "Millimetri"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Object defaults"
+msgstr "Proprietà oggetto"
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Points"
+msgstr "Punti"
+
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Select default properties for new objects."
+msgstr "Seleziona le proprietà predefinite per i nuovi oggetti."
+
+#: ../data/ui/prefs-dialog.ui.h:18
+msgid "Select locale specific behavior."
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr "US·Letter"
+
+#: ../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 +2175,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 +2184,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 +2205,1109 @@ 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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "Copie"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "<b>Merge Control</b>"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Opzioni"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "Fascicoli"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+msgstr "Copie:"
+
+#: ../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 "%d x %d  (%d per sheet)"
+#~ msgstr "%d x %d  (%d per foglio)"
+
+#~ 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 "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..1ff4afe 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-05-27 22:36-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,1122 @@ 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/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (ZIP ��)"
+
+#: ../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
+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 "綴ã??è¾¼ã?¿ 2/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
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:176
+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:584 ../src/label.c:628
+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/glabels.c:91
-msgid "- gLabels label designer"
-msgstr "- gLabels ã?©ã??ã?«ã?»ã??ã?¶ã?¤ã??"
+#: ../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:55
+#: ../src/glabels-batch.c:52
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "å?ºå??ã??ã??ã??ã?¡ã?¤ã?«å??ã??æ??å®?ã??ã?? (ã??ã??ã?©ã?«ã?? = \"output.pdf\")"
 
-#: ../src/glabels-batch.c:55 ../src/glabels-batch.c:69
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "ã??ã?¡ã?¤ã?«å??"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr "ç?¨ç´?ã?®æ?° (ã??ã??ã?©ã?«ã?? = 1)"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr "����"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr "ã?³ã??ã?¼ã?®æ?° (ã??ã??ã?©ã?«ã?? = 1)"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "ã?³ã??ã?¼ã?®æ?°"
 
-#: ../src/glabels-batch.c:61
+#: ../src/glabels-batch.c:58
 msgid "first label on first sheet (default=1)"
 msgstr "æ??å??ã?®ã?·ã?¼ã??ã?§æ??å??ã?®ã?©ã??ã?« (ã??ã??ã?©ã?«ã?? = 1)"
 
-#: ../src/glabels-batch.c:61
+#: ../src/glabels-batch.c:58
 msgid "first"
 msgstr "first"
 
-#: ../src/glabels-batch.c:63 ../data/glade/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "端ã?®ã??ã?¼ã?¯ã??æ??ã??ã?¦å?°å?·ã??ã??"
 
-#: ../src/glabels-batch.c:69
+#: ../src/glabels-batch.c:66
 msgid "input file for merging"
 msgstr "ã??ã?¡ã?¤ã?«ã??ã??ã?¼ã?¸ã??ã??"
 
-#: ../src/glabels-batch.c:99
-msgid "- batch process gLabels label files"
-msgstr "- gLabels ã?®ã?©ã??ã?«ã?»ã??ã?¡ã?¤ã?«ã??ã??ã??ã??å?¦ç??ã??ã??"
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[FILE...]"
+
+#: ../src/glabels-batch.c:98
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: ../src/glabels-batch.c:145
+#: ../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 ""
+
+#: ../src/glabels-batch.c:149
 #, 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:184
 #, 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:483
+msgid "Barcode data empty"
+msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??空ã?§ã??"
+
+#: ../src/label-barcode.c:487
+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:399
+msgid "Untitled"
+msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
+
+#: ../src/label.c:702 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "ã??ã?­ã??ã??ã?£ã?®çµ?å??"
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "å??é?¤"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "å??é?¢ã?«æ??ã?£ã?¦ã??ã??"
+
+#: ../src/label.c:1253 ../src/ui.c:331
+msgid "Send to back"
+msgstr "å¾?ã??ã?«ã?¾ã??ã??(_B)"
+
+#: ../src/label.c:1294
+msgid "Rotate"
+msgstr "å??転ã??ã??ã??"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "å·¦ã?«å??転ã??ã??"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "å?³ã?«å??転ã??ã??"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "æ°´å¹³æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
+
+#: ../src/label.c:1472 ../src/ui.c:366
+msgid "Align left"
+msgstr "å·¦å¯?ã??"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr "å?³å¯?ã??"
+
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "中央å¯?ã?? (æ°´å¹³æ?¹å??)"
+
+#: ../src/label.c:1666 ../src/ui.c:387
+msgid "Align tops"
+msgstr "ä¸?å¯?ã??"
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "ä¸?å¯?ã??"
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "中央å¯?ã?? (å??ç?´æ?¹å??)"
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "水平移å??"
+
+#: ../src/label.c:1909 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "å??ç?´ç§»å??"
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
+msgstr "è²¼ã??ä»?ã??"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
+
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution ã?¢ã??ã?¬ã?¹å¸³ã?®ã??ã?¼ã?¿"
+
+#: ../src/merge-init.c:110
+#, 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:9
+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:6
+#: ../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:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
+msgstr ""
+"<span foreground='red' weight='bold'>ã??ã?©ã?³ã??/製é? å??ã?¨ã??ã?¼ã??ç?ªå?·ã??æ?¢å­?ã?®ã??ã?³"
+"ã??ã?¬ã?¼ã??ã?¨å??ã??ã?§ã??ï¼?</span>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -330,393 +1264,285 @@ 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:29
 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:18
 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:15
 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 +1553,85 @@ 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:323
 #, 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:406
 #, 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:189 ../src/xml-label.c:227
 msgid "xmlParseFile error"
 msgstr "xmlParseFile ���"
 
-#: ../src/xml-label.c:234
-msgid "xmlParseDoc error"
-msgstr "xmlParseDoc ���"
-
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:264
 msgid "No document root"
 msgstr "root ã??ã?­ã?¥ã?¡ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../src/xml-label.c:278
+#: ../src/xml-label.c:272
 msgid "Importing from glabels 0.1 format"
 msgstr "gLabels 0.1 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
 
-#: ../src/xml-label.c:287
+#: ../src/xml-label.c:281
 msgid "Importing from glabels 0.4 format"
 msgstr "gLabels 0.4 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
 
-#: ../src/xml-label.c:296
+#: ../src/xml-label.c:291
 #, 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:360
 #, 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:856
 #, 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:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Utf8 å¤?æ??ã?¨ã?©ã?¼ã?§ã??ã??"
 
-#: ../src/xml-label.c:1095
+#: ../src/xml-label.c:1104
 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1472,7 +1639,7 @@ msgstr ""
 "ç?¨ç´?ã?®å¤§ã??ã??ã??å®?義ã??ã??ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ­£ã??ã??ã?¤ã?³"
 "ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1480,7 +1647,7 @@ msgstr ""
 "ã?«ã??ã?´ã?ªã??å®?義ã??ã??ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ­£ã??ã??ã?¤ã?³ã?¹"
 "ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1488,12 +1655,58 @@ msgstr ""
 "ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ­£ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«"
 "ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:1538
-#, c-format
-msgid "Generic %s full page template"
+#: ../libglabels/db.c:2128
+#, 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 ""
+
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d /ã?·ã?¼ã??"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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:40
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "ã??ã?¤ã?³ã??"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../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 +1722,422 @@ 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
+#.
+#. * 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>ã?¬ã?³ã?¼ã??ã?®é?¸æ??/ã??ã?¬ã??ã?¥ã?¼</b>"
 
-#: ../data/glade/merge-properties-dialog.glade.h:2
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "<b>Source</b>"
 msgstr "<b>���</b>"
 
-#: ../data/glade/merge-properties-dialog.glade.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "��:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "å ´æ??:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "å?¨ã?¦é?¸æ??"
 
-#: ../data/glade/merge-properties-dialog.glade.h:6
+#: ../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/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/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/glade/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>ã?©ã??ã?«ã?®å??ã??</b>"
+#: ../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/glade/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>ã?¡ã??ã?£ã?¢ã?®ç¨®é¡?</b>"
+#: ../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/glade/object-editor.glade.h:2
+#: ../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/glade/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/glade/object-editor.glade.h:4
+#: ../data/ui/object-editor.ui.h:3
 msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Xxx ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£</span>"
 
-#: ../data/glade/object-editor.glade.h:5 ../data/glade/prefs-dialog.glade.h:7
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "ä½?ç½®:"
 
-#: ../data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr "è?ªå??ç??ã?«æ??å­?ã??å°?ã??ã??ã??ã?¦çµ?å??ã?§ã??ã??ã??ã??ã?«ã??ã??"
 
-#: ../data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "�度:"
 
-#: ../data/glade/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "ã??ã?§ã??ã?¯ã?µã? "
 
-#: ../data/glade/object-editor.glade.h:9 ../data/glade/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "è?²:"
 
-#: ../data/glade/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "å½±ã??ä»?ã??ã??"
 
-#: ../data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "ã??ã?¡ã??ã?ª:"
 
-#: ../data/glade/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "ã??ã?¡ã?¤ã?«:"
 
-#: ../data/glade/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "å¡?ã??ã?¤ã?¶ã??"
 
-#: ../data/glade/object-editor.glade.h:15
-#: ../data/glade/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:14 ../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:16
 msgid "Key:"
 msgstr "ã?­ã?¼:"
 
-#: ../data/glade/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "é?·ã??:"
 
-#: ../data/glade/object-editor.glade.h:21
-#: ../data/glade/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "è¡?é??:"
 
-#: ../data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "ã?ªã??ã?©ã?«:"
 
-#: ../data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "é??æ??度:"
 
-#: ../data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:23
 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:24
 msgid "Shadow"
 msgstr "å½±"
 
-#: ../data/glade/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "大ã??ã??"
 
-#: ../data/glade/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "大ã??ã??:"
 
-#: ../data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "����"
 
-#: ../data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr "横æ?¹å??ã?®ã?ºã?¬:"
 
-#: ../data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/glade/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "縦æ?¹å??ã?®ã?ºã?¬:"
 
-#: ../data/glade/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/glade/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "度"
 
-#: ../data/glade/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:36
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "æ¡?æ?°:"
 
-#: ../data/glade/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<span weight=\"bold\">Default page size</span>"
 msgstr "<span weight=\"bold\">ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?®å??æ??å?¤</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">å¡?ã??ã?¤ã?¶ã??</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">ç·?</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">æ??å­?</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">å??ä½?</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "ã??ã?©ã?³ã??:"
 
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "ISO A4 ç??"
 
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "ã?¤ã?³ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "����"
 
-#: ../data/glade/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "ã??ã?ª"
 
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "ã??ã?¤ã?³ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/ui/prefs-dialog.ui.h:18
 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:19 ../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/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 +2155,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 +2183,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 +2253,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 +2261,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 +2276,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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "<b>ã?ªã??ã?·ã?§ã?³</b>"
 
-#: ../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 "<b>Merge Control</b>"
+msgstr "<b>å?°å?·ã?®å?¶å¾¡ (çµ?å??)</b>"
 
-#: ../data/glade/template-designer.glade.h:66
-msgid "name_page"
-msgstr "name_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "<b>Options</b>"
+msgstr "<b>ã?ªã??ã?·ã?§ã?³</b>"
 
-#: ../data/glade/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "nlayouts_page"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+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:5
+msgid "Copies:"
+msgstr "ã?³ã??ã?¼:"
 
-#: ../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 +2722,554 @@ 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 ""
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:10
+#: ../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 "å¤?ç?®ç?? 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 "Select A File"
+#~ msgstr "ã??ã?¡ã?¤ã?«ã?®é?¸æ??"
+
+#~ 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..2ea7ba6 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-05-27 22:36-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,2160 @@ 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/glabels.c:58
-msgid "Show item debugging messages."
-msgstr "ì??ì?´í?? ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (ì??ì??)"
 
-#: src/glabels.c:61
-msgid "Show printing debugging messages."
-msgstr "ì?¸ì?? ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (ZIP�)"
 
-#: src/glabels.c:64
-msgid "Show prefs debugging messages."
-msgstr "Prefs ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr "POSTNET-9 (ZIP+4)"
 
-#: src/glabels.c:67
-msgid "Show file debugging messages."
-msgstr "í??ì?¼ ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr "POSTNET-11 (DPBC)"
 
-#: src/glabels.c:70
-msgid "Show document debugging messages."
-msgstr "문ì?? ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr ""
 
-#: src/glabels.c:73
-msgid "Show template debugging messages."
-msgstr "Template ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr "EAN (ì??ì??)"
 
-#: src/glabels.c:76
-msgid "Show paper debugging messages."
-msgstr "Paper ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr "EAN-8"
 
-#: src/glabels.c:79
-msgid "Show xml debugging messages."
-msgstr "XML ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr "EAN-8 +2"
 
-#: src/glabels.c:82
-msgid "Show document merge debugging messages."
-msgstr "Document ì?¬ë°± ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr "EAN-8 +5"
 
-#: src/glabels.c:85
-msgid "Show commands debugging messages."
-msgstr "Command ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr "EAN-13"
 
-#: src/glabels.c:88
-msgid "Show undo debugging messages."
-msgstr "Undo ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr "EAN-13 +2"
 
-#: src/glabels.c:91
-msgid "Show recent debugging messages."
-msgstr "ìµ?ê·¼ì?? ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr "EAN-13 +5"
 
-#: src/glabels.c:94
-msgid "Show window debugging messages."
-msgstr "ì??ë??ì?° ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr "UPC (UPC-A ë??ë?? UPC-E)"
 
-#: src/glabels.c:97
-msgid "Show ui debugging messages."
-msgstr "GUI ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:107
+msgid "UPC-A"
+msgstr "UPC-A"
 
-#: src/glabels.c:100
-msgid "Show property_bar debugging messages."
-msgstr "ì??ì?±ë??구 ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr "UPC-A +2"
 
-#: src/glabels.c:103
-msgid "Show media select widget debugging messages."
-msgstr "ì? í?? ì ?í?? 미ë??ì?´ ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr "UPC-A +5"
 
-#: src/glabels.c:106
-msgid "Show mini preview widget debugging messages."
-msgstr "ì ?í?? ì??ê²? 미리보기 ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:116
+msgid "UPC-E"
+msgstr "UPC-E"
 
-#: src/glabels.c:109
-msgid "Show pixbuf cache debugging messages."
-msgstr "pixbuf cache ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr "UPC-E +2"
 
-#: src/glabels.c:112
-msgid "Show widget debugging messages."
-msgstr "ì ?í?? ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr "UPC-E +5"
 
-#: src/glabels.c:115
-msgid "Show object editor debugging messages."
-msgstr "ê°?ì±? í?¸ì§?기 ë??ë²?ê¹? ë©?ì??ì§?를 ë³´ì?´ê¸°"
+#: ../src/bc.c:125
+msgid "ISBN"
+msgstr "ISBN"
 
-#: src/glabels.c:118
-msgid "Turn on all debugging messages."
-msgstr "모ë?  ë??ë²?ê¹? ë©?ì??ì§? ì¼?기"
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr "ISBN +5"
 
-#: src/glabels.c:187
-msgid "Could not initialize Bonobo!\n"
-msgstr "Bonobo ì´?기í?? í?  ì?? ì??ì??ï¼?\n"
+#: ../src/bc.c:131
+msgid "Code 39"
+msgstr "Code 39"
 
-#: src/glabels-batch.c:48
-msgid "print this message"
-msgstr "ì?´ ë©?ì??ì§?를 ì?¸ì??"
+#: ../src/bc.c:134
+msgid "Code 128"
+msgstr "Code 128"
 
-#: src/glabels-batch.c:50
-msgid "print the version of glabels-batch being used"
-msgstr "gLabel-batch ë²?ì ? ì?¸ì??"
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr "Code 128C"
 
-#: src/glabels-batch.c:52
-msgid "set output filename (default=\"output.ps\")"
-msgstr "ì¶?ë ¥ í??ì?¼ì?´ë¦? ì§?ì ? (기본 = \"output.ps\")"
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr "Code 128B"
 
-#: src/glabels-batch.c:52
-msgid "filename"
-msgstr "í??ì?¼ì?´ë¦?"
+#: ../src/bc.c:143
+msgid "Interleaved 2 of 5"
+msgstr "Interleaved 2 of 5"
 
-#: src/glabels-batch.c:54
-msgid "number of sheets (default=1)"
-msgstr "ì?©ì§? ì??(기본= 1)"
+#: ../src/bc.c:146
+msgid "Codabar"
+msgstr "Codabar"
 
-#: src/glabels-batch.c:54
-msgid "sheets"
-msgstr "��"
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr "MSI"
 
-#: src/glabels-batch.c:56
-msgid "number of copies (default=1)"
-msgstr "ë³µì?¬ ì??(기본= 1)"
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
 
-#: src/glabels-batch.c:56
-msgid "copies"
-msgstr "복�"
+#: ../src/bc.c:155
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
 
-#: src/glabels-batch.c:58
-#: src/print-dialog.c:336
-msgid "print outlines (to test printer alignment)"
-msgstr "ì?¸ê³½ì?  ì?¸ì?? (í??린í?° ì ?ë ¬ í??ì?¤í?¸)"
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
 
-#: src/glabels-batch.c:60
-#: src/print-dialog.c:344
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "거꾸ë¡? ì?¸ì?? (ê±°ì?¸ í?¨ê³¼)"
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
 
-#: src/glabels-batch.c:96
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr "[ì?µì??...] gLabels í??ì?¼..."
+#: ../src/bc.c:176
+msgid "IEC18004 (QRCode)"
+msgstr ""
 
-#: src/glabels-batch.c:116
-#, c-format
-msgid "missing glabels file\n"
-msgstr "gLabel í??ì?¼ì?´ ë³´ì?´ì§? ì??ì??\n"
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
+msgstr "기본"
 
-#: src/glabels-batch.c:157
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "gLabel í??ì?¼  %s ì??(를) ì?´ ì?? ì??ì?µë??ë?¤.\n"
+#: ../src/color-combo-menu.c:83
+#, fuzzy
+msgid "Dark Red"
+msgstr "ì?´ë??ì?´ 빨ê°?ì??"
 
-#: src/window.c:244
-msgid "(none) - gLabels"
-msgstr "(ì??ì??) - gLabels"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/window.c:414
-msgid "(modified)"
-msgstr "(ì??ì ?ë?¨)"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/stock.c:65
-#: data/ui/glabels-ui.xml.h:165
-msgid "_Select Mode"
-msgstr "모ë?? ì? í??(_S)"
+#: ../src/color-combo-menu.c:86
+#, fuzzy
+msgid "Dark Green"
+msgstr "ì?´ë??ì?´ ë?¹ì??"
 
-#: src/stock.c:66
-#: data/ui/glabels-ui.xml.h:166
-msgid "_Text"
-msgstr "ê¸?ì??(_T)"
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
 
-#: src/stock.c:67
-#: data/ui/glabels-ui.xml.h:151
-msgid "_Line"
-msgstr "ì? (_L)"
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/stock.c:68
-#: data/ui/glabels-ui.xml.h:133
-msgid "_Box"
-msgstr "ì?¬ê°?í??(_B)"
+#: ../src/color-combo-menu.c:89
+#, fuzzy
+msgid "Dark Violet"
+msgstr "ì?´ë??ì?´ í??ë??ì??"
 
-#: src/stock.c:69
-#: data/ui/glabels-ui.xml.h:144
-msgid "_Ellipse"
-msgstr "í??ì??(_E)"
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "ì?¬ì?¤í??"
 
-#: src/stock.c:70
-#: data/ui/glabels-ui.xml.h:149
-msgid "_Image"
-msgstr "그림(_I)"
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "ì?¤ë ?ì§?ì??"
 
-#: src/stock.c:71
-#: data/ui/glabels-ui.xml.h:11
-msgid "Bar_code"
-msgstr "ë°?ì½?ë??(_C)"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
 
-#: src/stock.c:72
-msgid "_Merge Properties"
-msgstr "ì?¬ë°± ì??ì?±(_M)"
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "í??í?? ë?¹ì??"
 
-#: src/stock.c:73
-msgid "Object _Properties"
-msgstr "í?­ëª© ì??ì?±(_P)"
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
 
-#: src/stock.c:74
-#: data/ui/glabels-ui.xml.h:13
-msgid "Bring to _Front"
-msgstr "ì??ì?¼ë¡? ë?´ê¸°(_F)"
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "í??ë??ì??"
 
-#: src/stock.c:75
-#: data/ui/glabels-ui.xml.h:110
-msgid "Send to _Back"
-msgstr "�� 보�기(_B)"
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "ì??주ì??"
 
-#: src/stock.c:76
-#: data/ui/glabels-ui.xml.h:97
-msgid "Rotate _Left"
-msgstr "ì?¼ìª½ì?¼ë¡? í??ì ?(_L)"
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
 
-#: src/stock.c:77
-#: data/ui/glabels-ui.xml.h:98
-msgid "Rotate _Right"
-msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? í??ì ?(_R)"
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "ê¸?ì??"
 
-#: src/stock.c:78
-#: data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
-msgstr "ì??ì§? ë?¤ì§?기(_H)"
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "ë?¸ë??ì??"
 
-#: src/stock.c:79
-#: data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
-msgstr "ì??í?? ë?¤ì§?기(_V)"
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "ë?¹ì??"
 
-#: src/stock.c:80
-#: data/ui/glabels-ui.xml.h:150
-msgid "_Lefts"
-msgstr "�측(_L)"
+#: ../src/color-combo-menu.c:103
+#, fuzzy
+msgid "Cyan"
+msgstr "ì²­ë¡?ì??"
 
-#: src/stock.c:81
-#: data/ui/glabels-ui.xml.h:162
-msgid "_Rights"
-msgstr "�측(_R)"
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "í??ë??ì??"
 
-#: src/stock.c:82
-#: data/ui/glabels-ui.xml.h:134
-msgid "_Centers"
-msgstr "ì¤?ì??(_C)"
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
 
-#: src/stock.c:83
-#: data/ui/glabels-ui.xml.h:167
-msgid "_Tops"
-msgstr "ì??ì??(_T)"
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "ë¶?í??ì??"
 
-#: src/stock.c:84
-msgid "Bottoms"
-msgstr "í??ì??"
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr "ì¤?ì??"
+#: ../src/color-combo-menu.c:109
+#, fuzzy
+msgid "Light Yellow"
+msgstr "ê°?ë²¼ì?´ ë?¸ë??ì??"
 
-#: src/stock.c:86
-#: src/stock.c:87
-#: data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
-msgstr "ë?¼ë²¨ ì¤?ì??(_N)"
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "ê°?ë²¼ì?´ ë?¹ì??"
 
-#: src/stock.c:88
-#: data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
-msgstr "ì?? ì±?ì?°ê¸°"
+#: ../src/color-combo-menu.c:111
+#, fuzzy
+msgid "Light Cyan"
+msgstr "ê°?ë²¼ì?´ ì²­ë¡?ì??"
 
-#: src/stock.c:89
-#: data/ui/glabels-ui.xml.h:64
-msgid "Line color"
-msgstr "ì?  ì??ì??"
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
 
-#: src/stock.c:90
-#: src/stock.c:92
-msgid "Linked"
-msgstr "ì?°ê²°"
+#: ../src/color-combo-menu.c:113
+#, fuzzy
+msgid "Thistle"
+msgstr "í?°ì??"
 
-#: src/stock.c:91
-#: src/stock.c:93
-msgid "Not Linked"
-msgstr "ì?°ê²°ë??ì§? ì??ì??"
+#: ../src/color-combo-menu.c:115
+#, fuzzy
+msgid "White"
+msgstr "í?°ì??"
 
-#: src/ui-property-bar.c:345
-#: src/object-editor.c:499
-msgid "Default"
-msgstr "기본"
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr ""
 
-#: src/ui-property-bar.c:360
-#: src/object-editor.c:512
-msgid "No fill"
-msgstr "ì±?ì?°ê¸° ì??ì??"
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr ""
 
-#: src/ui-property-bar.c:375
-#: src/object-editor.c:505
-msgid "No line"
-msgstr "ì?  ì??ì??"
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr ""
 
-#: src/ui-sidebar.c:180
-msgid "Object properties"
-msgstr "í?­ëª© ì??ì?±"
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+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:125
+#, no-c-format
+msgid "60% Gray"
 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:126
+#, fuzzy
+msgid "Black"
+msgstr "ê²?ì??ì??"
 
-#: src/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
-msgstr "ë??ë?? ì?´ê³³ì?? 방문 í??ì?¸ì??. http://glabels.sourceforge.net/";
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+#, fuzzy
+msgid "Custom Color"
+msgstr "ì??ì??ì?? ì??ì??:"
 
-#: src/commands.c:409
-msgid " "
-msgstr " "
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "ì??ì??ì?? ì??ì??:"
 
-#: src/commands.c:424
-msgid "glabels"
-msgstr "gLabels"
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr ""
 
-#: src/file.c:100
+#: ../src/file.c:84
 msgid "New Label or Card"
 msgstr "ì?? ë?¼ë²¨ ë??ë?? ì¹´ë??"
 
-#: src/file.c:132
-#: src/file.c:304
-msgid "Media Type"
-msgstr "매체 í??ì??"
-
-#: src/file.c:138
-#: src/file.c:310
-msgid "Label orientation"
-msgstr "ë?¼ë²¨ì?? ë°©í?¥"
-
-#: src/file.c:269
+#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
 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/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:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
 
-#: src/prefs.c:160
-msgid "mm"
-msgstr "[�리미�]"
+#: ../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 "gLabels í??ê²½ì?¤ì ?"
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
 
-#.
-#. * Submenu: Order
-#.
-#: src/view.c:3570
-#: data/ui/glabels-ui.xml.h:157
-msgid "_Order"
-msgstr "ì??ì??(_O)"
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "모ë?  í??ì?¼"
 
 #.
-#. * 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:3591
-#: data/ui/glabels-ui.xml.h:163
-msgid "_Rotate/Flip"
-msgstr "í??ì ?/ë?¤ì§?기(_R)"
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
 
-#.
-#. * Submenu: Align Horizontally
-#.
-#: src/view.c:3624
-msgid "Align _Horizontally"
-msgstr "ê°?ë¡?ë¡? ì ?ë ¬(_H)"
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
 
-#.
-#. * Submenu: Align Vertically
-#.
-#: src/view.c:3663
-msgid "Align _Vertically"
-msgstr "��� �렬(_V)"
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
 
-#: src/view.c:3724
-#: data/ui/glabels-ui.xml.h:140
-msgid "_Delete"
-msgstr "ì?­ì ?(_D)"
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
 
-#. Build editor.
-#: src/view-box.c:223
-msgid "Box object properties"
-msgstr "ì?¬ê°?í?? ê°?ì²´ ì??ì?±"
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
+msgstr ""
 
-#. Build editor.
-#: src/view-ellipse.c:223
-msgid "Ellipse object properties"
-msgstr "í??ì?? ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:52
+#, fuzzy
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "ì¶?ë ¥ í??ì?¼ì?´ë¦? ì§?ì ? (기본 = \"output.ps\")"
 
-#. Build editor.
-#: src/view-line.c:223
-msgid "Line object properties"
-msgstr "ì?  ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+msgid "filename"
+msgstr "í??ì?¼ì?´ë¦?"
 
-#. Build editor.
-#: src/view-image.c:222
-msgid "Image object properties"
-msgstr "그림 ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:54
+msgid "number of sheets (default=1)"
+msgstr "ì?©ì§? ì??(기본= 1)"
 
-#. Build editor.
-#: src/view-text.c:250
-msgid "Text object properties"
-msgstr "ê¸?ì?? ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:54
+msgid "sheets"
+msgstr "��"
 
-#: src/view-text.c:562
-#: data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "ê¸?ì??"
+#: ../src/glabels-batch.c:56
+msgid "number of copies (default=1)"
+msgstr "ë³µì?¬ ì??(기본= 1)"
 
-#. Build editor.
-#: src/view-barcode.c:209
-msgid "Barcode object properties"
-msgstr "ë°?ì½?ë?? ê°?ì²´ ì??ì?±"
+#: ../src/glabels-batch.c:56
+msgid "copies"
+msgstr "복�"
 
-#: src/view-barcode.c:579
-#: src/print.c:1088
-msgid "Invalid barcode data"
-msgstr "ì??못ë?? ë°?ì½?ë?? ë?°ì?´í?°"
+#: ../src/glabels-batch.c:58
+#, fuzzy
+msgid "first label on first sheet (default=1)"
+msgstr "ì?©ì§? ì??(기본= 1)"
 
-#: src/merge-properties-dialog.c:231
-msgid "Merge Properties"
-msgstr "ì?¬ë°± ì??ì?±"
+#: ../src/glabels-batch.c:58
+msgid "first"
+msgstr ""
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "ì??ì?¤"
+#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "ì?¸ê³½ì?  ì?¸ì?? (í??린í?° ì ?ë ¬ í??ì?¤í?¸)"
 
-#: src/merge-properties-dialog.c:245
-msgid "Format:"
-msgstr "ì??ì??:"
+#: ../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 "거꾸ë¡? ì?¸ì?? (ê±°ì?¸ í?¨ê³¼)"
 
-#. Location line
-#: src/merge-properties-dialog.c:273
-msgid "Location:"
-msgstr "ì?¥ì??:"
+#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
+msgstr "ì??르기 í??ì?? ì?¸ì??"
 
-#: src/merge-properties-dialog.c:282
-#: src/merge-properties-dialog.c:393
-msgid "Select merge-database source"
-msgstr "ë³?í?© ë?°ì?´í?°ë² ì?´ì?¤ ì??ì?¤ ì? í??"
+#: ../src/glabels-batch.c:66
+msgid "input file for merging"
+msgstr ""
 
-#: src/merge-properties-dialog.c:289
-#: src/merge-properties-dialog.c:404
-msgid "N/A"
-msgstr "N/A"
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr ""
 
-#. ---- Sample Fields section ----
-#: src/merge-properties-dialog.c:300
-msgid "Record selection/preview:"
-msgstr "ì? í?? 기ë¡?/미리보기:"
+#: ../src/glabels-batch.c:98
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "ì? í??"
+#: ../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 ""
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
-msgstr "기ë¡?/ë²?ì??"
+#: ../src/glabels-batch.c:149
+#, fuzzy, c-format
+msgid "cannot perform document merge with 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-batch.c:184
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "gLabel í??ì?¼  %s ì??(를) ì?´ ì?? ì??ì?µë??ë?¤.\n"
 
-#: src/print-dialog.c:266
-#: data/ui/glabels-ui.xml.h:82
-msgid "Print"
-msgstr "ì?¸ì??"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr ""
 
-#: src/print-dialog.c:281
-msgid "_Job"
-msgstr "ì??ì??(_J)"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "ë°?ì½?ë?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/print-dialog.c:286
-msgid "P_rinter"
-msgstr "í??린í?°(_R)"
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "ë°?ì½?ë??(_C)"
 
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:314
-msgid "Copies"
-msgstr "매ì??"
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "ë°?ì½?ë?? ê°?ì²´ ì??ì?±"
 
-#. ------- Add merge control widget ------------
-#: src/print-dialog.c:322
-msgid "Document merge control"
-msgstr "문ì?? ì?¬ë°± ì ?ì?´"
+#: ../src/label-barcode.c:483
+msgid "Barcode data empty"
+msgstr ""
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "ì?µì??"
+#: ../src/label-barcode.c:487
+msgid "Invalid barcode data"
+msgstr "ì??못ë?? ë°?ì½?ë?? ë?°ì?´í?°"
 
-#: src/print-dialog.c:351
-msgid "print crop marks"
-msgstr "ì??르기 í??ì?? ì?¸ì??"
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "ê¸?ì?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/print-dialog.c:553
-#: src/print-dialog.c:592
-msgid "Print preview"
-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/template-designer.c:409
-#: data/glade/template-designer.glade.h:73
-msgid "gLabels Template Designer"
-msgstr "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 "ì?  ì??ì??"
 
-#: src/bc.c:60
-msgid "POSTNET (any)"
-msgstr "POSTNET (ì??ì??)"
+#: ../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:63
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (ZIP�)"
+#: ../src/label.c:399
+msgid "Untitled"
+msgstr "ì ?목ì??ì??"
 
-#: src/bc.c:66
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP+4)"
+#: ../src/label.c:702 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "ì?¬ë°± ì??ì?±"
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "ì?­ì ?"
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr "EAN (ì??ì??)"
+#: ../src/label.c:1217 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "ì??ì?¼ë¡? ë?´ê¸°(_F)"
 
-#: src/bc.c:75
-msgid "EAN-8"
-msgstr "EAN-8"
+#: ../src/label.c:1253 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "�� 보�기(_B)"
 
-#: src/bc.c:78
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
+#: ../src/label.c:1294
+msgid "Rotate"
+msgstr "í??ì ?"
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
+#: ../src/label.c:1329 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "ì?¼ìª½ì?¼ë¡? í??ì ?(_L)"
 
-#: src/bc.c:84
-msgid "EAN-13"
-msgstr "EAN-13"
+#: ../src/label.c:1362 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? í??ì ?(_R)"
 
-#: src/bc.c:87
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
+#: ../src/label.c:1397 ../src/ui.c:352
+#, fuzzy
+msgid "Flip horizontally"
+msgstr "ì??ì§? ë?¤ì§?기(_H)"
 
-#: src/bc.c:90
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
+#: ../src/label.c:1432 ../src/ui.c:359
+#, fuzzy
+msgid "Flip vertically"
+msgstr "ì??í?? ë?¤ì§?기(_V)"
 
-#: src/bc.c:93
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A ë??ë?? UPC-E)"
+#: ../src/label.c:1472 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "ì??ì¹?:"
 
-#: src/bc.c:96
-msgid "UPC-A"
-msgstr "UPC-A"
+#: ../src/label.c:1529 ../src/ui.c:373
+#, fuzzy
+msgid "Align right"
+msgstr "��� �렬(_H)"
 
-#: src/bc.c:99
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
+#: ../src/label.c:1590 ../src/ui.c:380
+#, fuzzy
+msgid "Align horizontal center"
+msgstr "ê°?ì²´ ì?¸ë¡? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: src/bc.c:102
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
+#: ../src/label.c:1666 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "ê°?ì²´ ì??ì??ë¡? ì ?ë ¬"
 
-#: src/bc.c:105
-msgid "UPC-E"
-msgstr "UPC-E"
+#: ../src/label.c:1723 ../src/ui.c:394
+#, fuzzy
+msgid "Align bottoms"
+msgstr "ê°?ì²´ ì??ë??ë¡? ì ?ë ¬"
 
-#: src/bc.c:108
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
+#: ../src/label.c:1784 ../src/ui.c:401
+#, fuzzy
+msgid "Align vertical center"
+msgstr "ê°?ì²´ ì??í?? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: src/bc.c:111
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
+#: ../src/label.c:1862 ../src/ui.c:408
+#, fuzzy
+msgid "Center horizontally"
+msgstr "ì??ì§? ê°?ì²´ ë?¤ì§?기"
 
-#: src/bc.c:114
-msgid "ISBN"
-msgstr "ISBN"
+#: ../src/label.c:1909 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "ì??í?? ê°?ì²´ ë?¤ì§?기"
 
-#: src/bc.c:117
-msgid "ISBN +5"
-msgstr "ISBN +5"
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
+msgstr "��기"
 
-#: src/bc.c:120
-msgid "Code 39"
-msgstr "Code 39"
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "� �체 ��기"
 
-#: src/bc.c:123
-msgid "Code 128"
-msgstr "Code 128"
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "그림 �체 ��기"
 
-#: src/bc.c:126
-msgid "Code 128C"
-msgstr "Code 128C"
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, fuzzy
+msgid "Set image"
+msgstr "그림�기 ���"
 
-#: src/bc.c:129
-msgid "Code 128B"
-msgstr "Code 128B"
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "� �체 ��기"
 
-#: 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 "�� �기:"
 
-#: 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 "ì ?목ì??ì??"
+#: ../src/label-object.c:1276
+msgid "Shadow color"
+msgstr ""
 
-#: src/xml-label.c:176
-#: src/xml-label.c:213
-msgid "xmlParseFile error"
-msgstr "xmlParseí??ì?¼ ì?¤ë¥?"
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
+msgstr ""
 
-#: src/xml-label.c:250
-msgid "No document root"
-msgstr "root 문ì??ê°? ì??ë??"
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "ê¸?ì?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: src/xml-label.c:264
-msgid "Importing from glabels 0.1 format"
-msgstr "gLabels 0.1� �� �져�기"
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "ë¶?í??ì??"
 
-#: src/xml-label.c:272
-msgid "Importing from glabels 0.4 format"
-msgstr "gLabels 0.4� �� �져�기"
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "�꼴"
 
-#: src/xml-label.c:279
-msgid "Importing from glabels 1.91 format"
-msgstr "gLabels 1.91� �� �져�기"
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "�꼴 �기"
 
-#: src/xml-label.c:282
-msgid "bad document, unknown glabels Namespace"
-msgstr "ì??못ë?? 문ì??, ì?? ì?? ì??ë?? Glabels ì?´ë¦?ê³µê°?"
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+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:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+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:721
+#, fuzzy
+msgid "Align text"
+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:754
+#, fuzzy
+msgid "Line spacing"
+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:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "ê¸?ì?? ì??ì??"
 
-#: src/xml-label.c:962
-#: libglabels/xml-template.c:535
-msgid "Utf8 conversion error."
-msgstr "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 "XML í??ì?¼ ì ?ì?¥ì?? 문ì ?ê°? ì??ì?µë??ë?¤."
+#: ../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 "ì?? ì?? ì??ë?? ì?©ì§? í?¬ê¸° ID \"%s\"ã??å??å??ã?¨ã??ã?¦æ?±ã??ã?¾ã??ã??"
+#: ../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 "ì?? ì?? ì??ë?? ì?©ì§? í?¬ê¸° ID ë??ë?? ì?´ë¦? \"%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
-msgid "None"
-msgstr "ì??ì??"
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "ì??ì??í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
 
-#: src/merge-init.c:53
-msgid "Text file with comma delimeters (CSV)"
-msgstr "콤ë§?ë¡? 구ë¶?ë?? í??ì?¤í?¸í??ì?¼(CSV)"
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr ""
 
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
-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/merge-init.c:67
-msgid "Text file with tab delimeters"
-msgstr "í??ì?¼ë¡? 구ë¶?ë?? í??ì?¤í?¸ í??ì?¼"
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr ""
 
-#: src/wdgt-image-select.c:201
-#: data/glade/object-editor.glade.h:11
-msgid "File:"
-msgstr "í??ì?¼:"
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "ì??ì??í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
 
-#: src/wdgt-image-select.c:245
-#: data/glade/object-editor.glade.h:16
-msgid "Key:"
-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 ""
 
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-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/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "�벨"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "��:"
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+#, fuzzy
+msgid "Couldn't open addressbook."
+msgstr "\"%s\" í??ì?¼ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "ì??ê²?:"
+#: ../src/merge-evolution.c:348
+#, fuzzy
+msgid "Couldn't list available fields."
+msgstr "\"%s\" í??ì?¼ì?? ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr "ë?¼ë²¨ì?? ì??ì??"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr ""
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "첫ë²?째 ì?©ì§?ì??ì??"
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "매ì??:"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "�본"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
 
-#: src/wdgt-media-select.c:269
-#: data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "��:"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-media-select.c:279
-#: data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "�� �기:"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "�벨 �기:"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "ë°°ì¹?:"
+#: ../src/merge-init.c:104
+msgid "Evolution Addressbook"
+msgstr ""
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d  (ì?©ì§?ì?? %d)"
+#: ../src/merge-init.c:110
+msgid "VCards"
+msgstr ""
 
-#: src/wdgt-media-select.c:582
-#, c-format
-msgid "%d per sheet"
-msgstr "ì?©ì§?ì?? %d"
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "ì?¬ë°± ì??ì?±"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "ë³?í?© ë?°ì?´í?°ë² ì?´ì?¤ ì??ì?¤ ì? í??"
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: src/wdgt-media-select.c:630
-#: src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-msgstr "�� %s %s"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "ì? í??"
 
-#: src/wdgt-media-select.c:634
-#: src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "�� %.5g %s"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "기ë¡?/ë²?ì??"
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "í??ì ?"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+msgid "Data"
+msgstr "ë?°ì?´í?°"
 
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
-msgid "custom"
-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 "Fixed"
+msgstr "í??ì?¼:"
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
-msgid "Custom Color:"
-msgstr "ì??ì??ì?? ì??ì??:"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr "ì??ì??ì?? ì??ì?? ì? í??"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "모ë?? ì? í??(_S)"
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-msgstr "ê²?ì??ì??"
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "ë?¼ë²¨ì?? ë°©í?¥"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr "ë°?ì?? ê°?ì??"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
-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:582
-msgid "dark green #2"
-msgstr "ì?´ë??ì?´ ë?¹ì?? #2"
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+msgid "Object properties"
+msgstr "í?­ëª© ì??ì?±"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
-msgstr "ë?¨ì??"
+#: ../src/object-editor.c:309
+msgid "Box object properties"
+msgstr "ì?¬ê°?í?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:584
-#: src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr "ì?´ë??ì?´ í??ë??ì??"
+#: ../src/object-editor.c:328
+msgid "Ellipse object properties"
+msgstr "í??ì?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr "ì??주ì?? #2"
+#: ../src/object-editor.c:347
+msgid "Line object properties"
+msgstr "ì?  ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr "매ì?° ì?´ë??ì?´ í??ì??"
+#: ../src/object-editor.c:364
+msgid "Image object properties"
+msgstr "그림 ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:589
-#: src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr "ì?´ë??ì?´ 빨ê°?ì??"
+#: ../src/object-editor.c:381
+msgid "Text object properties"
+msgstr "ê¸?ì?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
-msgstr "ì ?ì?¤ë ?ì§?ì??"
+#: ../src/object-editor.c:403
+msgid "Barcode object properties"
+msgstr "ë°?ì½?ë?? ê°?ì²´ ì??ì?±"
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr "ê¸?ì??"
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "ë³?í?© í??ë?? ì?½ì??"
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-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:593
-#: src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr "í??í?? í??ë??ì??"
+#: ../src/object-editor-image-page.c:278
+#, fuzzy
+msgid "All Files"
+msgstr "모ë?  í??ì?¼"
 
-#: src/mygal/color-palette.c:594
-#: src/mygal/color-palette.c:647
-msgid "blue"
-msgstr "í??ë??ì??"
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "그림"
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr "í??í?? ì??주ì??"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
+msgstr ""
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-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:599
-msgid "red"
-msgstr "빨ê°?ì??"
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "gLabels í??ê²½ì?¤ì ?"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr "ì?¤ë ?ì§?ì??"
+#. ===================================================================
+#: ../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 "�벨"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr "ë?¼ì??ì??"
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "모ë?? ì? í??(_S)"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr "í??í?? ë?¹ì??"
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "ê¸?ì??(_T)"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr "í??í?? í??ë??ì??#2"
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "ì? (_L)"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr "í??ë??ì?? #2"
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "ì?¬ê°?í??(_B)"
 
-#: src/mygal/color-palette.c:605
-#: src/mygal/color-palette.c:644
-msgid "purple"
-msgstr "ì??주ì??"
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "í??ì??(_E)"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr "í??ì??"
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "그림(_I)"
 
-#: src/mygal/color-palette.c:609
-#: src/mygal/color-palette.c:641
-msgid "magenta"
-msgstr "ë§?ì  í??ì??"
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "ë°?ì½?ë??(_C)"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
-msgstr "ë°?ì?? ì?¤ë ?ì§?ì??"
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "ì?¬ë°± ì??ì?±(_M)"
 
-#: src/mygal/color-palette.c:611
-#: src/mygal/color-palette.c:642
-msgid "yellow"
-msgstr "ë?¸ë??ì??"
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "í?­ëª© ì??ì?±(_P)"
 
-#: src/mygal/color-palette.c:612
-msgid "green"
-msgstr "ë?¹ì??"
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "ì??ì?¼ë¡? ë?´ê¸°(_F)"
 
-#: src/mygal/color-palette.c:613
-#: src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr "ì²­ë¡?ì??"
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "�� 보�기(_B)"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr "ë°?ì?? í??ë??ì??"
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "ì?¼ìª½ì?¼ë¡? í??ì ?(_L)"
 
-#: src/mygal/color-palette.c:615
-#: src/mygal/color-palette.c:632
-msgid "red purple"
-msgstr "빨ê°? ì??주ì??"
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "ì?¤ë¥¸ìª½ì?¼ë¡? í??ì ?(_R)"
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
-msgstr "ê°?ë²¼ì?´ í??ì??"
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "ì??ì§? ë?¤ì§?기(_H)"
 
-#: src/mygal/color-palette.c:619
-#: src/mygal/color-palette.c:636
-msgid "pink"
-msgstr "ë¶?í??ì??"
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "ì??í?? ë?¤ì§?기(_V)"
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
-msgstr "ê°?ë²¼ì?´ ì?¤ë ?ì§?ì??"
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "�측(_L)"
 
-#: src/mygal/color-palette.c:621
-#: src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr "ê°?ë²¼ì?´ ë?¸ë??ì??"
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "�측(_R)"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
-msgstr "ê°?ë²¼ì?´ ë?¹ì??"
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "ì¤?ì??(_C)"
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
-msgstr "ê°?ë²¼ì?´ ì²­ë¡?ì??"
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "ì??ì??(_T)"
 
-#: src/mygal/color-palette.c:624
-#: src/mygal/color-palette.c:634
-msgid "light blue"
-msgstr "ê°?ë²¼ì?´ ë°?ë??ì??"
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "í??ì??"
 
-#: src/mygal/color-palette.c:625
-#: src/mygal/color-palette.c:638
-msgid "light purple"
-msgstr "ê°?ë²¼ì?´ ì??주ì??"
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "ì¤?ì??"
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr "í?°ì??"
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "ë?¼ë²¨ ì¤?ì??(_N)"
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
-msgstr "ì??주ë¹? í??ë??ì??"
+#: ../src/stock.c:95 ../src/stock.c:97
+msgid "Linked"
+msgstr "ì?°ê²°"
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr "ì?´ë??ì?´ ì??주ì??"
+#: ../src/stock.c:96 ../src/stock.c:98
+msgid "Not Linked"
+msgstr "ì?°ê²°ë??ì§? ì??ì??"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr "í??ë??ì??"
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "gLabels ì??ì?? ë??ì??ì?´ë??"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr "Generic %s ì ?ë©´ì?? 걸ì¹?"
+#: ../src/template-designer.c:461
+msgid "Welcome"
+msgstr ""
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "ì??ì??í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
+#: ../src/template-designer.c:500
+msgid "Name and Description"
+msgstr "��과 ��"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr "����"
+#: ../src/template-designer.c:548
+msgid "Page Size"
+msgstr "�� �기"
 
-#: libglabels/paper.c:361
-msgid "No paper files found!"
-msgstr "ì?©ì§? í??ì?¼ì?? ì°¾ì?? ì?? ì??ì??!"
+#: ../src/template-designer.c:614
+msgid "Label or Card Shape"
+msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë?? ì?¸í??"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
-msgstr "gLabelsì?? ë??í?´"
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "ë?¼ë²¨ ë??ë?? ì¹´ë?? ì?¸í??"
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr "ì ?ë³´..."
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "�벨 �기 (��기)"
 
-#: data/ui/glabels-ui.xml.h:3
-msgid "Align _Horizontal"
-msgstr "��� �렬(_H)"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
+msgstr "�벨 �기(CD/DVD)"
 
-#: data/ui/glabels-ui.xml.h:4
-msgid "Align _Vertical"
-msgstr "ê°?ë¡?ë¡? ì ?ë ¬(_V)"
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
+msgstr "ë ?ì?´ì??ì?? ì? í??"
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr "ê°?ì²´ ì??ë??ë¡? ì ?ë ¬"
+#: ../src/template-designer.c:1000
+msgid "Layout(s)"
+msgstr "ë ?ì?´ì??ì??"
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr "ê°?ì²´ ì?¸ë¡? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
+msgstr "ì??ì?? ë??ì??ì?¸ ì??ë£?ë?¨"
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr "ê°?ì²´ ì¢?측 ê°?ì?¥ì??리ë¡? ì ?ë ¬"
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "gLabels ì??ì?? ë??ì??ì?´ë??"
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr "ê°?ì²´ ì?°ì¸¡ ê°?ì?¥ì??리ë¡? ì ?ë ¬"
+#: ../src/template-designer.c:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr "ê°?ì²´ ì??ì??ë¡? ì ?ë ¬"
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "í??ì?¼(_F)"
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr "ê°?ì²´ ì??í?? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr "굵�"
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "��(_E)"
 
-#: data/ui/glabels-ui.xml.h:14
-msgid "Center align"
-msgstr "ì¤?ì?? ì ?ë ¬"
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "보기(_V)"
 
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
-msgstr "ì¤?ì?? ê°?체를 ì??ì§?ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
+msgstr "주 ë??구 커ì?¤í?°ë§?ì?´ì¦?"
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr "ì¤?ì?? ê°?체를 ì??í??ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
+msgstr "그리기 ë??구 커ì?¤í?°ë§?ì?´ì¦?"
 
-#: data/ui/glabels-ui.xml.h:17
-msgid "Change the visibility of markup lines in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ë§?í?¬ì?? ì?  ë³?ê²½"
+#: ../src/ui.c:99
+#, fuzzy
+msgid "Customize Properties Toolbar"
+msgstr "ì??ì?± ë??구 커ì?¤í?°ë§?ì?´ì¦?"
 
-#: data/ui/glabels-ui.xml.h:18
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? 그리기 ë??구 ë³?ê²½"
+#: ../src/ui.c:100
+msgid "_Objects"
+msgstr "�목(_O)"
 
-#: data/ui/glabels-ui.xml.h:19
-msgid "Change the visibility of the grid in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? 그리ë?? ë³?ê²½"
+#: ../src/ui.c:101
+#, fuzzy
+msgid "_Create"
+msgstr "ì¤?ì??(_C)"
 
-#: data/ui/glabels-ui.xml.h:20
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? 주 ë??구 ë³?ê²½"
+#: ../src/ui.c:102
+msgid "_Order"
+msgstr "ì??ì??(_O)"
 
-#: data/ui/glabels-ui.xml.h:21
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ì??ì?± ë??구 ë³?ê²½"
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "í??ì ?/ë?¤ì§?기(_R)"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr "�기"
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
+msgstr "��� �렬(_H)"
 
-#: data/ui/glabels-ui.xml.h:23
-msgid "Close the current file"
-msgstr "í??ì?¬ í??ì?¼ì?? ë?«ê¸°"
+#: ../src/ui.c:105
+msgid "Align _Vertical"
+msgstr "ê°?ë¡?ë¡? ì ?ë ¬(_V)"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr "gLabel 구�"
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "ë??ì??ë§?(_H)"
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+#, fuzzy
+msgid "Context Menu"
 msgstr "목차"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr "복�"
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "ì??ë¡? ë§?ë?¤ê¸°(_N)"
 
-#: data/ui/glabels-ui.xml.h:27
-msgid "Copy the selection"
-msgstr "ì? í?? ë³µì?¬"
+#: ../src/ui.c:117
+#, fuzzy
+msgid "Create a new file"
+msgstr "ì??ë¡?ì?´ 문ì?? ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:28
-msgid "Create a custom template"
-msgstr "ì??ì??ì?? ì??ì?? ë§?ë?¤ê¸°"
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "�기(_O)..."
 
-#: data/ui/glabels-ui.xml.h:29
-msgid "Create a new document"
-msgstr "ì??ë¡?ì?´ 문ì?? ë§?ë?¤ê¸°"
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "í??ì?¼ ì?´ê¸°"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "ë°?ì½?ë?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "ì ?ì?¥(_S)"
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "ì?¬ê°?í??/ì§?ì?¬ê°?í?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "í??ì?¬ í??ì?¼ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "í??ì??/ì??í?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "�른 ���� ��(_A)..."
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "그림 �체 ��기"
+#: ../src/ui.c:138
+#, fuzzy
+msgid "Save the current file to a different name"
+msgstr "í??ì?¬í??ì?¼ì?? ë?¤ë¥¸ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
 
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
-msgstr "� �체 ��기"
+#: ../src/ui.c:143
+msgid "_Print..."
+msgstr "ì?¸ì??(_P)..."
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "ê¸?ì?? ê°?ì²´ ë§?ë?¤ê¸°"
+#: ../src/ui.c:145
+msgid "Print the current file"
+msgstr "í??ì?¬ í??ì?¼ì?? ì?¸ì??"
 
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
-msgstr "ì??르기(_T)"
+#: ../src/ui.c:150
+#, fuzzy
+msgid "Properties..."
+msgstr "ì??ì?±(_T)..."
 
-#: data/ui/glabels-ui.xml.h:37
-msgid "Customize"
-msgstr "커�����"
+#: ../src/ui.c:152
+msgid "Modify document properties"
+msgstr "문ì?? ì??ì?± ê³ ì¹?기"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
-msgstr "그리기 ë??구 커ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr "ì??ì?? ë??ì??ì?´ë??(_D)..."
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
-msgstr "주 ë??구 커ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:159
+msgid "Create a custom template"
+msgstr "ì??ì??ì?? ì??ì?? ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
-msgstr "ì??ì?± ë??구 커ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "�기(_C)"
+
+#: ../src/ui.c:166
+msgid "Close the current file"
+msgstr "í??ì?¬ í??ì?¼ì?? ë?«ê¸°"
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
-msgstr "ë??구 커ì?¤í?°ë§?ì?´ì¦?"
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "��(_Q)"
 
-#: data/ui/glabels-ui.xml.h:42
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "gLabelsì?? ì¢?ë£?"
+
+#: ../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 "ì??ë?¼ë?´ê¸°"
 
-#: 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 "그리기 ë??구"
-
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
-msgstr "XML ë?¤í??"
-
-#: data/ui/glabels-ui.xml.h:49
-msgid "Dump the GUI Xml description"
-msgstr "GUIì?? XMLì?¤ëª? ë?¤í??"
-
-#: data/ui/glabels-ui.xml.h:50
-msgid "Edit merge properties"
-msgstr "ì?¬ë°± ì??ì?± í?¸ì§?"
+#: ../src/ui.c:222
+msgid "Select All"
+msgstr "모ë?? ì? í??"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
-msgstr "ì??ì§? ê°?ì²´ ë?¤ì§?기"
+#: ../src/ui.c:224
+msgid "Select all objects"
+msgstr "모ë?  ê°?ì²´ ì? í??"
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
-msgstr "ì??í?? ê°?ì²´ ë?¤ì§?기"
+#: ../src/ui.c:229
+msgid "Un-select All"
+msgstr "모ë?  ì? í?? í?´ì ?"
 
-#: data/ui/glabels-ui.xml.h:56
-msgid "Font name"
-msgstr "�꼴"
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "모ë?  ì? í??ì?¬í?­ ì?­ì ?"
 
-#: data/ui/glabels-ui.xml.h:57
-msgid "Font selector"
-msgstr "ê¸?ê¼´ ì? í??기"
+#: ../src/ui.c:236
+msgid "Preferences"
+msgstr "��"
 
-#: data/ui/glabels-ui.xml.h:58
-msgid "Font size"
-msgstr "�꼴 �기"
+#: ../src/ui.c:238
+msgid "Configure the application"
+msgstr "gLabel 구�"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
-msgstr "ì??ì?´ì½?ê³¼ ê¸?ì??(_T)"
+#: ../src/ui.c:245
+#, fuzzy
+msgid "Zoom in"
+msgstr "í??ë??(_I)"
 
-#: data/ui/glabels-ui.xml.h:60
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "ì??ì?¹ í??ë??"
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
-msgstr "��릭"
+#: ../src/ui.c:252
+#, fuzzy
+msgid "Zoom out"
+msgstr "ì¶?ì??(_O)"
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
-msgstr "�쪽 �렬"
+#: ../src/ui.c:254
+msgid "Decrease magnification"
+msgstr "í??ë?? ê°?ì??"
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
-msgstr "ì?  ë??ì?´"
+#: ../src/ui.c:259
+#, fuzzy
+msgid "Zoom 1 to 1"
+msgstr "1: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 "100%�기� 복구"
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
-msgstr "ë§?í?¬ì??(_A)"
+#: ../src/ui.c:266
+#, fuzzy
+msgid "Zoom to fit"
+msgstr "ë§?춰ì?? í??ë??(_F)"
 
-#: data/ui/glabels-ui.xml.h:68
-msgid "Main toolbar"
-msgstr "주 ë??구"
+#: ../src/ui.c:268
+#, fuzzy
+msgid "Set scale to fit window"
+msgstr "ì??ë??ì?°ì?? ë§?춰ì?? í??ë??"
 
-#: data/ui/glabels-ui.xml.h:69
-msgid "Markup"
-msgstr "ë§?í?¬ì??"
+#: ../src/ui.c:275
+#, fuzzy
+msgid "Select Mode"
+msgstr "모ë?? ì? í??(_S)"
 
-#: data/ui/glabels-ui.xml.h:70
-msgid "Modify document properties"
-msgstr "문ì?? ì??ì?± ê³ ì¹?기"
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "ì? í??, ê°?ì²´ ì?´ë??ê³¼ ì??ì ?"
 
-#: data/ui/glabels-ui.xml.h:71
-msgid "New"
-msgstr "ì??ë¡? ë§?ë?¤ê¸°"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+msgid "Text"
+msgstr "ê¸?ì??"
 
-#: data/ui/glabels-ui.xml.h:72
-msgid "Object property editor"
-msgstr "í?­ëª© ì??ì?± í?¸ì§?기"
+#: ../src/ui.c:289
+#, fuzzy
+msgid "Box"
+msgstr "ì?¬ê°?í??(_B)"
 
-#: data/ui/glabels-ui.xml.h:73
-msgid "Only show icons in the drawing toolbar"
-msgstr "그리기 ë??구ì??ì?? ì??ì?´ì½?ë§? ë³´ì?´ê¸°"
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "ì?¬ê°?í??/ì§?ì?¬ê°?í?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:74
-msgid "Only show icons in the main toolbar"
-msgstr "주 ë??구ì??ì?? ì??ì?´ì½?ë§? ë³´ì?´ê¸°"
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+msgid "Line"
+msgstr "ì? "
 
-#: data/ui/glabels-ui.xml.h:76
-msgid "Open a file"
-msgstr "í??ì?¼ ì?´ê¸°"
+#: ../src/ui.c:303
+#, fuzzy
+msgid "Ellipse"
+msgstr "í??ì??(_E)"
 
-#: data/ui/glabels-ui.xml.h:77
-msgid "Open the glabels manual"
-msgstr "gLabeles ��� �기"
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "í??ì??/ì??í?? ê°?ì²´ ë§?ë?¤ê¸°"
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste"
-msgstr "��기"
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+msgid "Image"
+msgstr "그림"
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Paste the clipboard"
-msgstr "í?´ë¦½ë³´ë??ì?? ë¶?ì?´ê¸°"
+#: ../src/ui.c:317
+#, fuzzy
+msgid "Barcode"
+msgstr "ë°?ì½?ë??(_C)"
 
-#: data/ui/glabels-ui.xml.h:80
-msgid "Pr_eferences..."
-msgstr "ì??ì?±(_E)..."
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr "ê°?체를 ì??ì??ë¡? ì?¬ë¦¬ê¸°"
 
-#: data/ui/glabels-ui.xml.h:81
-msgid "Preferences"
-msgstr "��"
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
+msgstr "ê°?체를 í??ë?¨ì?¼ë¡? ë?´ë¦¬ê¸°"
 
-#: data/ui/glabels-ui.xml.h:83
-msgid "Print the current file"
-msgstr "í??ì?¬ í??ì?¼ì?? ì?¸ì??"
+#: ../src/ui.c:340
+#, fuzzy
+msgid "Rotate object 90 degrees counter-clockwise"
+msgstr "90° ë°?ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
 
-#: data/ui/glabels-ui.xml.h:84
-msgid "Proper_ties..."
-msgstr "ì??ì?±(_T)..."
+#: ../src/ui.c:347
+#, fuzzy
+msgid "Rotate object 90 degrees clockwise"
+msgstr "90° ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
 
-#: data/ui/glabels-ui.xml.h:85
-msgid "Properties"
-msgstr "ì??ì?±"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
+msgstr "ì??ì§? ê°?ì²´ ë?¤ì§?기"
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Property toolbar"
-msgstr "ì??ì?± ë??구"
+#: ../src/ui.c:361
+msgid "Flip object vertically"
+msgstr "ì??í?? ê°?ì²´ ë?¤ì§?기"
 
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit"
-msgstr "��"
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
+msgstr "ê°?ì²´ ì¢?측 ê°?ì?¥ì??리ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:88
-msgid "Quit the program"
-msgstr "gLabelsì?? ì¢?ë£?"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
+msgstr "ê°?ì²´ ì?°ì¸¡ ê°?ì?¥ì??리ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:89
-msgid "Raise object to top"
-msgstr "ê°?체를 ì??ì??ë¡? ì?¬ë¦¬ê¸°"
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
+msgstr "ê°?ì²´ ì?¸ë¡? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:90
-msgid "Recent _Files"
-msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
+#: ../src/ui.c:389
+#, fuzzy
+msgid "Align objects to top edges"
+msgstr "ê°?ì²´ ì¢?측 ê°?ì?¥ì??리ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:91
-msgid "Redo"
-msgstr "ì?¬ì?¤í??"
+#: ../src/ui.c:396
+#, fuzzy
+msgid "Align objects to bottom edges"
+msgstr "ê°?ì²´ ì??ë??ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:92
-msgid "Redo the undone action"
-msgstr "ì?¬ì?¤í?? í? ê²? ì??ì??"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
+msgstr "ê°?ì²´ ì??í?? ì¤?ì??ì?¼ë¡? ì ?ë ¬"
 
-#: data/ui/glabels-ui.xml.h:93
-msgid "Remove all selections"
-msgstr "모ë?  ì? í??ì?¬í?­ ì?­ì ?"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr "ì¤?ì?? ê°?체를 ì??ì§?ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
 
-#: data/ui/glabels-ui.xml.h:95
-#, no-c-format
-msgid "Restore scale to 100%"
-msgstr "100%�기� 복구"
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr "ì¤?ì?? ê°?체를 ì??í??ë?¼ë²¨ ì¤?ì??ì?¼ë¡?"
 
-#: data/ui/glabels-ui.xml.h:96
-msgid "Right align"
-msgstr "�른쪽�� �렬"
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "ì?¬ë°± ì??ì?± í?¸ì§?"
 
-#: data/ui/glabels-ui.xml.h:99
-msgid "Rotate object 90 clockwise"
-msgstr "90° ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr "목차"
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Rotate object 90 counter-clockwise"
-msgstr "90° ë°?ì??ê³?ë°©í?¥ì?¼ë¡? í??ì ?"
+#: ../src/ui.c:433
+#, fuzzy
+msgid "Open glabels manual"
+msgstr "gLabeles ��� �기"
 
-#: data/ui/glabels-ui.xml.h:101
-msgid "Save"
-msgstr "ì ?ì?¥"
+#: ../src/ui.c:438
+msgid "About..."
+msgstr "ì ?ë³´..."
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save As"
-msgstr "�른 ���� ��"
+#: ../src/ui.c:440
+msgid "About glabels"
+msgstr "gLabelsì?? ë??í?´"
 
-#: data/ui/glabels-ui.xml.h:103
-msgid "Save _As..."
-msgstr "�른 ���� ��(_A)..."
+#: ../src/ui.c:450
+msgid "Property toolbar"
+msgstr "ì??ì?± ë??구"
 
-#: data/ui/glabels-ui.xml.h:104
-msgid "Save the current file"
-msgstr "í??ì?¬ í??ì?¼ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
+#: ../src/ui.c:452
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ì??ì?± ë??구 ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:105
-msgid "Save the current file with a different name"
-msgstr "í??ì?¬í??ì?¼ì?? ë?¤ë¥¸ì?´ë¦?ì?¼ë¡? ì ?ì?¥"
+#: ../src/ui.c:458
+#, fuzzy
+msgid "Grid"
+msgstr "그리ë??(_G)"
 
-#: data/ui/glabels-ui.xml.h:106
-msgid "Select All"
-msgstr "모ë?? ì? í??"
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? 그리ë?? ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:107
-msgid "Select _All"
-msgstr "모ë?? ì? í??(_A)"
+#: ../src/ui.c:466
+msgid "Markup"
+msgstr "ë§?í?¬ì??"
 
-#: data/ui/glabels-ui.xml.h:108
-msgid "Select all objects"
-msgstr "모ë?  ê°?ì²´ ì? í??"
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? ë§?í?¬ì?? ì?  ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:109
-msgid "Select, move and modify objects"
-msgstr "ì? í??, ê°?ì²´ ì?´ë??ê³¼ ì??ì ?"
+#: ../src/ui.c:479
+msgid "Main toolbar"
+msgstr "주 ë??구"
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Set drawing toolbar button style according to desktop default"
-msgstr "기본 ë?°ì?¤í?¬í?? 모ì??ì?? ë?°ë?¼ 그리기 ë??구 ë²?í?¼ 모ì??ì?? ì§?ì ?"
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? 주 ë??구 ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:112
-msgid "Set main toolbar button style according to desktop default"
-msgstr "기본 ë?°ì?¤í?¬í?? 모ì??ì?? ë?°ë?¼ 주 ë??구 ë²?í?¼ 모ì??ì?? ì§?ì ?"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
+msgstr "그리기 ë??구"
 
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show _Tooltips"
-msgstr "í?? 보기(_T)"
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
+msgstr "í??ì?¬ ì??ë??ì?°ì?? ë³´ì?´ë?? 그리기 ë??구 ë³?ê²½"
 
-#: data/ui/glabels-ui.xml.h:114
-msgid "Show both icons and texts in the drawing toolbar"
-msgstr "그리기 ë??구ì?? ì??ì?´ì½?ê³¼ ê¸?ì?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show both icons and texts in the main toolbar"
-msgstr "주 ë??구ì?? ì??ì?´ì½? ê³¼ ê¸?ì?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
+msgstr "ì°¸ì?¬ ì ?ì??ì?? AUTHORS í??ì?¼ì?? ë³´ì?¸ì??."
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Show tooltips in the drawing toolbar"
-msgstr "그리기 ë??구ì?? í?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
+msgstr "ë??ë?? ì?´ê³³ì?? 방문 í??ì?¸ì??. http://glabels.sourceforge.net/";
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Show tooltips in the main toolbar"
-msgstr "주 ë??구ì?? í?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Show tooltips in the property toolbar"
-msgstr "ì??ì?± ë??구ì?? í?? ë³´ì?´ê¸°"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "Template Designer"
-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:120
-msgid "Template _Designer..."
-msgstr "ì??ì?? ë??ì??ì?´ë??(_D)..."
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "gLabels"
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Text color"
-msgstr "ê¸?ì?? ì??ì??"
+#: ../src/warning-handler.c:69
+#, fuzzy
+msgid "gLabels Error!"
+msgstr "gLabels í??ê²½ì?¤ì ?"
 
-#: data/ui/glabels-ui.xml.h:122
-msgid "U_n-select All"
-msgstr "모ë?  ì? í?? í?´ì ?(_N)"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(ì??ì??) - gLabels"
 
-#: data/ui/glabels-ui.xml.h:123
-msgid "Un-select All"
-msgstr "모ë?  ì? í?? í?´ì ?"
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(ì??ì ?ë?¨)"
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Undo"
-msgstr "ë??ë??리기"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "ì??못ë?? Root ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Undo the last action"
-msgstr "ë§?ì§?ë§? ë??ì??ì?¼ë¡? ë??ë??리기"
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "ì??못ë?? ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:126
-msgid "Zoom _1:1"
-msgstr "1:1ë¡? í??ë??(_1)"
+#: ../src/xml-label.c:189 ../src/xml-label.c:227
+msgid "xmlParseFile error"
+msgstr "xmlParseí??ì?¼ ì?¤ë¥?"
 
-#: data/ui/glabels-ui.xml.h:127
-msgid "Zoom _In"
-msgstr "í??ë??(_I)"
+#: ../src/xml-label.c:264
+msgid "No document root"
+msgstr "root 문ì??ê°? ì??ë??"
 
-#: data/ui/glabels-ui.xml.h:128
-msgid "Zoom _Out"
-msgstr "ì¶?ì??(_O)"
+#: ../src/xml-label.c:272
+msgid "Importing from glabels 0.1 format"
+msgstr "gLabels 0.1� �� �져�기"
 
-#: data/ui/glabels-ui.xml.h:129
-msgid "Zoom to _fit"
-msgstr "ë§?춰ì?? í??ë??(_F)"
+#: ../src/xml-label.c:281
+msgid "Importing from glabels 0.4 format"
+msgstr "gLabels 0.4� �� �져�기"
 
-#: data/ui/glabels-ui.xml.h:130
-msgid "Zoom to fit window"
-msgstr "ì??ë??ì?°ì?? ë§?춰ì?? í??ë??"
+#: ../src/xml-label.c:291
+#, fuzzy, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "ì??못ë?? 문ì??, ì?? ì?? ì??ë?? Glabels ì?´ë¦?ê³µê°?"
 
-#: data/ui/glabels-ui.xml.h:131
-msgid "_About..."
-msgstr "...ì?? ë??í?´(_A)"
+#: ../src/xml-label.c:360
+#, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "문ì?? ë?¸ë?? ë?´ì?? ì??못ë?? ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Bottoms"
-msgstr "ì??ë??(_B)"
+#: ../src/xml-label.c:856
+#, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "ë?°ì?´í?° ë?¸ë?? ë?´ì?? ì??못ë?? ë?¸ë?? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:135
-msgid "_Close"
-msgstr "�기(_C)"
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
+msgstr "Utf8 ë³?í?? ì??ë?¬"
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Contents"
-msgstr "목차(_C)"
+#: ../src/xml-label.c:1104
+msgid "Problem saving xml file."
+msgstr "XML í??ì?¼ ì ?ì?¥ì?? 문ì ?ê°? ì??ì?µë??ë?¤."
 
-#: data/ui/glabels-ui.xml.h:137
-msgid "_Copy"
-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:138
-msgid "_Create Object"
-msgstr "�목 ��기(_C)"
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
+#, fuzzy
+msgid "User defined"
+msgstr "ë³?í?© í??ë?? ì?½ì??"
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Debug"
-msgstr "ë??ë²?ê·¸(_D)"
+#: ../libglabels/db.c:650
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:141
-msgid "_Desktop Default"
-msgstr "기본 ë?°ì?¤í?¬í??(_D)"
+#: ../libglabels/db.c:1042
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_Drawing Toolbar"
-msgstr "그리기 ë??구(_D)"
+#: ../libglabels/db.c:2061
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Edit"
-msgstr "��(_E)"
+#: ../libglabels/db.c:2128
+#, fuzzy, c-format
+msgid "%s full page label"
+msgstr "Generic %s ì ?ë©´ì?? 걸ì¹?"
 
-#: data/ui/glabels-ui.xml.h:145
-msgid "_File"
-msgstr "í??ì?¼(_F)"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:146
-msgid "_Grid"
-msgstr "그리ë??(_G)"
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "ì?©ì§?ì?? %d"
 
-#: data/ui/glabels-ui.xml.h:147
-msgid "_Help"
-msgstr "ë??ì??ë§?(_H)"
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, fuzzy
+msgid "diameter"
+msgstr "�� %s %s"
 
-#: data/ui/glabels-ui.xml.h:148
-msgid "_Icon"
-msgstr "ì??ì?´ì½?(_I)"
+#. 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 "���"
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Main Toolbar"
-msgstr "주 ë??구(_M)"
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "[��]"
 
-#: data/ui/glabels-ui.xml.h:153
-msgid "_Merge Properties..."
-msgstr "ì?¬ë°± ì??ì?±(_M)..."
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "[�리미�]"
 
-#: data/ui/glabels-ui.xml.h:154
-msgid "_New"
-msgstr "ì??ë¡? ë§?ë?¤ê¸°(_N)"
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Objects"
-msgstr "�목(_O)"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:156
-msgid "_Open..."
-msgstr "�기(_O)..."
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Paste"
-msgstr "��기(_P)"
+#. 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:159
-msgid "_Print..."
-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:160
-msgid "_Property Toolbar"
-msgstr "ì??ì?± ë??구(_P)"
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Quit"
-msgstr "��(_Q)"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:164
-msgid "_Save"
-msgstr "ì ?ì?¥(_S)"
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:168
-msgid "_View"
-msgstr "보기(_V)"
+#.
+#. * 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
+#, fuzzy
+msgid "<b>Record selection/preview</b>"
+msgstr "ì? í?? 기ë¡?/미리보기:"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
-msgstr "   "
+#: ../data/ui/merge-properties-dialog.ui.h:2
+#, fuzzy
+msgid "<b>Source</b>"
+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:3
+msgid "Format:"
+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:4
+msgid "Location:"
+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:5
+#, fuzzy
+msgid "Select all"
+msgstr "모ë?? ì? í??"
 
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</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:6
-msgid "<span weight=\"bold\">Text</span>"
-msgstr "<span weight=\"bold\">ê¸?ì??</span>"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
+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:2
+msgid "Category:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:8
-#: data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "ì??ì¹?:"
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "ì??ì??ì??"
 
-#: data/glade/prefs-dialog.glade.h:9
-#: data/glade/object-editor.glade.h:8
-msgid "Color:"
-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:10
-msgid "Font:"
-msgstr "�꼴:"
+#: ../data/ui/media-select.ui.h:5
+#, fuzzy
+msgid "Recent"
+msgstr "ìµ?ê·¼ì?? í??ì?¼(_F)"
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "ISO A4"
-msgstr "ISO A4 ��"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "모ë?? ì? í??"
 
-#: data/glade/prefs-dialog.glade.h:12
-msgid "Inches"
-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/glade/prefs-dialog.glade.h:13
-#: data/glade/object-editor.glade.h:19
-msgid "Line Spacing:"
-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:14
-msgid "Locale"
-msgstr "ë¡?ì¼?ì?¼"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "�벨 �기:"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "�리미�"
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "ë°°ì¹?:"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
-msgstr "기본 �목"
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "ì??ì??:"
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-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:18
-msgid "Select default properties for new objects."
-msgstr "ì?? ê°?ì²´ì?? 기본 ì??ì?±ì?? ì? í??"
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
-msgstr "구체ì ?ì?¸ ë¡?ì¼?ì?¼ì?? ì? í??"
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+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:10
+msgid "Select orientation of label content."
+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:11
+msgid "Similar products:"
+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
+#: ../data/ui/object-editor.ui.h:3
 msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Xxx ê°?ì²´ ì??ì?±</span>"
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+msgid "Alignment:"
+msgstr "ì??ì¹?:"
+
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr "ì??ë??ì?¼ë¡? ì¶?ì??í?? ê¸?ì??ì?? ë³?í?©"
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "ê°?ë??:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "체��"
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+msgid "Color:"
+msgstr "ì??ì??:"
+
+#: ../data/ui/object-editor.ui.h:10
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "��리:"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:12
+msgid "File:"
+msgstr "í??ì?¼:"
+
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "��기"
 
-#: data/glade/object-editor.glade.h:13
-#: data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:14 ../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:16
+msgid "Key:"
+msgstr "í?¤:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "길�:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "ì? "
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+msgid "Line Spacing:"
+msgstr "í??ê°?:"
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Literal:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
-msgstr "그림 ���"
+#: ../data/ui/object-editor.ui.h:21
+msgid "Opacity:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "ì??ì¹?"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "그림�기 ���"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:24
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "�기"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "�기:"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "모ì??"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:28
 msgid "Style:"
 msgstr "모ì??:"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "ë??ì?´:"
+
+#: ../data/ui/object-editor.ui.h:31
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:33
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "degrees"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr "dialog1"
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "digits:"
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:38
 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:2
+msgid "<span weight=\"bold\">Default page size</span>"
+msgstr "<span weight=\"bold\">기본 �� �기</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:3
+msgid "<span weight=\"bold\">Fill</span>"
+msgstr "<span weight=\"bold\">��기</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "<span weight=\"bold\">Line</span>"
+msgstr "<span weight=\"bold\">ì? </span>"
+
+#: ../data/ui/prefs-dialog.ui.h:5
+msgid "<span weight=\"bold\">Text</span>"
+msgstr "<span weight=\"bold\">ê¸?ì??</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "<span weight=\"bold\">Units</span>"
+msgstr "<span weight=\"bold\">ì? ë??</span>"
+
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Font:"
+msgstr "�꼴:"
+
+#: ../data/ui/prefs-dialog.ui.h:10
+msgid "ISO A4"
+msgstr "ISO A4 ��"
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Inches"
+msgstr "��"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Locale"
+msgstr "ë¡?ì¼?ì?¼"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Millimeters"
+msgstr "�리미�"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Object defaults"
+msgstr "기본 �목"
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Points"
+msgstr "���"
+
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Select default properties for new objects."
+msgstr "ì?? ê°?ì²´ì?? 기본 ì??ì?±ì?? ì? í??"
+
+#: ../data/ui/prefs-dialog.ui.h:18
+msgid "Select locale specific behavior."
+msgstr "구체ì ?ì?¸ ë¡?ì¼?ì?¼ì?? ì? í??"
+
+#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+msgstr "US Letter"
+
+#: ../data/ui/property-bar.ui.h:1
+msgid "Bold"
+msgstr "굵�"
 
-#: data/glade/template-designer.glade.h:2
+#: ../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 +2184,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 +2210,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 +2280,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 +2288,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 +2302,1215 @@ msgstr ""
 "\n"
 "차근차근 gLabelsì?? ì?¬ì?©ì?? ì??ì??ì?? ì?½ê²? ë§?ë?¤ ì?? ì??ê²? ë??ì??ë??립ë??ë?¤. "
 
-#: data/templates/paper-sizes.xml.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "매ì??"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "<b>Merge Control</b>"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "ì?µì??"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "�본"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+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 "�� �벨"
+
+#. ===================================================================
+#: ../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 "주ì?? ë?¼ë²¨ (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 "Document merge control"
+#~ msgstr "문ì?? ì?¬ë°± ì ?ì?´"
+
+#~ 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 "%d x %d  (%d per sheet)"
+#~ msgstr "%d x %d  (ì?©ì§?ì?? %d)"
+
+#~ 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 "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ 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..6b88ccf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ 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-05-27 22:36-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"
@@ -14,131 +14,135 @@ msgstr ""
 "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
 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
 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
 msgid "ISBN"
 msgstr ""
 
-#: ../src/bc.c:127
+#: ../src/bc.c:128
 msgid "ISBN +5"
 msgstr ""
 
-#: ../src/bc.c:130
+#: ../src/bc.c:131
 msgid "Code 39"
 msgstr ""
 
-#: ../src/bc.c:133
+#: ../src/bc.c:134
 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
 msgid "Interleaved 2 of 5"
 msgstr ""
 
-#: ../src/bc.c:145
+#: ../src/bc.c:146
 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
 msgid "Code 93"
 msgstr ""
 
-#: ../src/bc.c:161
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
 msgid "IEC16022 (DataMatrix)"
 msgstr ""
 
-#: ../src/bc.c:168
+#: ../src/bc.c:176
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -262,40 +266,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 +308,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:584 ../src/label.c:628
 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"
 
@@ -460,18 +464,15 @@ msgstr ""
 msgid "first"
 msgstr "første"
 
-#: ../src/glabels-batch.c:60
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr ""
 
@@ -520,11 +521,11 @@ msgstr ""
 msgid "Barcode property"
 msgstr ""
 
-#: ../src/label-barcode.c:482
+#: ../src/label-barcode.c:483
 msgid "Barcode data empty"
 msgstr ""
 
-#: ../src/label-barcode.c:486
+#: ../src/label-barcode.c:487
 msgid "Invalid barcode data"
 msgstr ""
 
@@ -533,17 +534,17 @@ 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 ""
 
@@ -665,51 +666,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/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/merge.c:169 ../src/merge.c:210 ../src/merge.c:374 ../src/merge.c:377
+#: ../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"
 
@@ -771,7 +815,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 +828,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:9
 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 +921,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:6
 #: ../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,51 +1029,55 @@ 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
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
+msgstr ""
+
+#: ../src/template-designer.c:1422
 msgid ""
 "<span foreground='red' weight='bold'>Brand and part# match an existing "
 "template!</span>"
@@ -1250,8 +1313,7 @@ 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:29
 msgid "Text"
 msgstr "Tekst"
 
@@ -1263,7 +1325,7 @@ 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:18
 msgid "Line"
 msgstr "Linje"
 
@@ -1275,7 +1337,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:15
 msgid "Image"
 msgstr "Bilde"
 
@@ -1502,7 +1564,7 @@ msgstr ""
 msgid "bad node in Data node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:779
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr ""
 
@@ -1511,54 +1573,52 @@ 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:880
+#: ../libglabels/db.c:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1826
+#: ../libglabels/db.c:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1893
+#: ../libglabels/db.c:2128
 #, 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
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
 msgid "per sheet"
 msgstr ""
 
-#: ../libglabels/template.c:718
-#, c-format
-msgid "%d %s"
-msgstr ""
-
-#: ../libglabels/template.c:788 ../libglabels/template.c:794
-#: ../libglabels/template.c:804 ../libglabels/template.c:810
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
 msgid "diameter"
 msgstr ""
 
@@ -1566,14 +1626,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:40
+#: ../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:39
+#: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr ""
 
@@ -1592,32 +1652,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 +1689,395 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "<b>Record selection/preview</b>"
 msgstr ""
 
-#: ../data/builder/merge-properties-dialog.builder.h:2
+#: ../data/ui/merge-properties-dialog.ui.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:3
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "Lokasjon:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Velg alle"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../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/builder/new-label-dialog.builder.h:16
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
+
+#: ../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
+#: ../data/ui/object-editor.ui.h:3
 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:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "Sjekksum"
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Farge:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Familie:"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Fil:"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Fyll"
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:14 ../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:16
 msgid "Key:"
 msgstr "Nøkkel:"
 
-#: ../data/builder/object-editor.builder.h:18
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Lengde:"
 
-#: ../data/builder/object-editor.builder.h:20
-#: ../data/builder/prefs-dialog.builder.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:21
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Posisjon"
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:24
 msgid "Shadow"
 msgstr "Skygge"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:33
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "grader"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<span weight=\"bold\">Default page size</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Skrift:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Tommer"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 #, fuzzy
 msgid "Locale"
 msgstr "Lokalitet"
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Millimeter"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Punkter"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:18
 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:19 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../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 +2088,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 +2109,129 @@ 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"
-msgstr ""
-
-#: ../data/builder/template-designer.builder.h:66
-#, 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 ""
-
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
 msgid "<b>Copies</b>"
 msgstr "<b>Kopier</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 msgid "<b>Merge Control</b>"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
 msgid "<b>Options</b>"
 msgstr "<b>Alternativer</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 msgid "Collate"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
+#: ../data/ui/print-op-dialog-custom-widget.ui.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 +2376,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 +2393,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 +2410,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 +2437,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 +2520,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 +2589,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 +2701,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 +2817,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 +2832,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 +2995,26 @@ 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"
diff --git a/po/pl.po b/po/pl.po
index d5b935c..7acdd77 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ 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-05-27 22:36-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"
@@ -14,175 +14,135 @@ msgstr ""
 "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
 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
 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
 msgid "ISBN"
 msgstr ""
 
-#: ../src/bc.c:125
+#: ../src/bc.c:128
 msgid "ISBN +5"
 msgstr ""
 
-#: ../src/bc.c:128
+#: ../src/bc.c:131
 msgid "Code 39"
 msgstr ""
 
-#: ../src/bc.c:131
+#: ../src/bc.c:134
 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
 msgid "Interleaved 2 of 5"
 msgstr ""
 
-#: ../src/bc.c:143
+#: ../src/bc.c:146
 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
+msgid "Code 93"
+msgstr ""
+
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
 msgid "IEC16022 (DataMatrix)"
 msgstr ""
 
-#: ../src/bc.c:155
+#: ../src/bc.c:176
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -311,41 +271,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 +314,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:584 ../src/label.c:628
 #, 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:52
 #, 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:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "nazwa pliku"
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr "liczba arkuszy (domy¶lnie=1)"
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr "arkusz(e/y)"
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr "liczba kopii (domy¶lnie=1)"
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "kopi(a/e/i)"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:58
 #, fuzzy
 msgid "first label on first sheet (default=1)"
 msgstr "liczba arkuszy (domy¶lnie=1)"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:58
 msgid "first"
 msgstr ""
 
-#: ../src/glabels-batch.c:59
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr ""
 
-#: ../src/glabels-batch.c:65
+#: ../src/glabels-batch.c:66
 msgid "input file for merging"
 msgstr ""
 
-#: ../src/glabels-batch.c:67 ../src/glabels.c:62
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr ""
 
-#: ../src/glabels-batch.c:96
+#: ../src/glabels-batch.c:98
 msgid "Print files created with gLabels."
 msgstr ""
 
-#: ../src/glabels-batch.c:104 ../src/glabels.c:87
+#: ../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 ""
 
-#: ../src/glabels-batch.c:146
+#: ../src/glabels-batch.c:149
 #, 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:184
 #, 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:483
 #, fuzzy
 msgid "Barcode data empty"
 msgstr "Dane kodu paskowego"
 
-#: ../src/label-barcode.c:439
+#: ../src/label-barcode.c:487
 #, 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:399
 msgid "Untitled"
 msgstr ""
 
-#: ../src/merge.c:169 ../src/merge.c:210 ../src/merge.c:374 ../src/merge.c:377
+#: ../src/label.c:702 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "W³a¶ciwo¶ci z³±czania"
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Usuñ"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "Przesun na wierzch"
+
+#: ../src/label.c:1253 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "Przesuñ w dó³"
+
+#: ../src/label.c:1294
+#, fuzzy
+msgid "Rotate"
+msgstr "Obróæ"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "Obróæ"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "Obróæ"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr ""
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr ""
+
+#: ../src/label.c:1472 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "Wyrównanie:"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr ""
+
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr ""
+
+#: ../src/label.c:1666 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "Wyrównanie:"
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr ""
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr ""
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr ""
+
+#: ../src/label.c:1909 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "Ogólne"
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
+msgstr ""
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Tworzy liniê"
+
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Tworzy obraz"
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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 +810,174 @@ 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: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-init.c:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Nie mo¿na otworzyæ pliku"
+
+#: ../src/merge-init.c:110
+msgid "VCards"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:279
+#: ../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:9
 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/new-label-dialog.c:215
+msgid "Choose Orientation"
+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/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:6
 #: ../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 +1080,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 +1090,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
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
+msgstr ""
+
+#: ../src/template-designer.c:1422
 msgid ""
 "<span foreground='red' weight='bold'>Brand and part# match an existing "
 "template!</span>"
 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:29
 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:18
 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:15
 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 +1605,183 @@ 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:323
 #, 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:406
 #, 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:189 ../src/xml-label.c:227
 msgid "xmlParseFile error"
 msgstr "b³±d przetwarzania pliku xml"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:264
 msgid "No document root"
 msgstr "Brak g³ównego dokumentu"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:272
 msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:281
 msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:291
 #, 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:360
 #, 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:856
 #, 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:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr ""
 
-#: ../src/xml-label.c:1099
+#: ../src/xml-label.c:1104
 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:866
+#: ../libglabels/db.c:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1450
+#: ../libglabels/db.c:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1527
+#: ../libglabels/db.c:2128
 #, 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 ""
+
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d x %d (%d na arkusz)"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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:40
+#: ../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:39
+#: ../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: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 +1793,409 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "<b>Record selection/preview</b>"
 msgstr ""
 
-#: ../data/builder/merge-properties-dialog.builder.h:2
+#: ../data/ui/merge-properties-dialog.ui.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:3
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "Po³o¿enie:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 #, fuzzy
 msgid "Select all"
 msgstr "O_dznacz wszystko"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:6
 #, fuzzy
 msgid "Unselect all"
 msgstr "O_dznacz wszystko"
 
-#: ../data/builder/object-editor.builder.h:2
+#: ../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/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/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.builder.h:3
-msgid "00000000000 00000"
-msgstr ""
-
-#: ../data/builder/object-editor.builder.h:4
+#: ../data/ui/object-editor.ui.h:3
 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:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Wyrównanie:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "K±t"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Kolor:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:11
 #, fuzzy
 msgid "Family:"
 msgstr "Wype³nienie"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:12
 #, fuzzy
 msgid "File:"
 msgstr "Wype³nienie"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:13
 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:14 ../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:16
 msgid "Key:"
 msgstr "Klucz:"
 
-#: ../data/builder/object-editor.builder.h:19
+#: ../data/ui/object-editor.ui.h:17
 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:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Litera³:"
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Pozycja"
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "Wyzeruj rozmiar obrazu"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:24
 msgid "Shadow"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:26
 #, fuzzy
 msgid "Size:"
 msgstr "Rozmiar"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:27
 #, fuzzy
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/builder/object-editor.builder.h:30
+#: ../data/ui/object-editor.ui.h:28
 #, 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:30 ../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:31
 msgid "X Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "stopni(e)"
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:40
+#: ../data/ui/object-editor.ui.h:38
 #, 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
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<span weight=\"bold\">Default page size</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Czcionka:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Cale"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 #, fuzzy
 msgid "Locale"
 msgstr "Skala"
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Milimetry"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Punkty"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:18
 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:19 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr ""
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../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 +2206,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 +2227,267 @@ 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/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
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
 #, fuzzy
 msgid "<b>Copies</b>"
 msgstr "Kopie"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 msgid "<b>Merge Control</b>"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Opcje"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 msgid "Collate"
 msgstr "Uk³adanie"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
+#: ../data/ui/print-op-dialog-custom-widget.ui.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 +2500,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 +2518,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 +2530,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 +2563,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 +2584,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 +2596,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 +2725,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 +2754,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 +2845,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 +2963,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 +2979,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 +3143,32 @@ 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"
+
 #~ msgid "print this message"
 #~ msgstr "wy¶wietla ten komunikat"
 
@@ -2843,20 +3198,10 @@ msgstr ""
 #~ 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 +3214,6 @@ msgstr ""
 #~ msgstr "W³asny klucz pola"
 
 #, fuzzy
-#~ msgid "Font name"
-#~ msgstr "Nie zapisuj"
-
-#, fuzzy
 #~ msgid "Font selector"
 #~ msgstr "Usuwa wszelkie zaznaczenia"
 
@@ -2979,9 +3320,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..996412d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ 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-05-27 22:36-0400\n"
 "PO-Revision-Date: 2010-03-19 02:02+0000\n"
 "Last-Translator: Filipe Roque <fliproque gmail com>\n"
 "Language-Team: Portuguese <>\n"
@@ -14,132 +14,136 @@ msgstr ""
 "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
 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
 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
 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
 msgid "Code 39"
 msgstr "Código 39"
 
-#: ../src/bc.c:133
+#: ../src/bc.c:134
 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
 msgid "Interleaved 2 of 5"
 msgstr "Interleaved 2 of 5"
 
-#: ../src/bc.c:145
+#: ../src/bc.c:146
 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
 #, fuzzy
 msgid "Code 93"
 msgstr "Código 39"
 
-#: ../src/bc.c:161
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:168
+#: ../src/bc.c:176
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -283,42 +287,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 +335,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:584 ../src/label.c:628
 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"
 
@@ -487,18 +491,15 @@ msgstr "primeira etiqueta na primeira página (padrão=1)"
 msgid "first"
 msgstr "primeiro"
 
-#: ../src/glabels-batch.c:60
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "imprimir marcas de cortes"
 
@@ -550,11 +551,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:483
 msgid "Barcode data empty"
 msgstr "Dados do Código de Barras vazio"
 
-#: ../src/label-barcode.c:486
+#: ../src/label-barcode.c:487
 msgid "Invalid barcode data"
 msgstr "Código de barras inválido"
 
@@ -564,17 +565,17 @@ 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"
 
@@ -701,88 +702,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:937
+#: ../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: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"
 
@@ -844,7 +861,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 +873,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:9
 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 +903,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 +966,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:6
 #: ../templates/misc-iso-templates.xml.h:34
 msgid "Labels"
 msgstr "Etiquetas"
@@ -1048,51 +1073,57 @@ 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
+#: ../src/template-designer.c:1133
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Criador de modelos do gLabels"
+
+#: ../src/template-designer.c:1422
 msgid ""
 "<span foreground='red' weight='bold'>Brand and part# match an existing "
 "template!</span>"
@@ -1330,8 +1361,7 @@ 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:29
 msgid "Text"
 msgstr "Texto"
 
@@ -1343,7 +1373,7 @@ 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:18
 msgid "Line"
 msgstr "Linha"
 
@@ -1355,7 +1385,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:15
 msgid "Image"
 msgstr "Imagem"
 
@@ -1582,7 +1612,7 @@ msgstr "Mau nó do documento = \"%s\""
 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:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Erro de conversão UTF8"
 
@@ -1591,16 +1621,19 @@ 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1608,7 +1641,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:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1616,7 +1649,7 @@ msgstr ""
 "Incapaz de localizar definições de categoria. Libglabels pode não estar "
 "instalado correctamente!"
 
-#: ../libglabels/db.c:2021
+#: ../libglabels/db.c:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1624,28 +1657,23 @@ msgstr ""
 "Incapaz de localizar modelos. Libglabels pode não estar instalado "
 "correctamente!"
 
-#: ../libglabels/db.c:2088
+#: ../libglabels/db.c:2128
 #, 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
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
 #, fuzzy
 msgid "per sheet"
 msgstr "%d por página"
 
-#: ../libglabels/template.c:718
-#, c-format
-msgid "%d %s"
-msgstr ""
-
-#: ../libglabels/template.c:788 ../libglabels/template.c:794
-#: ../libglabels/template.c:804 ../libglabels/template.c:810
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
 #, fuzzy
 msgid "diameter"
 msgstr "%s %s diâmetro"
@@ -1654,14 +1682,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:40
+#: ../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:39
+#: ../data/ui/template-designer.ui.h:62
 msgid "inches"
 msgstr "polegadas"
 
@@ -1680,34 +1708,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 +1747,397 @@ msgstr "Atributo nome também falta."
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
+#: ../data/ui/merge-properties-dialog.ui.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
+#: ../data/ui/merge-properties-dialog.ui.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:3
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "Localização:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Seleccionar Tudo"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../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
+#: ../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 objecto Xxx</span>"
 
-#: ../data/builder/object-editor.builder.h:5
-#: ../data/builder/prefs-dialog.builder.h:7
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:5
 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:6
 msgid "Angle:"
 msgstr "Ã?ngulo:"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:7
 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:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "Activar sombra"
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Família:"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Preencher"
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Altura:"
 
-#: ../data/builder/object-editor.builder.h:17
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Chave:"
 
-#: ../data/builder/object-editor.builder.h:18
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Comprimento:"
 
-#: ../data/builder/object-editor.builder.h:20
-#: ../data/builder/prefs-dialog.builder.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "Espaçamento de linhas:"
 
-#: ../data/builder/object-editor.builder.h:21
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Literal:"
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "Opacidade:"
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Posição"
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "Redefinir tamanho da imagem"
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:24
 msgid "Shadow"
 msgstr "Sombra"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Estilo:"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr "Deslocamento X:"
 
-#: ../data/builder/object-editor.builder.h:33
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "Deslocamento Y:"
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "graus"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "dígitos:"
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../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/builder/prefs-dialog.builder.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">Preencher</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">Linha</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">Texto</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">Unidades</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Polegadas"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "Local"
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Milímetros"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "Padrões do objecto"
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Pontos"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 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:18
 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:19 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../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 +2156,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 +2183,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 +2222,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 +2230,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 +2276,45 @@ 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/builder/print-op-dialog-custom-widget.builder.h:1
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
 #, fuzzy
 msgid "<b>Copies</b>"
 msgstr "<b>Opções</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 #, fuzzy
 msgid "<b>Merge Control</b>"
 msgstr "<b>Controlo de Impressão (Fusão)</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
 msgid "<b>Options</b>"
 msgstr "<b>Opções</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:4
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
 msgid "Collate"
 msgstr "Comparar"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
+#: ../data/ui/print-op-dialog-custom-widget.ui.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 +2459,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 +2476,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 +2493,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 +2519,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 +2913,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 +3082,32 @@ msgstr "Etiquetas de Cópia Rectangulares"
 msgid "Video Labels (back)"
 msgstr "Etiquetas de Vídeo (traseira)"
 
+#~ msgid "00000000000 00000"
+#~ msgstr "00000000000 00000"
+
+#~ 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"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 11eedec..5f6176e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 1.91.0\n"
-"POT-Creation-Date: 2004-08-08 00:43-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-27 22:36-0400\n"
 "PO-Revision-Date: 2003-01-03 23:15-0300\n"
 "Last-Translator: Paulo R. Ormenese <pormenese uol com br>\n"
 "Language-Team: Brazilian portuguese <>\n"
@@ -13,1965 +14,2168 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/glabels.c:55
-msgid "Show view debugging messages."
-msgstr "Exibe mensagens de depuração de visualização."
-
-#: src/glabels.c:58
-msgid "Show item debugging messages."
-msgstr "Exibe mensagens de depuração de item."
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr ""
 
-#: src/glabels.c:61
-msgid "Show printing debugging messages."
-msgstr "Exibe mensagens de depuração de impressão."
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr ""
 
-#: src/glabels.c:64
-msgid "Show prefs debugging messages."
-msgstr "Exibe mensagens de depuração de preferências."
+#: ../src/bc.c:72
+msgid "POSTNET-9 (ZIP+4)"
+msgstr ""
 
-#: src/glabels.c:67
-msgid "Show file debugging messages."
-msgstr "Exibe mensagens de depuração de arquivo."
+#: ../src/bc.c:75
+msgid "POSTNET-11 (DPBC)"
+msgstr ""
 
-#: src/glabels.c:70
-msgid "Show document debugging messages."
-msgstr "Exibe mensagens de depuração de documeto."
+#: ../src/bc.c:80
+msgid "CEPNET"
+msgstr ""
 
-#: src/glabels.c:73
-msgid "Show template debugging messages."
-msgstr "Exibe mensagens de depuração de modelo."
+#: ../src/bc.c:83
+msgid "EAN (any)"
+msgstr ""
 
-#: src/glabels.c:76
-#, fuzzy
-msgid "Show paper debugging messages."
-msgstr "Exibe mensagens de depuração de preferências."
+#: ../src/bc.c:86
+msgid "EAN-8"
+msgstr ""
 
-#: src/glabels.c:79
-msgid "Show xml debugging messages."
-msgstr "Exibe mensagens de depuração de xml."
+#: ../src/bc.c:89
+msgid "EAN-8 +2"
+msgstr ""
 
-#: src/glabels.c:82
-msgid "Show document merge debugging messages."
-msgstr "Exibe mensagens de depuração de fusão de documento."
+#: ../src/bc.c:92
+msgid "EAN-8 +5"
+msgstr ""
 
-#: src/glabels.c:85
-msgid "Show commands debugging messages."
-msgstr "Exibe mensagens de depuração de comandos."
+#: ../src/bc.c:95
+msgid "EAN-13"
+msgstr ""
 
-#: src/glabels.c:88
-msgid "Show undo debugging messages."
-msgstr "Exibe mensagens de depuração de desfazer."
+#: ../src/bc.c:98
+msgid "EAN-13 +2"
+msgstr ""
 
-#: src/glabels.c:91
-msgid "Show recent debugging messages."
-msgstr "Exibe mensagens de depuração de recentes"
+#: ../src/bc.c:101
+msgid "EAN-13 +5"
+msgstr ""
 
-#: src/glabels.c:94
-msgid "Show window debugging messages."
-msgstr "Exibe mensagens de depuração de janela."
+#: ../src/bc.c:104
+msgid "UPC (UPC-A or UPC-E)"
+msgstr ""
 
-#: src/glabels.c:97
-msgid "Show ui debugging messages."
-msgstr "Exibe mensagens de depuração de ui."
+#: ../src/bc.c:107
+msgid "UPC-A"
+msgstr ""
 
-#: src/glabels.c:100
-#, fuzzy
-msgid "Show property_bar debugging messages."
-msgstr "Exibe mensagens de depuração de preferências."
+#: ../src/bc.c:110
+msgid "UPC-A +2"
+msgstr ""
 
-#: src/glabels.c:103
-msgid "Show media select widget debugging messages."
-msgstr "Exibe mensagens de depuração de widget de seleção de mídia."
+#: ../src/bc.c:113
+msgid "UPC-A +5"
+msgstr ""
 
-#: src/glabels.c:106
-msgid "Show mini preview widget debugging messages."
-msgstr "Exibe mensagens de depuração de widget de mini previsão."
+#: ../src/bc.c:116
+msgid "UPC-E"
+msgstr ""
 
-#: src/glabels.c:109
-#, fuzzy
-msgid "Show pixbuf cache debugging messages."
-msgstr "Exibe mensagens de depuração de visualização."
+#: ../src/bc.c:119
+msgid "UPC-E +2"
+msgstr ""
 
-#: src/glabels.c:112
-msgid "Show widget debugging messages."
-msgstr "Exibe mensagens de depuração de widget."
+#: ../src/bc.c:122
+msgid "UPC-E +5"
+msgstr ""
 
-#: src/glabels.c:115
-#, fuzzy
-msgid "Show object editor debugging messages."
-msgstr "Exibe mensagens de depuração de recentes"
+#: ../src/bc.c:125
+msgid "ISBN"
+msgstr ""
 
-#: src/glabels.c:118
-msgid "Turn on all debugging messages."
-msgstr "Ativa todas as mensagens de depuração."
+#: ../src/bc.c:128
+msgid "ISBN +5"
+msgstr ""
 
-#: src/glabels.c:187
-msgid "Could not initialize Bonobo!\n"
-msgstr "Impossível inicializar Bonobo!\n"
+#: ../src/bc.c:131
+msgid "Code 39"
+msgstr ""
 
-#: src/glabels-batch.c:48
-msgid "print this message"
-msgstr "mostra esta mensagem"
+#: ../src/bc.c:134
+msgid "Code 128"
+msgstr ""
 
-#: src/glabels-batch.c:50
-msgid "print the version of glabels-batch being used"
-msgstr "mostra a versão de glabels-batch que está sendo usada"
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr ""
 
-#: src/glabels-batch.c:52
-msgid "set output filename (default=\"output.ps\")"
-msgstr "define o nome do arquivo de saída (padrão=\"output.ps\")"
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr ""
 
-#: src/glabels-batch.c:52
-msgid "filename"
-msgstr "nome_de_arquivo"
+#: ../src/bc.c:143
+msgid "Interleaved 2 of 5"
+msgstr ""
 
-#: src/glabels-batch.c:54
-msgid "number of sheets (default=1)"
-msgstr "número de páginas (padrão=1)"
+#: ../src/bc.c:146
+msgid "Codabar"
+msgstr ""
 
-#: src/glabels-batch.c:54
-msgid "sheets"
-msgstr "páginas"
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr ""
 
-#: src/glabels-batch.c:56
-msgid "number of copies (default=1)"
-msgstr "número de cópias (padrão=1)"
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr ""
 
-#: src/glabels-batch.c:56
-msgid "copies"
-msgstr "cópias"
+#: ../src/bc.c:155
+msgid "Code 93"
+msgstr ""
 
-#: src/glabels-batch.c:58 src/print-dialog.c:336
-msgid "print outlines (to test printer alignment)"
-msgstr "imprimir contornos (testar alinhamento da impressora)"
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
 
-#: src/glabels-batch.c:60 src/print-dialog.c:344
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "imprimir ao contrário (como uma imagem de espelho)"
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr ""
 
-#: src/glabels-batch.c:96
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr "[OPÃ?Ã?O...] ARQUIVO_GLABELS..."
+#: ../src/bc.c:176
+msgid "IEC18004 (QRCode)"
+msgstr ""
 
-#: src/glabels-batch.c:116
-msgid "missing glabels file\n"
-msgstr "faltando arquivo glabels\n"
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
+#, fuzzy
+msgid "Default Color"
+msgstr "Apagar"
 
-#: src/glabels-batch.c:157
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "impossível abrir o arquivo glabels %s\n"
+#: ../src/color-combo-menu.c:83
+msgid "Dark Red"
+msgstr ""
 
-#: src/window.c:244
-msgid "(none) - gLabels"
-msgstr "(sem nome) - gLabels"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/window.c:414
-msgid "(modified)"
-msgstr "(modificado)"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/stock.c:65 data/ui/glabels-ui.xml.h:165
-msgid "_Select Mode"
-msgstr "_Selecionar Modo"
+#: ../src/color-combo-menu.c:86
+msgid "Dark Green"
+msgstr ""
 
-#: src/stock.c:66 data/ui/glabels-ui.xml.h:166
-msgid "_Text"
-msgstr "_Texto"
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
 
-#: src/stock.c:67 data/ui/glabels-ui.xml.h:151
-msgid "_Line"
-msgstr "_Linha"
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/stock.c:68 data/ui/glabels-ui.xml.h:133
-msgid "_Box"
-msgstr "_Caixa"
+#: ../src/color-combo-menu.c:89
+msgid "Dark Violet"
+msgstr ""
 
-#: src/stock.c:69 data/ui/glabels-ui.xml.h:144
-msgid "_Ellipse"
-msgstr "_Elipse"
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "Refazer"
 
-#: src/stock.c:70 data/ui/glabels-ui.xml.h:149
-msgid "_Image"
-msgstr "_Imagem"
+#: ../src/color-combo-menu.c:92
+msgid "Orange"
+msgstr ""
 
-#: src/stock.c:71 data/ui/glabels-ui.xml.h:11
-msgid "Bar_code"
-msgstr "_Código barras"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
 
-#: src/stock.c:72
-msgid "_Merge Properties"
-msgstr "Propriedades de _Fusão"
+#: ../src/color-combo-menu.c:94
+msgid "Medium green"
+msgstr ""
 
-#: src/stock.c:73
-msgid "Object _Properties"
-msgstr "_Propriedades de Objeto"
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
 
-#: src/stock.c:74 data/ui/glabels-ui.xml.h:13
-msgid "Bring to _Front"
-msgstr "Trazer para _Frente"
+#: ../src/color-combo-menu.c:96
+msgid "Blue"
+msgstr ""
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:110
-msgid "Send to _Back"
-msgstr "Enviar para _trás"
+#: ../src/color-combo-menu.c:97
+msgid "Purple"
+msgstr ""
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:97
-msgid "Rotate _Left"
-msgstr "Girar _Esquerda"
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr ""
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:98
-msgid "Rotate _Right"
-msgstr "Girar _Direita"
+#: ../src/color-combo-menu.c:100
+msgid "Gold"
+msgstr ""
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
-msgstr "Refletir _Horizontalmente"
+#: ../src/color-combo-menu.c:101
+msgid "Yellow"
+msgstr ""
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
-msgstr "Refletir _Verticalmente"
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "graus"
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:150
-msgid "_Lefts"
-msgstr "_Esquerdas"
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
+msgstr ""
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:162
-msgid "_Rights"
-msgstr "_Direitas"
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "Estilo:"
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:134
-msgid "_Centers"
-msgstr "C_entros"
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr ""
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:167
-msgid "_Tops"
-msgstr "_Topos"
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "Imprimir"
 
-#: src/stock.c:84
-msgid "Bottoms"
-msgstr "Bases"
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr ""
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr "Centros"
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
+msgstr ""
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
-msgstr "Ce_ntro Etiqueta"
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "graus"
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
 msgstr ""
 
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
 msgstr ""
 
-#: src/stock.c:90 src/stock.c:92
-#, fuzzy
-msgid "Linked"
-msgstr "Linha"
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
+msgstr ""
 
-#: src/stock.c:91 src/stock.c:93
-#, fuzzy
-msgid "Not Linked"
-msgstr "Nenhum"
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr ""
 
-#: src/ui-property-bar.c:345 src/object-editor.c:499
-#, fuzzy
-msgid "Default"
-msgstr "Apagar"
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr ""
 
-#: src/ui-property-bar.c:360 src/object-editor.c:512
-msgid "No fill"
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
 msgstr ""
 
-#: src/ui-property-bar.c:375 src/object-editor.c:505
-#, fuzzy
-msgid "No line"
-msgstr "Nenhum"
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr ""
 
-#: src/ui-sidebar.c:180
-#, fuzzy
-msgid "Object properties"
-msgstr "_Propriedades de Objeto"
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+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:125
+#, no-c-format
+msgid "60% Gray"
 msgstr ""
-"Um programa para criação de etiquetas e cartões de negócios para o GNOME.\n"
-"\n"
-"Glabels é software livre; você pode redistribuí-lo e/ou modificá-lo sob os "
-"termos da Licença Pública Geral GNU conforme publicada pela Free Software "
-"Foundation; ou a versão 2 da Licença, ou (sob sua opção) qualquer versão "
-"posterior.\n"
-"\n"
-"Este programa é distribuido na esperança de que seja útil, mas SEM QUALQUER "
-"GARANTIA; sem mesmo as garantias implícitas de COMERCIALIZA��O ou AJUSTES A "
-"UM PROP�SITO PARTICULAR. Veja a Licença Pública Geral GNU para mais "
-"detalhes.\n"
 
-#: src/commands.c:399
-msgid "See the file AUTHORS for additional credits,"
-msgstr "Veja o arquivo AUTHORS para ver créditos adicionais,"
+#: ../src/color-combo-menu.c:126
+msgid "Black"
+msgstr ""
 
-#: src/commands.c:400
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 #, fuzzy
-msgid "or visit http://glabels.sourceforge.net/";
-msgstr "ou visite http://snaught.com/glabels";
+msgid "Custom Color"
+msgstr "Personaliza barras de ferramentas"
 
-#: src/commands.c:409
-msgid " "
-msgstr ""
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "Personaliza barras de ferramentas"
 
-#: src/commands.c:424
-msgid "glabels"
-msgstr "glabels"
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr ""
 
-#: src/file.c:100
+#: ../src/file.c:84
 msgid "New Label or Card"
 msgstr "Nova Etiqueta ou Cartão"
 
-#: src/file.c:132 src/file.c:304
-msgid "Media Type"
-msgstr "Tipo de mídia"
-
-#: src/file.c:138 src/file.c:310
-msgid "Label orientation"
-msgstr "Orientação da etiqueta"
-
-#: src/file.c:269
+#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
 #, fuzzy
 msgid "Label properties"
 msgstr "_Propriedades de Objeto"
 
-#: 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
 #, fuzzy
 msgid "gLabels documents"
 msgstr "Preferências do 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 "Seleção de nome de arquivo vazia"
 
-#: 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 "Por favor, selecione um arquivo ou forneça um nome de arquivo válido"
 
-#: src/file.c:519 src/file.c:631
+#: ../src/file.c:335
 msgid "File does not exist"
 msgstr "Arquivo inexistente"
 
-#: src/file.c:563 data/ui/glabels-ui.xml.h:75
-msgid "Open"
-msgstr "Abrir"
-
-#: src/file.c:565
-msgid "Open label"
-msgstr "Abrir etiqueta"
-
-#: src/file.c:707
+#: ../src/file.c:410
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "Impossível abrir o arquivo \"%s\""
 
-#: src/file.c:715
+#: ../src/file.c:413
 msgid "Not a supported file format"
 msgstr "Formato de arquivo não suportado"
 
-#: 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 "Impossível salvar o arquivo \"%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 "Erro encontrado ao salvar. O arquivo ainda não foi salvo."
 
-#: src/file.c:848 src/file.c:1048
+#: ../src/file.c:535
 #, c-format
 msgid "Save \"%s\" as"
 msgstr "Salvar \"%s\" como"
 
-#: src/file.c:935 src/file.c:1131
+#: ../src/file.c:623
 msgid "Please supply a valid file name"
 msgstr "Por favor, forneça um nome de arquivo válido"
 
-#: src/file.c:952 src/file.c:1147
+#: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
 msgstr "Sobrescrever o arquivo \"%s\"?"
 
-#: src/file.c:960 src/file.c:1155
+#: ../src/file.c:648
 msgid "File already exists."
 msgstr "O arquivo já existe."
 
-#: src/file.c:1271
+#: ../src/file.c:744
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Salvar modificações no documento \"%s\" antes de fechar?"
 
-#: src/file.c:1279
+#: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
 msgstr "Suas modificações serão perdidas se você não salvá-las."
 
-#: src/file.c:1282
+#: ../src/file.c:751
 msgid "Close without saving"
 msgstr "Fechar sem salvar"
 
-#. 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 "pontos"
-
-#: src/prefs.c:158 data/glade/object-editor.glade.h:36
-#: data/glade/template-designer.glade.h:74
-msgid "inches"
-msgstr "poleg."
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "_Arquivos recentes"
 
-#: 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 "Preferências do gLabels"
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
 
-#.
-#. * Submenu: Order
-#.
-#: src/view.c:3570 data/ui/glabels-ui.xml.h:157
-msgid "_Order"
-msgstr "_Ordenar"
+#: ../src/font-combo-menu.c:168
+msgid "All fonts"
+msgstr ""
 
 #.
-#. * 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:3591 data/ui/glabels-ui.xml.h:163
-msgid "_Rotate/Flip"
-msgstr "_Girar/Refletir"
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
 
-#.
-#. * Submenu: Align Horizontally
-#.
-#: src/view.c:3624
-msgid "Align _Horizontally"
-msgstr "Alinhar _Horizontalmente"
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
 
-#.
-#. * Submenu: Align Vertically
-#.
-#: src/view.c:3663
-msgid "Align _Vertically"
-msgstr "Alinhar _Verticalmente"
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
 
-#: src/view.c:3724 data/ui/glabels-ui.xml.h:140
-msgid "_Delete"
-msgstr "_Apagar"
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
 
-#. Build editor.
-#: src/view-box.c:223
+#: ../src/font-combo-menu-item.c:157
 #, fuzzy
-msgid "Box object properties"
-msgstr "Editar propriedades do objeto caixa"
+msgid "Sample text"
+msgstr "Dado de amostra"
 
-#. Build editor.
-#: src/view-ellipse.c:223
+#: ../src/glabels-batch.c:52
 #, fuzzy
-msgid "Ellipse object properties"
-msgstr "Editar propriedades do objeto elipse"
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "define o nome do arquivo de saída (padrão=\"output.ps\")"
 
-#. Build editor.
-#: src/view-line.c:223
-#, fuzzy
-msgid "Line object properties"
-msgstr "Edita propriedades do objeto"
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+msgid "filename"
+msgstr "nome_de_arquivo"
 
-#. Build editor.
-#: src/view-image.c:222
-#, fuzzy
-msgid "Image object properties"
-msgstr "Editar propriedades do objeto imagem"
+#: ../src/glabels-batch.c:54
+msgid "number of sheets (default=1)"
+msgstr "número de páginas (padrão=1)"
+
+#: ../src/glabels-batch.c:54
+msgid "sheets"
+msgstr "páginas"
 
-#. Build editor.
-#: src/view-text.c:250
+#: ../src/glabels-batch.c:56
+msgid "number of copies (default=1)"
+msgstr "número de cópias (padrão=1)"
+
+#: ../src/glabels-batch.c:56
+msgid "copies"
+msgstr "cópias"
+
+#: ../src/glabels-batch.c:58
 #, fuzzy
-msgid "Text object properties"
-msgstr "Edita propriedades do objeto"
+msgid "first label on first sheet (default=1)"
+msgstr "número de páginas (padrão=1)"
 
-#: src/view-text.c:562 data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "Texto"
+#: ../src/glabels-batch.c:58
+msgid "first"
+msgstr ""
 
-#. Build editor.
-#: src/view-barcode.c:209
+#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "imprimir contornos (testar alinhamento da impressora)"
+
+#: ../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 "imprimir ao contrário (como uma imagem de espelho)"
+
+#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
+msgstr ""
+
+#: ../src/glabels-batch.c:66
+msgid "input file for merging"
+msgstr ""
+
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr ""
+
+#: ../src/glabels-batch.c:98
+msgid "Print files created with gLabels."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/glabels-batch.c:149
+#, fuzzy, c-format
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "impossível abrir o arquivo glabels %s\n"
+
+#: ../src/glabels-batch.c:184
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "impossível abrir o arquivo glabels %s\n"
+
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr ""
+
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Criar objeto código de barras"
+
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+msgid "Barcode data"
+msgstr "Dado do Código de Barras:"
+
+#: ../src/label-barcode.c:263
 #, fuzzy
-msgid "Barcode object properties"
+msgid "Barcode property"
 msgstr "Editar propriedades do objeto código de barras"
 
-#: src/view-barcode.c:579 src/print.c:1088
+#: ../src/label-barcode.c:483
+#, fuzzy
+msgid "Barcode data empty"
+msgstr "Dado do Código de Barras:"
+
+#: ../src/label-barcode.c:487
 #, fuzzy
 msgid "Invalid barcode data"
 msgstr "Código de barras inválido"
 
-#: src/merge-properties-dialog.c:231
-msgid "Merge Properties"
-msgstr "Propriedades de Fusão"
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "Criar objeto texto"
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "Fonte"
+#: ../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/merge-properties-dialog.c:245
-msgid "Format:"
-msgstr "Formato:"
+#: ../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 ""
 
-#. Location line
-#: src/merge-properties-dialog.c:273
-msgid "Location:"
-msgstr "Localização"
+#: ../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/merge-properties-dialog.c:282 src/merge-properties-dialog.c:393
-msgid "Select merge-database source"
-msgstr "Selecione a fonte da base de dados da fusão"
+#: ../src/label.c:399
+msgid "Untitled"
+msgstr "Sem_título"
 
-#: src/merge-properties-dialog.c:289 src/merge-properties-dialog.c:404
-msgid "N/A"
-msgstr "Não definido"
+#: ../src/label.c:702 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "Propriedades de Fusão"
 
-#. ---- Sample Fields section ----
-#: src/merge-properties-dialog.c:300
-msgid "Record selection/preview:"
-msgstr "Seleção/previsão de registro:"
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Apagar"
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "Selecionar"
+#: ../src/label.c:1217 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "Trazer para _Frente"
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
-msgstr "Registro/Campo"
+#: ../src/label.c:1253 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "Enviar para _trás"
 
-#: src/merge-properties-dialog.c:342 data/glade/object-editor.glade.h:9
-msgid "Data"
-msgstr "Dado"
+#: ../src/label.c:1294
+msgid "Rotate"
+msgstr "Girar"
 
-#: src/print-dialog.c:266 data/ui/glabels-ui.xml.h:82
-msgid "Print"
-msgstr "Imprimir"
+#: ../src/label.c:1329 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "Girar _Esquerda"
 
-#: src/print-dialog.c:281
-msgid "_Job"
-msgstr "_Trabalho"
+#: ../src/label.c:1362 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "Girar _Direita"
 
-#: src/print-dialog.c:286
-msgid "P_rinter"
-msgstr "Imp_ressora"
+#: ../src/label.c:1397 ../src/ui.c:352
+#, fuzzy
+msgid "Flip horizontally"
+msgstr "Refletir _Horizontalmente"
 
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:314
-msgid "Copies"
-msgstr "Cópias"
+#: ../src/label.c:1432 ../src/ui.c:359
+#, fuzzy
+msgid "Flip vertically"
+msgstr "Refletir _Verticalmente"
 
-#. ------- Add merge control widget ------------
-#: src/print-dialog.c:322
-msgid "Document merge control"
-msgstr "Controle de fusão do documento"
+#: ../src/label.c:1472 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "Alinhamento:"
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "Opções"
+#: ../src/label.c:1529 ../src/ui.c:373
+#, fuzzy
+msgid "Align right"
+msgstr "Alinhar _Horizontal"
 
-#: src/print-dialog.c:351
-msgid "print crop marks"
-msgstr ""
+#: ../src/label.c:1590 ../src/ui.c:380
+#, fuzzy
+msgid "Align horizontal center"
+msgstr "Alinha objetos pelos centros horizontais"
 
-#: src/print-dialog.c:553 src/print-dialog.c:592
-msgid "Print preview"
-msgstr "Visualizar impressão"
+#: ../src/label.c:1666 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "Alinha objetos pelos topos"
 
-#: src/template-designer.c:409 data/glade/template-designer.glade.h:73
-msgid "gLabels Template Designer"
-msgstr ""
+#: ../src/label.c:1723 ../src/ui.c:394
+#, fuzzy
+msgid "Align bottoms"
+msgstr "Alinha objetos pelas bases"
 
-#: src/bc.c:60
-msgid "POSTNET (any)"
-msgstr ""
+#: ../src/label.c:1784 ../src/ui.c:401
+#, fuzzy
+msgid "Align vertical center"
+msgstr "Alinha objetos pelos centros verticais"
 
-#: src/bc.c:63
-msgid "POSTNET-5 (ZIP only)"
-msgstr ""
+#: ../src/label.c:1862 ../src/ui.c:408
+#, fuzzy
+msgid "Center horizontally"
+msgstr "Reflete objeto horizontalmente"
 
-#: src/bc.c:66
-msgid "POSTNET-9 (ZIP+4)"
-msgstr ""
+#: ../src/label.c:1909 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "Reflete objeto verticalmente"
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
-msgstr ""
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
+msgstr "Colar"
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr ""
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Criar objeto linha"
 
-#: src/bc.c:75
-msgid "EAN-8"
-msgstr ""
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Criar objeto imagem"
 
-#: src/bc.c:78
-msgid "EAN-8 +2"
-msgstr ""
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, fuzzy
+msgid "Set image"
+msgstr "Redefinir tamanho da imagem"
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr ""
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Criar objeto linha"
 
-#: src/bc.c:84
-msgid "EAN-13"
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
 msgstr ""
 
-#: src/bc.c:87
-msgid "EAN-13 +2"
-msgstr ""
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Tamanho da página:"
 
-#: src/bc.c:90
-msgid "EAN-13 +5"
+#: ../src/label-object.c:1185
+msgid "Shadow state"
 msgstr ""
 
-#: src/bc.c:93
-msgid "UPC (UPC-A or UPC-E)"
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
 msgstr ""
 
-#: src/bc.c:96
-msgid "UPC-A"
+#: ../src/label-object.c:1276
+msgid "Shadow color"
 msgstr ""
 
-#: src/bc.c:99
-msgid "UPC-A +2"
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
 msgstr ""
 
-#: src/bc.c:102
-msgid "UPC-A +5"
-msgstr ""
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Criar objeto texto"
 
-#: src/bc.c:105
-msgid "UPC-E"
+#: ../src/label-text.c:451
+msgid "Typing"
 msgstr ""
 
-#: src/bc.c:108
-msgid "UPC-E +2"
-msgstr ""
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "Não salve"
 
-#: src/bc.c:111
-msgid "UPC-E +5"
-msgstr ""
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+#, fuzzy
+msgid "Font size"
+msgstr "Não salve"
 
-#: src/bc.c:114
-msgid "ISBN"
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Não salve"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
 msgstr ""
 
-#: src/bc.c:117
-msgid "ISBN +5"
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Alinhamento:"
+
+#: ../src/label-text.c:754
+msgid "Line spacing"
 msgstr ""
 
-#: src/bc.c:120
-msgid "Code 39"
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
 msgstr ""
 
-#: src/bc.c:123
-msgid "Code 128"
+#: ../src/label-text.c:931
+msgid "Auto shrink"
 msgstr ""
 
-#: src/bc.c:126
-msgid "Code 128C"
+#: ../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/bc.c:129
-msgid "Code 128B"
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+msgid "Any"
 msgstr ""
 
-#: src/bc.c:132
-msgid "Interleaved 2 of 5"
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+msgctxt "Category"
+msgid "Any"
 msgstr ""
 
-#: src/bc.c:135
-msgid "Codabar"
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "Nenhum arquivo modelo encontrado!"
+
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
 msgstr ""
 
-#: src/bc.c:138
-msgid "MSI"
+#. 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/bc.c:141
-msgid "Plessey"
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
 msgstr ""
 
-#: src/label.c:569
-msgid "Untitled"
-msgstr "Sem_título"
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Nenhum arquivo modelo encontrado!"
 
-#: src/xml-label.c:176 src/xml-label.c:213
-msgid "xmlParseFile error"
-msgstr "erro: xmlParseFile"
+#: ../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/xml-label.c:250
-msgid "No document root"
-msgstr "Sem raiz do documento"
+#. 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"
 
-#: src/xml-label.c:264
-msgid "Importing from glabels 0.1 format"
-msgstr "Importando do formato do glabels 0.1"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr ""
 
-#: src/xml-label.c:272
-msgid "Importing from glabels 0.4 format"
-msgstr "Importando do formato do glabels 0.4"
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+#, fuzzy
+msgid "Couldn't open addressbook."
+msgstr "Impossível abrir o arquivo \"%s\""
 
-#: src/xml-label.c:279
+#: ../src/merge-evolution.c:348
 #, fuzzy
-msgid "Importing from glabels 1.91 format"
-msgstr "Importando do formato do glabels 0.1"
+msgid "Couldn't list available fields."
+msgstr "Impossível salvar o arquivo \"%s\""
 
-#: src/xml-label.c:282
-msgid "bad document, unknown glabels Namespace"
-msgstr "documento ruim, espaço de nome glabels não encontrado"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+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 "Nó raiz ruim = \"%s\""
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
-#: src/xml-label.c:348 src/xml-label-191.c:165
-#, fuzzy, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "Nó raiz ruim = \"%s\""
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+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 "nó ruim = \"%s\""
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
 
-#: src/xml-label.c:796 src/xml-label-191.c:605
-#, fuzzy, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "nó ruim = \"%s\""
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
 
-#: src/xml-label.c:962 libglabels/xml-template.c:528
-msgid "Utf8 conversion error."
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
 msgstr ""
 
-#: src/xml-label.c:969 libglabels/xml-template.c:535
-msgid "Problem saving xml file."
-msgstr "Problema salvando arquivo xml."
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+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:192
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
+#: ../src/merge-init.c:104
+msgid "Evolution Addressbook"
 msgstr ""
 
-#: src/xml-label-191.c:690 libglabels/xml-template.c:202
-#, c-format
-msgid "Unknown page size id or name \"%s\""
+#: ../src/merge-init.c:110
+msgid "VCards"
 msgstr ""
 
-#: src/merge.c:172 src/merge.c:213 src/merge.c:399 src/merge.c:402
-msgid "None"
-msgstr "Nenhum"
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Propriedades de Fusão"
 
-#: src/merge-init.c:53
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Arquivo texto separado com vírgulas (CSV)"
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Selecione a fonte da base de dados da fusão"
 
-#: src/merge-init.c:60
-msgid "Text file with colon delimeters"
-msgstr "Arquivo texto separado com dois pontos"
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "Não definido"
 
-#: src/merge-init.c:67
-msgid "Text file with tab delimeters"
-msgstr "Arquivo texto separado com tab"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Selecionar"
 
-#: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11
-msgid "File:"
-msgstr "Arquivo:"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Registro/Campo"
 
-#: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "Chave:"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+msgid "Data"
+msgstr "Dado"
 
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "Páginas:"
+#. 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 "Campos"
 
-#: src/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "Etiquetas"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "de:"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "_Selecionar Modo"
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "até:"
+#: ../src/new-label-dialog.c:215
+#, fuzzy
+msgid "Choose Orientation"
+msgstr "Orientação da etiqueta"
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr "Iniciar na etiqueta"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
+msgstr ""
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "na primeira folha"
+#: ../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 "Apagar"
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "Cópias:"
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+#, fuzzy
+msgid "Object properties"
+msgstr "_Propriedades de Objeto"
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "Ordenar"
+#: ../src/object-editor.c:309
+#, fuzzy
+msgid "Box object properties"
+msgstr "Editar propriedades do objeto caixa"
 
-#: src/wdgt-media-select.c:269 data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "Descrição:"
+#: ../src/object-editor.c:328
+#, fuzzy
+msgid "Ellipse object properties"
+msgstr "Editar propriedades do objeto elipse"
 
-#: src/wdgt-media-select.c:279 data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "Tamanho da página:"
+#: ../src/object-editor.c:347
+#, fuzzy
+msgid "Line object properties"
+msgstr "Edita propriedades do objeto"
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "Tamanho da etiqueta:"
+#: ../src/object-editor.c:364
+#, fuzzy
+msgid "Image object properties"
+msgstr "Editar propriedades do objeto imagem"
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "Disposição:"
+#: ../src/object-editor.c:381
+#, fuzzy
+msgid "Text object properties"
+msgstr "Edita propriedades do objeto"
 
-#: src/wdgt-media-select.c:578
-#, c-format
-msgid "%d x %d  (%d per sheet)"
-msgstr "%d x %d  (%d por página)"
+#: ../src/object-editor.c:403
+#, fuzzy
+msgid "Barcode object properties"
+msgstr "Editar propriedades do objeto código de barras"
 
-#: src/wdgt-media-select.c:582
-#, c-format
-msgid "%d per sheet"
-msgstr "%d por página"
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "Inserir campo de fusão"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
+#: ../src/ui-property-bar.c:292
+#, fuzzy
+msgid "No Fill"
+msgstr "Preencher"
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
+msgstr ""
 
-#: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s diâmetro"
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "Imagem"
 
-#: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648
+#: ../src/object-editor-image-page.c:298
 #, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s diâmetro"
-
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "Girar"
-
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
-#, fuzzy
-msgid "custom"
-msgstr "Personalizar"
+msgid "%s (*.%s)"
+msgstr ""
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
+#: ../src/ui-property-bar.c:304
 #, fuzzy
-msgid "Custom Color:"
-msgstr "Personaliza barras de ferramentas"
+msgid "No Line"
+msgstr "Nenhum"
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
-msgstr ""
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+msgid "gLabels Preferences"
+msgstr "Preferências do gLabels"
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-msgstr ""
+#. ===================================================================
+#: ../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 "Etiquetas"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr ""
+#: ../src/stock.c:70
+msgid "_Select Mode"
+msgstr "_Selecionar Modo"
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
-msgstr ""
+#: ../src/stock.c:71
+msgid "_Text"
+msgstr "_Texto"
 
-#: src/mygal/color-palette.c:582
-msgid "dark green #2"
-msgstr ""
+#: ../src/stock.c:72
+msgid "_Line"
+msgstr "_Linha"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
-msgstr ""
+#: ../src/stock.c:73
+msgid "_Box"
+msgstr "_Caixa"
 
-#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr ""
+#: ../src/stock.c:74
+msgid "_Ellipse"
+msgstr "_Elipse"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr ""
+#: ../src/stock.c:75
+msgid "_Image"
+msgstr "_Imagem"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr ""
+#: ../src/stock.c:76
+msgid "Bar_code"
+msgstr "_Código barras"
 
-#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr ""
+#: ../src/stock.c:77
+msgid "_Merge Properties"
+msgstr "Propriedades de _Fusão"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
-msgstr ""
+#: ../src/stock.c:78
+msgid "Object _Properties"
+msgstr "_Propriedades de Objeto"
 
-#: src/mygal/color-palette.c:591
-msgid "gold"
-msgstr ""
+#: ../src/stock.c:79
+msgid "Bring to _Front"
+msgstr "Trazer para _Frente"
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr ""
+#: ../src/stock.c:80
+msgid "Send to _Back"
+msgstr "Enviar para _trás"
 
-#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
-msgid "dull blue"
-msgstr ""
+#: ../src/stock.c:81
+msgid "Rotate _Left"
+msgstr "Girar _Esquerda"
 
-#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
-msgid "blue"
-msgstr ""
+#: ../src/stock.c:82
+msgid "Rotate _Right"
+msgstr "Girar _Direita"
 
-#: src/mygal/color-palette.c:595
-msgid "dull purple"
-msgstr ""
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
+msgstr "Refletir _Horizontalmente"
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-msgstr ""
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
+msgstr "Refletir _Verticalmente"
 
-#: src/mygal/color-palette.c:599
-msgid "red"
-msgstr ""
+#: ../src/stock.c:85
+msgid "_Lefts"
+msgstr "_Esquerdas"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr ""
+#: ../src/stock.c:86
+msgid "_Rights"
+msgstr "_Direitas"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr ""
+#: ../src/stock.c:87
+msgid "_Centers"
+msgstr "C_entros"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr ""
+#: ../src/stock.c:88
+msgid "_Tops"
+msgstr "_Topos"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr ""
+#: ../src/stock.c:89
+msgid "Bottoms"
+msgstr "Bases"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr ""
+#: ../src/stock.c:90
+msgid "Centers"
+msgstr "Centros"
 
-#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
-msgid "purple"
-msgstr ""
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
+msgstr "Ce_ntro Etiqueta"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr ""
+#: ../src/stock.c:95 ../src/stock.c:97
+#, fuzzy
+msgid "Linked"
+msgstr "Linha"
 
-#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#: ../src/stock.c:96 ../src/stock.c:98
 #, fuzzy
-msgid "magenta"
-msgstr "Imagem"
+msgid "Not Linked"
+msgstr "Nenhum"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
+#: ../src/template-designer.c:404
+msgid "New gLabels Template"
 msgstr ""
 
-#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
-msgid "yellow"
+#: ../src/template-designer.c:461
+msgid "Welcome"
 msgstr ""
 
-#: src/mygal/color-palette.c:612
+#: ../src/template-designer.c:500
 #, fuzzy
-msgid "green"
-msgstr "graus"
+msgid "Name and Description"
+msgstr "Descrição:"
 
-#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr ""
+#: ../src/template-designer.c:548
+#, fuzzy
+msgid "Page Size"
+msgstr "Tamanho da página:"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
-msgstr ""
+#: ../src/template-designer.c:614
+#, fuzzy
+msgid "Label or Card Shape"
+msgstr "Nova Etiqueta ou Cartão"
 
-#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
-msgid "red purple"
-msgstr ""
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "Nova Etiqueta ou Cartão"
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
-msgstr ""
+#: ../src/template-designer.c:760
+#, fuzzy
+msgid "Label Size (round)"
+msgstr "Tamanho da etiqueta:"
 
-#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
-msgid "pink"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
 msgstr ""
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
 msgstr ""
 
-#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr ""
+#: ../src/template-designer.c:1000
+#, fuzzy
+msgid "Layout(s)"
+msgstr "Disposição:"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
 msgstr ""
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
 msgstr ""
 
-#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
-msgid "light blue"
+#: ../src/template-designer.c:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
 msgstr ""
 
-#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
-msgid "light purple"
-msgstr ""
+#. Menu entries.
+#: ../src/ui.c:93
+msgid "_File"
+msgstr "_Arquivo"
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr ""
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "_Arquivos recentes"
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
-msgstr ""
+#: ../src/ui.c:95
+msgid "_Edit"
+msgstr "_Editar"
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
-msgstr ""
+#: ../src/ui.c:96
+msgid "_View"
+msgstr "_Visualizar"
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr ""
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
+msgstr "Personaliza barra de ferramentas principal"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr "Página completa %s genérico"
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
+msgstr "Personaliza barra de ferramentas de desenho"
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "Nenhum arquivo modelo encontrado!"
+#: ../src/ui.c:99
+#, fuzzy
+msgid "Customize Properties Toolbar"
+msgstr "Personaliza barras de ferramentas"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr ""
+#: ../src/ui.c:100
+msgid "_Objects"
+msgstr "_Objetos"
 
-#: libglabels/paper.c:361
+#: ../src/ui.c:101
 #, fuzzy
-msgid "No paper files found!"
-msgstr "Nenhum arquivo modelo encontrado!"
+msgid "_Create"
+msgstr "C_entros"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
-msgstr "Sobre glabels"
+#: ../src/ui.c:102
+msgid "_Order"
+msgstr "_Ordenar"
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
-msgstr "Sobre..."
+#: ../src/ui.c:103
+msgid "_Rotate/Flip"
+msgstr "_Girar/Refletir"
 
-#: data/ui/glabels-ui.xml.h:3
+#: ../src/ui.c:104
 msgid "Align _Horizontal"
 msgstr "Alinhar _Horizontal"
 
-#: data/ui/glabels-ui.xml.h:4
+#: ../src/ui.c:105
 msgid "Align _Vertical"
 msgstr "Alinhar _Vertical"
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
-msgstr "Alinha objetos pelas bases"
-
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
-msgstr "Alinha objetos pelos centros horizontais"
-
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
-msgstr "Alinha objetos pelas bordas esquerdas"
-
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
-msgstr "Alinha objetos pelas bordas direitas"
-
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
-msgstr "Alinha objetos pelos topos"
+#: ../src/ui.c:106
+msgid "_Help"
+msgstr "A_juda"
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
-msgstr "Alinha objetos pelos centros verticais"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+#, fuzzy
+msgid "Context Menu"
+msgstr "Conteúdo"
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
-msgstr ""
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "_Novo"
 
-#: data/ui/glabels-ui.xml.h:14
+#: ../src/ui.c:117
 #, fuzzy
-msgid "Center align"
-msgstr "Centros"
-
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
-msgstr "Centra objetos no centro horizontal da etiqueta"
+msgid "Create a new file"
+msgstr "Cria um novo documento"
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr "Centra objetos no centro vertical da etiqueta"
+#: ../src/ui.c:122
+msgid "_Open..."
+msgstr "_Abrir..."
 
-#: data/ui/glabels-ui.xml.h:17
-msgid "Change the visibility of markup lines in the current window"
-msgstr "Muda a visibilidade das linhas de marcação na janela atual"
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "Abrir um arquivo"
 
-#: data/ui/glabels-ui.xml.h:18
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr "Muda a visibilidade da barra de ferramentas de desenho na janela atual"
+#: ../src/ui.c:129
+msgid "_Save"
+msgstr "_Salvar"
 
-#: data/ui/glabels-ui.xml.h:19
-msgid "Change the visibility of the grid in the current window"
-msgstr "Muda a visibilidade da grade na janela atual"
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "Salva o arquivo atual"
 
-#: data/ui/glabels-ui.xml.h:20
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr "Muda a visibilidade da barra de ferramentas principal na janela atual"
+#: ../src/ui.c:136
+msgid "Save _As..."
+msgstr "Salvar _como..."
 
-#: data/ui/glabels-ui.xml.h:21
+#: ../src/ui.c:138
 #, fuzzy
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr "Muda a visibilidade da barra de ferramentas principal na janela atual"
-
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr "Fechar"
+msgid "Save the current file to a different name"
+msgstr "Salva o arquivo atual com um nome diferente"
 
-#: data/ui/glabels-ui.xml.h:23
-msgid "Close the current file"
-msgstr "Fechar o arquivo atual"
+#: ../src/ui.c:143
+msgid "_Print..."
+msgstr "Im_primir..."
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr "Configurar a aplicação"
+#: ../src/ui.c:145
+msgid "Print the current file"
+msgstr "Imprime o arquivo atual"
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
-msgstr "Conteúdo"
+#: ../src/ui.c:150
+#, fuzzy
+msgid "Properties..."
+msgstr "Propriedades"
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr "Copiar"
+#: ../src/ui.c:152
+#, fuzzy
+msgid "Modify document properties"
+msgstr "Editar propriedades de fusão do documento"
 
-#: data/ui/glabels-ui.xml.h:27
-msgid "Copy the selection"
-msgstr "Copia a seleção"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:28
+#: ../src/ui.c:159
 #, fuzzy
 msgid "Create a custom template"
 msgstr "Cria um novo documento"
 
-#: data/ui/glabels-ui.xml.h:29
-msgid "Create a new document"
-msgstr "Cria um novo documento"
-
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "Criar objeto código de barras"
-
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "Criar objeto caixa/retângulo"
-
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "Criar objeto elipse/círculo"
-
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "Criar objeto imagem"
-
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
-msgstr "Criar objeto linha"
-
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "Criar objeto texto"
-
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
-msgstr "Cor_tar"
+#: ../src/ui.c:164
+msgid "_Close"
+msgstr "_Fechar"
 
-#: data/ui/glabels-ui.xml.h:37
-msgid "Customize"
-msgstr "Personalizar"
+#: ../src/ui.c:166
+msgid "Close the current file"
+msgstr "Fechar o arquivo atual"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
-msgstr "Personaliza barra de ferramentas de desenho"
+#: ../src/ui.c:171
+msgid "_Quit"
+msgstr "_Sair"
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
-msgstr "Personaliza barra de ferramentas principal"
+#: ../src/ui.c:173
+msgid "Quit the program"
+msgstr "Sai do programa"
 
-#: data/ui/glabels-ui.xml.h:40
-#, fuzzy
-msgid "Customize Property Toolbar"
-msgstr "Personaliza barras de ferramentas"
+#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+msgid "Undo"
+msgstr "Desfazer"
 
-#: data/ui/glabels-ui.xml.h:41
-msgid "Customize toolbars"
-msgstr "Personaliza barras de ferramentas"
+#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+msgid "Redo"
+msgstr "Refazer"
 
-#: data/ui/glabels-ui.xml.h:42
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Cortar"
 
-#: data/ui/glabels-ui.xml.h:43
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Corta a seleção"
 
-#: data/ui/glabels-ui.xml.h:44
-msgid "Decrease magnification"
-msgstr "Diminuir aumento"
+#: ../src/ui.c:201
+msgid "Copy"
+msgstr "Copiar"
 
-#: data/ui/glabels-ui.xml.h:45
-msgid "Delete"
-msgstr "Apagar"
+#: ../src/ui.c:203
+msgid "Copy the selection"
+msgstr "Copia a seleção"
 
-#: data/ui/glabels-ui.xml.h:46
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
+msgstr "Cola a área de transferência"
+
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Apaga os objetos selecionados"
 
-#: data/ui/glabels-ui.xml.h:47
-msgid "Drawing toolbar"
-msgstr "Barra de ferramentas de desenho"
+#: ../src/ui.c:222
+msgid "Select All"
+msgstr "Selecionar Tudo"
 
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
-msgstr "Descarregar XML"
+#: ../src/ui.c:224
+msgid "Select all objects"
+msgstr "Seleciona todos os objetos"
 
-#: data/ui/glabels-ui.xml.h:49
-msgid "Dump the UI Xml description"
-msgstr "Descarrega a descrição da UI Xml"
+#: ../src/ui.c:229
+msgid "Un-select All"
+msgstr "Desmarcar Tudo"
 
-#: data/ui/glabels-ui.xml.h:50
-msgid "Edit merge properties"
-msgstr "Editar propriedades de fusão"
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "Remover todas as seleções"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
-msgstr "Reflete objeto horizontalmente"
+#: ../src/ui.c:236
+msgid "Preferences"
+msgstr "Preferências"
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
-msgstr "Reflete objeto verticalmente"
+#: ../src/ui.c:238
+msgid "Configure the application"
+msgstr "Configurar a aplicação"
 
-#: data/ui/glabels-ui.xml.h:56
+#: ../src/ui.c:245
 #, fuzzy
-msgid "Font name"
-msgstr "Não salve"
+msgid "Zoom in"
+msgstr "M_ais Zoom"
+
+#: ../src/ui.c:247
+msgid "Increase magnification"
+msgstr "Aumentar aumento"
 
-#: data/ui/glabels-ui.xml.h:57
+#: ../src/ui.c:252
 #, fuzzy
-msgid "Font selector"
-msgstr "Copia a seleção"
+msgid "Zoom out"
+msgstr "M_enos Zoom"
 
-#: data/ui/glabels-ui.xml.h:58
+#: ../src/ui.c:254
+msgid "Decrease magnification"
+msgstr "Diminuir aumento"
+
+#: ../src/ui.c:259
 #, fuzzy
-msgid "Font size"
-msgstr "Não salve"
+msgid "Zoom 1 to 1"
+msgstr "Zoom _1:1"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
-msgstr "Ã?cone e _Texto"
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
+msgstr "Restaura escala para 100%"
 
-#: data/ui/glabels-ui.xml.h:60
-msgid "Increase magnification"
-msgstr "Aumentar aumento"
+#: ../src/ui.c:266
+#, fuzzy
+msgid "Zoom to fit"
+msgstr "Zoom para 1:1"
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
+#: ../src/ui.c:268
+msgid "Set scale to fit window"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
-msgstr ""
+#: ../src/ui.c:275
+#, fuzzy
+msgid "Select Mode"
+msgstr "_Selecionar Modo"
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
-msgstr ""
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "Seleciona, movimenta e modifica objetos"
 
-#: data/ui/glabels-ui.xml.h:66
-msgid "Lower object to bottom"
-msgstr "Abaixa objeto à base"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+msgid "Text"
+msgstr "Texto"
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
-msgstr "M_arcação"
+#: ../src/ui.c:289
+#, fuzzy
+msgid "Box"
+msgstr "_Caixa"
 
-#: data/ui/glabels-ui.xml.h:68
-msgid "Main toolbar"
-msgstr "Barra de ferramentas principal"
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "Criar objeto caixa/retângulo"
 
-#: data/ui/glabels-ui.xml.h:69
-msgid "Markup"
-msgstr "Marcação"
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+msgid "Line"
+msgstr "Linha"
 
-#: data/ui/glabels-ui.xml.h:70
+#: ../src/ui.c:303
 #, fuzzy
-msgid "Modify document properties"
-msgstr "Editar propriedades de fusão do documento"
+msgid "Ellipse"
+msgstr "_Elipse"
 
-#: data/ui/glabels-ui.xml.h:71
-msgid "New"
-msgstr "Novo"
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "Criar objeto elipse/círculo"
+
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+msgid "Image"
+msgstr "Imagem"
 
-#: data/ui/glabels-ui.xml.h:72
+#: ../src/ui.c:317
 #, fuzzy
-msgid "Object property editor"
-msgstr "_Propriedades de Objeto"
+msgid "Barcode"
+msgstr "_Código barras"
 
-#: data/ui/glabels-ui.xml.h:73
-msgid "Only show icons in the drawing toolbar"
-msgstr "Exibe somente ícones na barra de ferramentas de desenho"
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr "Sobe objetos ao topo"
 
-#: data/ui/glabels-ui.xml.h:74
-msgid "Only show icons in the main toolbar"
-msgstr "Exibe somente ícones na barra de ferramentas principal"
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
+msgstr "Abaixa objeto à base"
 
-#: data/ui/glabels-ui.xml.h:76
-msgid "Open a file"
-msgstr "Abrir um arquivo"
+#: ../src/ui.c:340
+#, fuzzy
+msgid "Rotate object 90 degrees counter-clockwise"
+msgstr "Gira objeto 90 sentido anti-horário"
 
-#: data/ui/glabels-ui.xml.h:77
-msgid "Open the glabels manual"
-msgstr "Abre o manual do glabels"
+#: ../src/ui.c:347
+#, fuzzy
+msgid "Rotate object 90 degrees clockwise"
+msgstr "Gira objeto 90 sentido horário"
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste"
-msgstr "Colar"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
+msgstr "Reflete objeto horizontalmente"
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Paste the clipboard"
-msgstr "Cola a área de transferência"
+#: ../src/ui.c:361
+msgid "Flip object vertically"
+msgstr "Reflete objeto verticalmente"
 
-#: data/ui/glabels-ui.xml.h:80
-msgid "Pr_eferences..."
-msgstr "Pr_eferências..."
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
+msgstr "Alinha objetos pelas bordas esquerdas"
 
-#: data/ui/glabels-ui.xml.h:81
-msgid "Preferences"
-msgstr "Preferências"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
+msgstr "Alinha objetos pelas bordas direitas"
 
-#: data/ui/glabels-ui.xml.h:83
-msgid "Print the current file"
-msgstr "Imprime o arquivo atual"
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
+msgstr "Alinha objetos pelos centros horizontais"
 
-#: data/ui/glabels-ui.xml.h:84
+#: ../src/ui.c:389
 #, fuzzy
-msgid "Proper_ties..."
-msgstr "Propriedades"
-
-#: data/ui/glabels-ui.xml.h:85
-msgid "Properties"
-msgstr "Propriedades"
+msgid "Align objects to top edges"
+msgstr "Alinha objetos pelas bordas esquerdas"
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Property toolbar"
-msgstr ""
+#: ../src/ui.c:396
+#, fuzzy
+msgid "Align objects to bottom edges"
+msgstr "Alinha objetos pelas bases"
 
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit"
-msgstr "Sair"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
+msgstr "Alinha objetos pelos centros verticais"
 
-#: data/ui/glabels-ui.xml.h:88
-msgid "Quit the program"
-msgstr "Sai do programa"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
+msgstr "Centra objetos no centro horizontal da etiqueta"
 
-#: data/ui/glabels-ui.xml.h:89
-msgid "Raise object to top"
-msgstr "Sobe objetos ao topo"
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
+msgstr "Centra objetos no centro vertical da etiqueta"
 
-#: data/ui/glabels-ui.xml.h:90
-msgid "Recent _Files"
-msgstr "_Arquivos recentes"
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "Editar propriedades de fusão"
 
-#: data/ui/glabels-ui.xml.h:91
-msgid "Redo"
-msgstr "Refazer"
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr "Conteúdo"
 
-#: data/ui/glabels-ui.xml.h:92
-msgid "Redo the undone action"
-msgstr "Refaz a ação desfeita"
+#: ../src/ui.c:433
+#, fuzzy
+msgid "Open glabels manual"
+msgstr "Abre o manual do glabels"
 
-#: data/ui/glabels-ui.xml.h:93
-msgid "Remove all selections"
-msgstr "Remover todas as seleções"
+#: ../src/ui.c:438
+msgid "About..."
+msgstr "Sobre..."
 
-#: data/ui/glabels-ui.xml.h:95
-#, no-c-format
-msgid "Restore scale to 100%"
-msgstr "Restaura escala para 100%"
+#: ../src/ui.c:440
+msgid "About glabels"
+msgstr "Sobre glabels"
 
-#: data/ui/glabels-ui.xml.h:96
-msgid "Right align"
+#: ../src/ui.c:450
+msgid "Property toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:99
-msgid "Rotate object 90 clockwise"
-msgstr "Gira objeto 90 sentido horário"
+#: ../src/ui.c:452
+#, fuzzy
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr "Muda a visibilidade da barra de ferramentas principal na janela atual"
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Rotate object 90 counter-clockwise"
-msgstr "Gira objeto 90 sentido anti-horário"
+#: ../src/ui.c:458
+#, fuzzy
+msgid "Grid"
+msgstr "_Grade"
+
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr "Muda a visibilidade da grade na janela atual"
 
-#: data/ui/glabels-ui.xml.h:101
-msgid "Save"
-msgstr "Salvar"
+#: ../src/ui.c:466
+msgid "Markup"
+msgstr "Marcação"
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save As"
-msgstr "Salvar como"
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
+msgstr "Muda a visibilidade das linhas de marcação na janela atual"
 
-#: data/ui/glabels-ui.xml.h:103
-msgid "Save _As..."
-msgstr "Salvar _como..."
+#: ../src/ui.c:479
+msgid "Main toolbar"
+msgstr "Barra de ferramentas principal"
 
-#: data/ui/glabels-ui.xml.h:104
-msgid "Save the current file"
-msgstr "Salva o arquivo atual"
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
+msgstr "Muda a visibilidade da barra de ferramentas principal na janela atual"
 
-#: data/ui/glabels-ui.xml.h:105
-msgid "Save the current file with a different name"
-msgstr "Salva o arquivo atual com um nome diferente"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
+msgstr "Barra de ferramentas de desenho"
 
-#: data/ui/glabels-ui.xml.h:106
-msgid "Select All"
-msgstr "Selecionar Tudo"
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
+msgstr "Muda a visibilidade da barra de ferramentas de desenho na janela atual"
 
-#: data/ui/glabels-ui.xml.h:107
-msgid "Select _All"
-msgstr "Selecionar _Tudo"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:108
-msgid "Select all objects"
-msgstr "Seleciona todos os objetos"
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
+msgstr "Veja o arquivo AUTHORS para ver créditos adicionais,"
 
-#: data/ui/glabels-ui.xml.h:109
-msgid "Select, move and modify objects"
-msgstr "Seleciona, movimenta e modifica objetos"
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
+msgstr "ou visite http://snaught.com/glabels";
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Set drawing toolbar button style according to desktop default"
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
 msgstr ""
-"Define estilo de botão da barra de ferramentas de desenho de acordo com "
-"padrão do desktop"
 
-#: data/ui/glabels-ui.xml.h:112
-msgid "Set main toolbar button style according to desktop default"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
 msgstr ""
-"Define estilo de botão da barra de ferramentas principal de acordo com "
-"padrão do desktop"
-
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show _Tooltips"
-msgstr "Exibir _Dicas"
 
-#: data/ui/glabels-ui.xml.h:114
+#: ../src/ui-commands.c:1161
 #, fuzzy
-msgid "Show both icons and texts in the drawing toolbar"
-msgstr "Exibe dicas na barra de ferramentas de desenho"
-
-#: data/ui/glabels-ui.xml.h:115
-#, fuzzy
-msgid "Show both icons and texts in the main toolbar"
-msgstr "Exibe dicas na barra de ferramentas principal"
-
-#: data/ui/glabels-ui.xml.h:116
-msgid "Show tooltips in the drawing toolbar"
-msgstr "Exibe dicas na barra de ferramentas de desenho"
+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 ""
+"Um programa para criação de etiquetas e cartões de negócios para o GNOME.\n"
+"\n"
+"Glabels é software livre; você pode redistribuí-lo e/ou modificá-lo sob os "
+"termos da Licença Pública Geral GNU conforme publicada pela Free Software "
+"Foundation; ou a versão 2 da Licença, ou (sob sua opção) qualquer versão "
+"posterior.\n"
+"\n"
+"Este programa é distribuido na esperança de que seja útil, mas SEM QUALQUER "
+"GARANTIA; sem mesmo as garantias implícitas de COMERCIALIZA��O ou AJUSTES A "
+"UM PROP�SITO PARTICULAR. Veja a Licença Pública Geral GNU para mais "
+"detalhes.\n"
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Show tooltips in the main toolbar"
-msgstr "Exibe dicas na barra de ferramentas principal"
+#: ../src/ui-commands.c:1190
+msgid "glabels"
+msgstr "glabels"
 
-#: data/ui/glabels-ui.xml.h:118
+#: ../src/warning-handler.c:69
 #, fuzzy
-msgid "Show tooltips in the property toolbar"
-msgstr "Exibe dicas na barra de ferramentas principal"
+msgid "gLabels Error!"
+msgstr "Preferências do gLabels"
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "Template Designer"
-msgstr ""
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(sem nome) - gLabels"
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Template _Designer..."
-msgstr ""
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(modificado)"
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Text color"
-msgstr ""
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "Nó raiz ruim = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:122
-msgid "U_n-select All"
-msgstr "D_esmarcar Tudo"
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "nó ruim = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:123
-msgid "Un-select All"
-msgstr "Desmarcar Tudo"
+#: ../src/xml-label.c:189 ../src/xml-label.c:227
+msgid "xmlParseFile error"
+msgstr "erro: xmlParseFile"
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Undo"
-msgstr "Desfazer"
+#: ../src/xml-label.c:264
+msgid "No document root"
+msgstr "Sem raiz do documento"
 
-#: data/ui/glabels-ui.xml.h:125
-msgid "Undo the last action"
-msgstr "Desfaz a última ação"
+#: ../src/xml-label.c:272
+msgid "Importing from glabels 0.1 format"
+msgstr "Importando do formato do glabels 0.1"
 
-#: data/ui/glabels-ui.xml.h:126
-msgid "Zoom _1:1"
-msgstr "Zoom _1:1"
+#: ../src/xml-label.c:281
+msgid "Importing from glabels 0.4 format"
+msgstr "Importando do formato do glabels 0.4"
 
-#: data/ui/glabels-ui.xml.h:127
-msgid "Zoom _In"
-msgstr "M_ais Zoom"
+#: ../src/xml-label.c:291
+#, fuzzy, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "documento ruim, espaço de nome glabels não encontrado"
 
-#: data/ui/glabels-ui.xml.h:128
-msgid "Zoom _Out"
-msgstr "M_enos Zoom"
+#: ../src/xml-label.c:360
+#, fuzzy, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "Nó raiz ruim = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:129
-#, fuzzy
-msgid "Zoom to _fit"
-msgstr "Zoom para 1:1"
+#: ../src/xml-label.c:856
+#, fuzzy, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "nó ruim = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:130
-msgid "Zoom to fit window"
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:131
-msgid "_About..."
-msgstr "_Sobre..."
+#: ../src/xml-label.c:1104
+msgid "Problem saving xml file."
+msgstr "Problema salvando arquivo xml."
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Bottoms"
-msgstr "_Bases"
+#. 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:135
-msgid "_Close"
-msgstr "_Fechar"
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
+#, fuzzy
+msgid "User defined"
+msgstr "Inserir campo de fusão"
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Contents"
-msgstr "_Conteúdo"
+#: ../libglabels/db.c:650
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:137
-msgid "_Copy"
-msgstr "_Copiar"
+#: ../libglabels/db.c:1042
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:138
-msgid "_Create Object"
-msgstr "_Criar Objeto"
+#: ../libglabels/db.c:2061
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Debug"
-msgstr "_Depurar"
+#: ../libglabels/db.c:2128
+#, fuzzy, c-format
+msgid "%s full page label"
+msgstr "Página completa %s genérico"
 
-#: data/ui/glabels-ui.xml.h:141
-msgid "_Desktop Default"
-msgstr "Padrão _Desktop"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_Drawing Toolbar"
-msgstr "Barra de _Desenho"
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d por página"
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Edit"
-msgstr "_Editar"
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, fuzzy
+msgid "diameter"
+msgstr "%s %s diâmetro"
 
-#: data/ui/glabels-ui.xml.h:145
-msgid "_File"
-msgstr "_Arquivo"
+#. 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 "pontos"
 
-#: data/ui/glabels-ui.xml.h:146
-msgid "_Grid"
-msgstr "_Grade"
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "poleg."
 
-#: data/ui/glabels-ui.xml.h:147
-msgid "_Help"
-msgstr "A_juda"
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
 
-#: data/ui/glabels-ui.xml.h:148
-msgid "_Icon"
-msgstr "_Ã?cone"
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Main Toolbar"
-msgstr "Barra _Principal"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:153
-msgid "_Merge Properties..."
-msgstr "Propriedades de _Fusão..."
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:154
-msgid "_New"
-msgstr "_Novo"
+#. 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:155
-msgid "_Objects"
-msgstr "_Objetos"
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:156
-msgid "_Open..."
-msgstr "_Abrir..."
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Paste"
-msgstr "_Colar"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:159
-msgid "_Print..."
-msgstr "Im_primir..."
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:160
+#.
+#. * 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
 #, fuzzy
-msgid "_Property Toolbar"
-msgstr "Barra de _Desenho"
-
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Quit"
-msgstr "_Sair"
-
-#: data/ui/glabels-ui.xml.h:164
-msgid "_Save"
-msgstr "_Salvar"
+msgid "<b>Record selection/preview</b>"
+msgstr "Seleção/previsão de registro:"
 
-#: data/ui/glabels-ui.xml.h:168
-msgid "_View"
-msgstr "_Visualizar"
+#: ../data/ui/merge-properties-dialog.ui.h:2
+#, fuzzy
+msgid "<b>Source</b>"
+msgstr "Fonte"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
-msgstr ""
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Format:"
+msgstr "Formato:"
 
-#: 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
+msgid "Location:"
+msgstr "Localização"
 
-#: data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr ""
+#: ../data/ui/merge-properties-dialog.ui.h:5
+#, fuzzy
+msgid "Select all"
+msgstr "Selecionar Tudo"
 
-#: data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Fill</span>"
-msgstr ""
+#: ../data/ui/merge-properties-dialog.ui.h:6
+#, fuzzy
+msgid "Unselect all"
+msgstr "Desmarcar Tudo"
 
-#: data/glade/prefs-dialog.glade.h:5
-msgid "<span weight=\"bold\">Line</span>"
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Text</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 ""
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "Personalizar"
 
-#: data/glade/prefs-dialog.glade.h:8 data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "Alinhamento:"
+#: ../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/glade/prefs-dialog.glade.h:9 data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "Cor:"
+#: ../data/ui/media-select.ui.h:5
+#, fuzzy
+msgid "Recent"
+msgstr "_Arquivos recentes"
 
-#: data/glade/prefs-dialog.glade.h:10
-msgid "Font:"
-msgstr "Fonte:"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Selecionar Tudo"
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "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 "Polegadas"
-
-#: 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:2 ../data/ui/template-designer.ui.h:27
+msgid "Description:"
+msgstr "Descrição:"
 
-#: data/glade/prefs-dialog.glade.h:14
-msgid "Locale"
-msgstr "Local"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+msgstr "Tamanho da etiqueta:"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-msgstr "Milímetros"
+#: ../data/ui/new-label-dialog.ui.h:4
+msgid "Layout:"
+msgstr "Disposição:"
 
-#: data/glade/prefs-dialog.glade.h:16
-msgid "Object defaults"
-msgstr "Padrões do objeto"
+#: ../data/ui/new-label-dialog.ui.h:5
+#, fuzzy
+msgid "Normal"
+msgstr "Formato:"
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "Pontos"
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+msgid "Part #:"
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:18
-msgid "Select default properties for new objects."
-msgstr "Selecione as propriedades padrões para novos objetos."
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
+msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
-msgstr "Selecione comportamento específico do local."
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "Girar"
 
-#: data/glade/prefs-dialog.glade.h:20 data/templates/paper-sizes.xml.h:25
-msgid "US Letter"
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
 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 "Largura:"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:3
+#: ../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 ""
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+msgid "Alignment:"
+msgstr "Alinhamento:"
+
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Ã?ngulo:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+msgid "Color:"
+msgstr "Cor:"
+
+#: ../data/ui/object-editor.ui.h:10
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:11
 #, fuzzy
 msgid "Family:"
 msgstr "Arquivo:"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:12
+msgid "File:"
+msgstr "Arquivo:"
+
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Preencher"
 
-#: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Altura:"
 
-#: data/glade/object-editor.glade.h:14
-msgid "Image"
-msgstr "Imagem"
-
-#: data/glade/object-editor.glade.h:15
-msgid "Insert merge field"
-msgstr "Inserir campo de fusão"
+#: ../data/ui/object-editor.ui.h:16
+msgid "Key:"
+msgstr "Chave:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Comprimento:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "Linha"
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+msgid "Line Spacing:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Literal:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
+#: ../data/ui/object-editor.ui.h:21
+msgid "Opacity:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Posição"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "Redefinir tamanho da imagem"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:24
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Tamanho"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:26
 #, fuzzy
 msgid "Size:"
 msgstr "Tamanho"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:27
 #, fuzzy
 msgid "Style"
 msgstr "Estilo:"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:28
 msgid "Style:"
 msgstr "Estilo:"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:30 ../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
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:33
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "graus"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:38
 #, fuzzy
 msgid "format:"
 msgstr "Formato:"
 
-#: data/glade/template-designer.glade.h:1
-msgid "  "
+#: ../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 ""
 
-#: data/glade/template-designer.glade.h:2
+#: ../data/ui/prefs-dialog.ui.h:3
+msgid "<span weight=\"bold\">Fill</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "<span weight=\"bold\">Line</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:5
+msgid "<span weight=\"bold\">Text</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "<span weight=\"bold\">Units</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Font:"
+msgstr "Fonte:"
+
+#: ../data/ui/prefs-dialog.ui.h:10
+msgid "ISO A4"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Inches"
+msgstr "Polegadas"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+msgid "Locale"
+msgstr "Local"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Millimeters"
+msgstr "Milímetros"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Object defaults"
+msgstr "Padrões do objeto"
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Points"
+msgstr "Pontos"
+
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Select default properties for new objects."
+msgstr "Selecione as propriedades padrões para novos objetos."
+
+#: ../data/ui/prefs-dialog.ui.h:18
+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
+msgid "US Letter"
+msgstr ""
+
+#: ../data/ui/property-bar.ui.h:1
+msgid "Bold"
+msgstr ""
+
+#: ../data/ui/property-bar.ui.h:2
+#, fuzzy
+msgid "Center align"
+msgstr "Centros"
+
+#: ../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 "Largura:"
 
-#: data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:7
 #, fuzzy
 msgid "2. Height:"
 msgstr "Altura:"
 
-#: 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"
@@ -1982,23 +2186,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"
@@ -2007,503 +2207,1206 @@ 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 "Tamanho da etiqueta:"
-
-#: data/glade/template-designer.glade.h:42
-#, fuzzy
-msgid "Label or Card Shape"
-msgstr "Nova Etiqueta ou Cartão"
-
-#: 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 "Disposição:"
 
-#: data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:38
 #, fuzzy
 msgid "Layout #2"
 msgstr "Disposição:"
 
-#: data/glade/template-designer.glade.h:46
-#, fuzzy
-msgid "Layout(s)"
-msgstr "Disposição:"
-
-#: data/glade/template-designer.glade.h:47
-#, fuzzy
-msgid "Name and Description"
-msgstr "Descrição:"
-
-#: 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 "Tamanho da página:"
-
-#: 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 "na primeira folha"
 
-#: 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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "Cópias"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "<b>Merge Control</b>"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Opções"
+
+#: ../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:7
+msgid "Sheets:"
+msgstr "Páginas:"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "Iniciar na etiqueta"
+
+#: ../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 "na primeira folha"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "até:"
+
+#: ../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 "_Propriedades de Objeto"
+
+#. 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 "Abrir etiqueta"
+
+#. ===================================================================
+#: ../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 "glabels"
+
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
+#, fuzzy
+msgid "Round labels"
+msgstr "Sobre glabels"
+
+#: ../templates/categories.xml.h:8
+#, fuzzy
+msgid "Square labels"
+msgstr "Etiquetas"
+
+#. ===================================================================
+#. ********************************************************************
+#. ===================================================================
+#: ../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 "Etiquetas"
+
+#. ===================================================================
+#: ../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 "Etiquetas"
+
+#. ===================================================================
+#: ../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 "Etiquetas"
+
+#. ===================================================================
+#: ../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 "Etiquetas"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 #, fuzzy
 msgid "Filing Labels"
 msgstr "Etiquetas"
 
-#: 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 "Etiquetas"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:24
+msgid "Index Cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:26
 #, fuzzy
 msgid "Large Round Labels"
 msgstr "Iniciar na etiqueta"
 
-#: 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 "Sobre glabels"
+
+#. ===================================================================
+#. ********************************************************************
+#: ../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 "Iniciar na etiqueta"
 
-#: data/templates/avery-us-templates.xml.h:12
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:40
 #, fuzzy
 msgid "Square Labels"
 msgstr "Etiquetas"
 
-#: 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 "Sobre glabels"
+
+#. ===============================================================
+#: ../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 "Etiquetas"
-
-#: data/templates/avery-iso-templates.xml.h:6
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:18
 #, fuzzy
 msgid "Diskette labels"
 msgstr "Sobre glabels"
 
-#: 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 "glabels"
 
-#: 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 "Etiquetas"
+
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:28
 #, fuzzy
 msgid "Shipping labels"
 msgstr "Abrir etiqueta"
 
-#: data/templates/zweckform-iso-templates.xml.h:2
+#: ../templates/brother-other-templates.xml.h:1
+msgid "Multi Purpose Labels 17mm x 54mm"
+msgstr ""
+
+#: ../templates/brother-other-templates.xml.h:2
 #, fuzzy
-msgid "Allround Labels"
-msgstr "Sobre glabels"
+msgid "Shipping Labels 62mm x 100mm"
+msgstr "Abrir etiqueta"
 
-#: data/templates/zweckform-iso-templates.xml.h:5
-msgid "Correction and Cover-up 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:6
-msgid "Lever Arch File Labels"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:2
+msgid "3.5in Diskette"
 msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:8
-msgid "QSL-Karten Etiketten 70mm x 50,8mm"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:6
+msgid "File Folder"
 msgstr ""
 
-#: data/templates/zweckform-iso-templates.xml.h:9
-msgid "Rectangular Copier Labels"
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:8
+msgid "Hanging 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:10
+#, fuzzy
+msgid "Large Address Labels"
+msgstr "Iniciar na etiqueta"
 
-#: data/templates/zweckform-iso-templates.xml.h:11
-msgid "Video Labels (back)"
-msgstr ""
+#. ===================================================================
+#: ../templates/dymo-other-templates.xml.h:14
+#, fuzzy
+msgid "Shipping Address Labels"
+msgstr "Abrir etiqueta"
 
-#: 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 "Sobre glabels"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:16
 #, fuzzy
 msgid "DLT Labels"
 msgstr "Etiquetas"
 
-#: 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
 #, fuzzy
 msgid "Microtube labels"
 msgstr "Sobre glabels"
 
-#: 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"
-msgstr ""
+#. ===================================================================
+#: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:4
+#, fuzzy
+msgid "Allround Labels"
+msgstr "Sobre glabels"
 
-#: 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 "Etiquetas"
+
+#. ===================================================================
+#: ../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 "Geral"
+
+#. ===================================================================
+#: ../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 "Etiquetas"
+
+#. ===================================================================
+#: ../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 "Sobre glabels"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:4
+msgid "Address Labels (STAMPIT)"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Sobre glabels"
+
+#. ===================================================================
+#: ../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 ""
 
-#: data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:18
+msgid "Business cards punched glossy"
 msgstr ""
 
-#: data/mime/glabels.keys.in.h:1 data/mime/glabels.xml.in.h:1
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:22
 #, fuzzy
-msgid "gLabels Project File"
-msgstr "_Propriedades de Objeto"
+msgid "Floppy disk labels"
+msgstr "Sobre glabels"
+
+#. ===================================================================
+#: ../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 "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
+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 "Sobre 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"
+
+#. ===================================================================
+#: ../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 "Etiquetas"
+
+#. ===================================================================
+#: ../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 "Show view debugging messages."
+#~ msgstr "Exibe mensagens de depuração de visualização."
+
+#~ msgid "Show item debugging messages."
+#~ msgstr "Exibe mensagens de depuração de item."
+
+#~ msgid "Show printing debugging messages."
+#~ msgstr "Exibe mensagens de depuração de impressão."
+
+#~ msgid "Show prefs debugging messages."
+#~ msgstr "Exibe mensagens de depuração de preferências."
+
+#~ msgid "Show file debugging messages."
+#~ msgstr "Exibe mensagens de depuração de arquivo."
+
+#~ msgid "Show document debugging messages."
+#~ msgstr "Exibe mensagens de depuração de documeto."
+
+#~ msgid "Show template debugging messages."
+#~ msgstr "Exibe mensagens de depuração de modelo."
+
+#, fuzzy
+#~ msgid "Show paper debugging messages."
+#~ msgstr "Exibe mensagens de depuração de preferências."
+
+#~ msgid "Show xml debugging messages."
+#~ msgstr "Exibe mensagens de depuração de xml."
+
+#~ msgid "Show document merge debugging messages."
+#~ msgstr "Exibe mensagens de depuração de fusão de documento."
+
+#~ msgid "Show commands debugging messages."
+#~ msgstr "Exibe mensagens de depuração de comandos."
+
+#~ msgid "Show undo debugging messages."
+#~ msgstr "Exibe mensagens de depuração de desfazer."
+
+#~ msgid "Show recent debugging messages."
+#~ msgstr "Exibe mensagens de depuração de recentes"
+
+#~ msgid "Show window debugging messages."
+#~ msgstr "Exibe mensagens de depuração de janela."
+
+#~ msgid "Show ui debugging messages."
+#~ msgstr "Exibe mensagens de depuração de ui."
+
+#, fuzzy
+#~ msgid "Show property_bar debugging messages."
+#~ msgstr "Exibe mensagens de depuração de preferências."
+
+#~ msgid "Show media select widget debugging messages."
+#~ msgstr "Exibe mensagens de depuração de widget de seleção de mídia."
+
+#~ msgid "Show mini preview widget debugging messages."
+#~ msgstr "Exibe mensagens de depuração de widget de mini previsão."
+
+#, fuzzy
+#~ msgid "Show pixbuf cache debugging messages."
+#~ msgstr "Exibe mensagens de depuração de visualização."
+
+#~ msgid "Show widget debugging messages."
+#~ msgstr "Exibe mensagens de depuração de widget."
+
+#, fuzzy
+#~ msgid "Show object editor debugging messages."
+#~ msgstr "Exibe mensagens de depuração de recentes"
+
+#~ msgid "Turn on all debugging messages."
+#~ msgstr "Ativa todas as mensagens de depuração."
+
+#~ msgid "Could not initialize Bonobo!\n"
+#~ msgstr "Impossível inicializar Bonobo!\n"
+
+#~ msgid "print this message"
+#~ msgstr "mostra esta mensagem"
+
+#~ msgid "print the version of glabels-batch being used"
+#~ msgstr "mostra a versão de glabels-batch que está sendo usada"
+
+#~ msgid "[OPTION...] GLABELS_FILE..."
+#~ msgstr "[OPÃ?Ã?O...] ARQUIVO_GLABELS..."
+
+#~ msgid "missing glabels file\n"
+#~ msgstr "faltando arquivo glabels\n"
+
+#~ msgid "Media Type"
+#~ msgstr "Tipo de mídia"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#~ msgid "Align _Horizontally"
+#~ msgstr "Alinhar _Horizontalmente"
+
+#~ msgid "Align _Vertically"
+#~ msgstr "Alinhar _Verticalmente"
+
+#~ msgid "_Delete"
+#~ msgstr "_Apagar"
+
+#~ msgid "_Job"
+#~ msgstr "_Trabalho"
+
+#~ msgid "P_rinter"
+#~ msgstr "Imp_ressora"
+
+#~ msgid "Document merge control"
+#~ msgstr "Controle de fusão do documento"
+
+#~ msgid "Print preview"
+#~ msgstr "Visualizar impressão"
+
+#, fuzzy
+#~ msgid "Importing from glabels 1.91 format"
+#~ msgstr "Importando do formato do glabels 0.1"
+
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "Arquivo texto separado com vírgulas (CSV)"
+
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "Arquivo texto separado com dois pontos"
+
+#~ 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"
+
+#~ msgid "%.5g x %.5g %s"
+#~ msgstr "%.5g x %.5g %s"
+
+#~ msgid "%.5g %s diameter"
+#~ msgstr "%.5g %s diâmetro"
+
+#, fuzzy
+#~ msgid "magenta"
+#~ msgstr "Imagem"
+
+#, fuzzy
+#~ msgid "No paper files found!"
+#~ msgstr "Nenhum arquivo modelo encontrado!"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "Cu_t"
+#~ msgstr "Cor_tar"
+
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "Personaliza barras de ferramentas"
+
+#~ msgid "Dump XML"
+#~ msgstr "Descarregar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Descarrega a descrição da UI Xml"
+
+#, fuzzy
+#~ msgid "Font selector"
+#~ msgstr "Copia a seleção"
+
+#~ msgid "Icon and _Text"
+#~ msgstr "Ã?cone e _Texto"
+
+#~ msgid "M_arkup"
+#~ msgstr "M_arcação"
+
+#~ msgid "New"
+#~ msgstr "Novo"
+
+#, fuzzy
+#~ msgid "Object property editor"
+#~ msgstr "_Propriedades de Objeto"
+
+#~ msgid "Only show icons in the drawing toolbar"
+#~ msgstr "Exibe somente ícones na barra de ferramentas de desenho"
+
+#~ msgid "Only show icons in the main toolbar"
+#~ msgstr "Exibe somente ícones na barra de ferramentas principal"
+
+#~ msgid "Pr_eferences..."
+#~ msgstr "Pr_eferências..."
+
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
+
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refaz a ação desfeita"
+
+#~ msgid "Save"
+#~ msgstr "Salvar"
+
+#~ msgid "Save As"
+#~ msgstr "Salvar como"
+
+#~ msgid "Select _All"
+#~ msgstr "Selecionar _Tudo"
+
+#~ msgid "Set drawing toolbar button style according to desktop default"
+#~ msgstr ""
+#~ "Define estilo de botão da barra de ferramentas de desenho de acordo com "
+#~ "padrão do desktop"
+
+#~ msgid "Set main toolbar button style according to desktop default"
+#~ msgstr ""
+#~ "Define estilo de botão da barra de ferramentas principal de acordo com "
+#~ "padrão do desktop"
+
+#~ msgid "Show _Tooltips"
+#~ msgstr "Exibir _Dicas"
+
+#, fuzzy
+#~ msgid "Show both icons and texts in the drawing toolbar"
+#~ msgstr "Exibe dicas na barra de ferramentas de desenho"
+
+#, fuzzy
+#~ msgid "Show both icons and texts in the main toolbar"
+#~ msgstr "Exibe dicas na barra de ferramentas principal"
+
+#~ msgid "Show tooltips in the drawing toolbar"
+#~ msgstr "Exibe dicas na barra de ferramentas de desenho"
+
+#~ msgid "Show tooltips in the main toolbar"
+#~ msgstr "Exibe dicas na barra de ferramentas principal"
+
+#, fuzzy
+#~ msgid "Show tooltips in the property toolbar"
+#~ msgstr "Exibe dicas na barra de ferramentas principal"
+
+#~ msgid "U_n-select All"
+#~ msgstr "D_esmarcar Tudo"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfaz a última ação"
+
+#~ msgid "_About..."
+#~ msgstr "_Sobre..."
+
+#~ msgid "_Bottoms"
+#~ msgstr "_Bases"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conteúdo"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copiar"
+
+#~ msgid "_Create Object"
+#~ msgstr "_Criar Objeto"
+
+#~ msgid "_Debug"
+#~ msgstr "_Depurar"
+
+#~ msgid "_Desktop Default"
+#~ msgstr "Padrão _Desktop"
+
+#~ msgid "_Drawing Toolbar"
+#~ msgstr "Barra de _Desenho"
+
+#~ msgid "_Icon"
+#~ msgstr "_Ã?cone"
+
+#~ msgid "_Main Toolbar"
+#~ msgstr "Barra _Principal"
+
+#~ msgid "_Merge Properties..."
+#~ msgstr "Propriedades de _Fusão..."
+
+#~ msgid "_Paste"
+#~ msgstr "_Colar"
+
+#, fuzzy
+#~ msgid "_Property Toolbar"
+#~ msgstr "Barra de _Desenho"
 
 #~ msgid "Object _Properties..."
 #~ msgstr "_Propriedades do Objeto..."
@@ -2529,37 +3432,24 @@ msgstr "_Propriedades de Objeto"
 #~ msgid "Maintain current aspect ratio"
 #~ msgstr "Manter taxa de aspecto atual"
 
-#, fuzzy
-#~ msgid "CD Labels"
-#~ msgstr "Etiquetas"
-
 #~ msgid "Open %s"
 #~ msgstr "Abrir %s"
 
 #~ msgid "Scale:"
 #~ msgstr "Escala:"
 
-#~ msgid "%"
-#~ msgstr "%"
-
 #~ msgid "Show text with barcode"
 #~ msgstr "Exibir texto com código de barras"
 
 #~ msgid "Edit properties..."
 #~ msgstr "Editar propriedades..."
 
-#~ msgid "Fields"
-#~ msgstr "Campos"
-
 #~ msgid "Column"
 #~ msgstr "Coluna"
 
 #~ msgid "Custom field key"
 #~ msgstr "Chave do campo específico"
 
-#~ msgid "Sample data"
-#~ msgstr "Dado de amostra"
-
 #~ msgid "Revert to saved copy of %s?"
 #~ msgstr "Reverter para a cópia gravada de %s?"
 
@@ -2593,12 +3483,6 @@ msgstr "_Propriedades de Objeto"
 #~ msgid "Image format not currently supported"
 #~ msgstr "Formato de imagem não suportado atualmente"
 
-#~ msgid "Barcode data"
-#~ msgstr "Dado do Código de Barras:"
-
-#~ msgid "General"
-#~ msgstr "Geral"
-
 #~ msgid "Make a new, empty label"
 #~ msgstr "Criar uma etiqueta nova, vazia"
 
diff --git a/po/ru.po b/po/ru.po
index ff02c9e..b9261d7 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-05-27 22:36-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,196 +17,1095 @@ 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/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/glabels.c:83
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr "Plessey"
+
+#: ../src/bc.c:155
 #, fuzzy
-msgid "Launch gLabels label and business card designer."
-msgstr "Ð?Ñ?огÑ?амма длÑ? Ñ?озданиÑ? Ñ?Ñ?икеÑ?ок и визиÑ?нÑ?Ñ? каÑ?Ñ?оÑ?ек\n"
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:176
+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/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/glabels.c:91 ../src/glabels-batch.c:105
+#: ../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:584 ../src/label.c:628
+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/glabels-batch.c:53
+#: ../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:52
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "УÑ?Ñ?ановиÑ?Ñ? название вÑ?Ñ?одного Ñ?айла (по Ñ?молÑ?аниÑ? â?? \"output.ps\""
 
-#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "название"
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr "Ð?олиÑ?еÑ?Ñ?во лиÑ?Ñ?ов (по Ñ?молÑ?аниÑ? = 1)"
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr "Ñ?Ñ?Ñ?аниÑ?"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr "Ð?олиÑ?еÑ?Ñ?во копий (по Ñ?молÑ?аниÑ? = 1)"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "копий"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:58
 msgid "first label on first sheet (default=1)"
 msgstr "пеÑ?ваÑ? Ñ?Ñ?икеÑ?ка на пеÑ?вой Ñ?Ñ?Ñ?аниÑ?е (по Ñ?молÑ?аниÑ? = 1)"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:58
 msgid "first"
 msgstr "пеÑ?вое"
 
-#: ../src/glabels-batch.c:61 ../data/builder/print-custom-widget.glade.h:6
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "Ð?еÑ?аÑ?аÑ?Ñ? меÑ?ки под обÑ?ез"
 
-#: ../src/glabels-batch.c:67
+#: ../src/glabels-batch.c:66
 msgid "input file for merging"
 msgstr "Ð?Ñ?одной Ñ?айл длÑ? заполнениÑ? полей"
 
-#: ../src/glabels-batch.c:97
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[ФÐ?Ð?Ð?...]"
+
+#: ../src/glabels-batch.c:98
 msgid "Print files created with gLabels."
 msgstr "Ð?апеÑ?аÑ?аÑ?Ñ? Ñ?озданнÑ?е в gLabels Ñ?айлÑ?."
 
-#: ../src/glabels-batch.c:147
+#: ../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 ""
+
+#: ../src/glabels-batch.c:149
 #, 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:184
 #, 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:483
+msgid "Barcode data empty"
+msgstr "Ð?аннÑ?е Ñ?Ñ?Ñ?иÑ?-кода не введенÑ?"
+
+#: ../src/label-barcode.c:487
+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:399
+msgid "Untitled"
+msgstr "Ð?ез названиÑ?"
+
+#: ../src/label.c:702 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Ð?аполниÑ?Ñ? полÑ? даннÑ?ми"
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "УдалиÑ?Ñ?"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "Ð?а пеÑ?едний план"
+
+#: ../src/label.c:1253 ../src/ui.c:331
+msgid "Send to back"
+msgstr "Ð?а задний план"
+
+#: ../src/label.c:1294
+#, fuzzy
+msgid "Rotate"
+msgstr "С повоÑ?оÑ?ом"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Ð?овеÑ?нÑ?Ñ?Ñ? влево"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Ð?овеÑ?нÑ?Ñ?Ñ? впÑ?аво"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "Ð?Ñ?Ñ?азиÑ?Ñ? гоÑ?изонÑ?алÑ?но"
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "Ð?Ñ?Ñ?азиÑ?Ñ? веÑ?Ñ?икалÑ?но"
+
+#: ../src/label.c:1472 ../src/ui.c:366
+msgid "Align left"
+msgstr "Ð?Ñ?Ñ?овнÑ?Ñ?Ñ? по левомÑ? кÑ?аÑ?"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr "Ð?Ñ?Ñ?овнÑ?Ñ?Ñ? по пÑ?авомÑ? кÑ?аÑ?"
+
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Ð?Ñ?Ñ?овнÑ?Ñ?Ñ? по гоÑ?изонÑ?алÑ?нÑ?м Ñ?енÑ?Ñ?ам"
+
+#: ../src/label.c:1666 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Ð?Ñ?Ñ?овнÑ?Ñ?Ñ? по веÑ?Ñ?немÑ? кÑ?аÑ?"
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Ð?Ñ?Ñ?овнÑ?Ñ?Ñ? по нижнемÑ? кÑ?аÑ?"
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Ð?Ñ?Ñ?овнÑ?Ñ?Ñ? по веÑ?Ñ?икалÑ?нÑ?м Ñ?енÑ?Ñ?ам"
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "Ð?Ñ?Ñ?енÑ?Ñ?иÑ?оваÑ?Ñ? по гоÑ?изонÑ?али"
+
+#: ../src/label.c:1909 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "Ð?Ñ?Ñ?енÑ?Ñ?иÑ?оваÑ?Ñ? по веÑ?Ñ?икали"
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
+msgstr "Ð?Ñ?Ñ?авиÑ?Ñ?"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Ð?обавиÑ?Ñ? линиÑ?"
+
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Ð?обавиÑ?Ñ? Ñ?аÑ?Ñ?Ñ?овое изобÑ?ажение"
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Ð?аннÑ?е из иÑ?полÑ?зÑ?емой по Ñ?молÑ?аниÑ? адÑ?еÑ?ной книги Evolution"
+
+#: ../src/merge-init.c:110
+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:9
+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:6
+#: ../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:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
+msgstr ""
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -341,382 +1240,288 @@ 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:29
 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:18
 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:15
 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 +1536,154 @@ 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:323
 #, 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:406
 #, 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:189 ../src/xml-label.c:227
 msgid "xmlParseFile error"
 msgstr "Ð?Ñ?ибка пÑ?и Ñ?азбоÑ?е Ñ?айла XML"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:264
 msgid "No document root"
 msgstr "Ð?еÑ? коÑ?нÑ? докÑ?менÑ?а"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:272
 msgid "Importing from glabels 0.1 format"
 msgstr "Ð?Ñ?полнÑ?еÑ?Ñ?Ñ? импоÑ?Ñ? из Ñ?айла gLabels веÑ?Ñ?ии 0.1"
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:281
 msgid "Importing from glabels 0.4 format"
 msgstr "Ð?Ñ?полнÑ?еÑ?Ñ?Ñ? импоÑ?Ñ? из Ñ?айла gLabels веÑ?Ñ?ии 0.4"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:291
 #, 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:360
 #, 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:856
 #, 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:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Ð?Ñ?ибка пÑ?еобÑ?азованиÑ? UTF8."
 
-#: ../src/xml-label.c:1084
+#: ../src/xml-label.c:1104
 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1538
+#: ../libglabels/db.c:2128
 #, 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 ""
+
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d на лиÑ?Ñ?"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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:40
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "пÑ?нкÑ?ов"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../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 +1700,415 @@ 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
+#.
+#. * 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>Ð?Ñ?оÑ?моÑ?Ñ? и вÑ?боÑ? запиÑ?ей</b>"
 
-#: ../data/builder/merge-properties-dialog.glade.h:2
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "<b>Source</b>"
 msgstr "<b>Ð?Ñ?Ñ?оÑ?ник</b>"
 
-#: ../data/builder/merge-properties-dialog.glade.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "ФоÑ?маÑ?:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "РаÑ?положение:"
 
-#: ../data/builder/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Ð?Ñ?делиÑ?Ñ? вÑ?Ñ?"
 
-#: ../data/builder/merge-properties-dialog.glade.h:6
+#: ../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/builder/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</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/builder/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>Тип ноÑ?иÑ?елÑ?</b>"
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
+msgstr ""
 
-#: ../data/builder/object-editor.glade.h:2
+#: ../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/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
+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
+#: ../data/ui/object-editor.ui.h:3
 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:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Ð?Ñ?клÑ?Ñ?ка:"
 
-#: ../data/builder/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr "Ð?Ñ?и заполнении даннÑ?ми Ñ?екÑ?Ñ? обÑ?езаем"
 
-#: ../data/builder/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Угол:"
 
-#: ../data/builder/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "Ð?онÑ?Ñ?олÑ?наÑ? Ñ?Ñ?мма"
 
-#: ../data/builder/object-editor.glade.h:9
-#: ../data/builder/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "ЦвеÑ?:"
 
-#: ../data/builder/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ?ваÑ?Ñ? Ñ?енÑ?"
 
-#: ../data/builder/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "СемейÑ?Ñ?во:"
 
-#: ../data/builder/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Файл:"
 
-#: ../data/builder/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Ð?аливка"
 
-#: ../data/builder/object-editor.glade.h:15
-#: ../data/builder/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:14 ../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:16
 msgid "Key:"
 msgstr "Ð?лÑ?Ñ?:"
 
-#: ../data/builder/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Ð?лина:"
 
-#: ../data/builder/object-editor.glade.h:21
-#: ../data/builder/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "Ð?еждÑ? Ñ?Ñ?Ñ?ок:"
 
-#: ../data/builder/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Ð?од:"
 
-#: ../data/builder/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "Ð?епÑ?озÑ?аÑ?ноÑ?Ñ?Ñ?:"
 
-#: ../data/builder/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "РаÑ?положение"
 
-#: ../data/builder/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:23
 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:24
 msgid "Shadow"
 msgstr "ТенÑ?"
 
-#: ../data/builder/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "РазмеÑ?"
 
-#: ../data/builder/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "РазмеÑ?:"
 
-#: ../data/builder/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "СÑ?илÑ?"
 
-#: ../data/builder/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr "СмеÑ?ение по X:"
 
-#: ../data/builder/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "СмеÑ?ение по Y:"
 
-#: ../data/builder/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "гÑ?адÑ?Ñ?ов"
 
-#: ../data/builder/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:36
+msgid "dialog1"
+msgstr "dialog1"
+
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "ЦиÑ?Ñ?:"
 
-#: ../data/builder/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<span weight=\"bold\">Default page size</span>"
 msgstr "<span weight=\"bold\">РазмеÑ? Ñ?Ñ?Ñ?аниÑ?Ñ? по Ñ?молÑ?аниÑ?</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">Ð?аливка</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">Ð?бводка</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">ТекÑ?Ñ?</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">Ð?диниÑ?Ñ? измеÑ?ениÑ?</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "ШÑ?иÑ?Ñ?:"
 
-#: ../data/builder/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/builder/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Ð?Ñ?ймÑ?"
 
-#: ../data/builder/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "Ð?еÑ?Ñ?нÑ?е паÑ?амеÑ?Ñ?Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Ð?иллимеÑ?Ñ?Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "СвойÑ?Ñ?ва обÑ?екÑ?ов по Ñ?молÑ?аниÑ?"
 
-#: ../data/builder/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Ð?Ñ?нкÑ?Ñ?"
 
-#: ../data/builder/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr "УкажиÑ?е иÑ?полÑ?зÑ?емÑ?е по Ñ?молÑ?аниÑ? Ñ?войÑ?Ñ?ва новÑ?Ñ? обÑ?екÑ?ов "
 
-#: ../data/builder/prefs-dialog.glade.h:18
+#: ../data/ui/prefs-dialog.ui.h:18
 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:19 ../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/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 +2126,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 +2153,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 +2197,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 +2225,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 +2233,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 +2248,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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "<b>Ð?аÑ?амеÑ?Ñ?Ñ?</b>"
 
-#: ../data/builder/template-designer.glade.h:63
-msgid "finish_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "<b>Merge Control</b>"
+msgstr "<b>УпÑ?авление пеÑ?аÑ?Ñ?Ñ? (обÑ?единение)</b>"
 
-#: ../data/builder/template-designer.glade.h:65
-msgid "layout_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "<b>Options</b>"
+msgstr "<b>Ð?аÑ?амеÑ?Ñ?Ñ?</b>"
 
-#: ../data/builder/template-designer.glade.h:66
-msgid "name_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "СобиÑ?аÑ?Ñ?"
 
-#: ../data/builder/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr ""
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+msgstr "Ð?опий:"
 
-#: ../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 +2477,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 +2699,432 @@ 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 "Select A File"
+#~ msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл"
 
-#: ../barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: клÑ?Ñ?Ñ? необÑ?одим аÑ?гÑ?менÑ? -- %c\n"
+#~ 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 +3144,6 @@ msgstr "%s: клÑ?Ñ?Ñ? необÑ?одим аÑ?гÑ?менÑ? -- %c\n"
 #~ msgid "Show tooltips for drawing toolbar"
 #~ msgstr "Ð?оказÑ?ваÑ?Ñ? подÑ?казки в панели Ñ?иÑ?ованиÑ?"
 
-#~ msgid "custom"
-#~ msgstr "вÑ?боÑ?оÑ?но"
-
 #~ msgid "Choose Custom Color"
 #~ msgstr "Ð?Ñ?беÑ?иÑ?е полÑ?зоваÑ?елÑ?Ñ?кий Ñ?веÑ?"
 
@@ -2816,9 +3222,6 @@ msgstr "%s: клÑ?Ñ?Ñ? необÑ?одим аÑ?гÑ?менÑ? -- %c\n"
 #~ msgid "dark purple"
 #~ msgstr "Ñ?Ñ?мно-пÑ?Ñ?пÑ?Ñ?нÑ?й"
 
-#~ msgid "Text color"
-#~ msgstr "ЦвеÑ? Ñ?екÑ?Ñ?а"
-
 #~ msgid "         "
 #~ msgstr "         "
 
@@ -2873,12 +3276,6 @@ msgstr "%s: клÑ?Ñ?Ñ? необÑ?одим аÑ?гÑ?менÑ? -- %c\n"
 #~ 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 на лиÑ?Ñ?)"
 
@@ -2956,9 +3353,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 ff7d034..f2654a5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,211 +7,1132 @@
 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-03-20 14:05+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-27 22:36-0400\n"
 "PO-Revision-Date: 2010-03-20 17:02+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"
+"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/glabels.c:75
-#: ../src/glabels-batch.c:70
-msgid "[FILE...]"
-msgstr "[DATOTEKA...]"
+#: ../src/bc.c:66
+msgid "POSTNET (any)"
+msgstr "POSTNET (any)"
 
-#: ../src/glabels.c:91
-msgid "- gLabels label designer"
-msgstr "- snovalnik nalepk gLabels"
+#: ../src/bc.c:69
+msgid "POSTNET-5 (ZIP only)"
+msgstr "POSTNET-5 (ZIP only)"
 
-#: ../src/glabels-batch.c:54
+#: ../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 ""
+
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Dark Violet"
+msgstr "VijoliÄ?na"
+
+#: ../src/color-combo-menu.c:91
+#, fuzzy
+msgid "Red"
+msgstr "rdeÄ?a"
+
+#: ../src/color-combo-menu.c:92
+#, fuzzy
+msgid "Orange"
+msgstr "oranžna"
+
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr "Temno rumena"
+
+#: ../src/color-combo-menu.c:94
+#, fuzzy
+msgid "Medium green"
+msgstr "mraÄ?no zelena"
+
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr "Turkizna"
+
+#: ../src/color-combo-menu.c:96
+#, fuzzy
+msgid "Blue"
+msgstr "modra"
+
+#: ../src/color-combo-menu.c:97
+#, fuzzy
+msgid "Purple"
+msgstr "vijoliÄ?na"
+
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
+msgstr "Lososova"
+
+#: ../src/color-combo-menu.c:100
+#, fuzzy
+msgid "Gold"
+msgstr "zlata"
+
+#: ../src/color-combo-menu.c:101
+#, fuzzy
+msgid "Yellow"
+msgstr "rumena"
+
+#: ../src/color-combo-menu.c:102
+#, fuzzy
+msgid "Green"
+msgstr "zelena"
+
+#: ../src/color-combo-menu.c:103
+#, fuzzy
+msgid "Cyan"
+msgstr "sinja"
+
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "nebeško modra"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr "VijoliÄ?na"
+
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "roza"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr "Kakijeva"
+
+#: ../src/color-combo-menu.c:109
+#, fuzzy
+msgid "Light Yellow"
+msgstr "svetlo rumena"
+
+#: ../src/color-combo-menu.c:110
+#, fuzzy
+msgid "Light Green"
+msgstr "svetlo zelena"
+
+#: ../src/color-combo-menu.c:111
+#, fuzzy
+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
+#, fuzzy
+msgid "White"
+msgstr "bela"
+
+#: ../src/color-combo-menu.c:117
+#, fuzzy, no-c-format
+msgid "10% Gray"
+msgstr "10\\% Siva"
+
+#: ../src/color-combo-menu.c:119
+#, fuzzy, no-c-format
+msgid "25% Gray"
+msgstr "25\\% Siva"
+
+#: ../src/color-combo-menu.c:121
+#, fuzzy, no-c-format
+msgid "40% Gray"
+msgstr "40\\% Siva"
+
+#: ../src/color-combo-menu.c:123
+#, fuzzy, no-c-format
+msgid "50% Gray"
+msgstr "50\\% Siva"
+
+#: ../src/color-combo-menu.c:125
+#, fuzzy, no-c-format
+msgid "60% Gray"
+msgstr "60\\% siva"
+
+#: ../src/color-combo-menu.c:126
+#, fuzzy
+msgid "Black"
+msgstr "Ä?rna"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+#, fuzzy
+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:584 ../src/label.c:628
+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:54
-#: ../src/glabels-batch.c:68
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "ime datoteke"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr "Å¡tevilo delovnih listov (privzeto=1)"
 
-#: ../src/glabels-batch.c:56
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr "delovni listi"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr "Å¡tevilo kopij (privzeto=1)"
 
-#: ../src/glabels-batch.c:58
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "kopije"
 
-#: ../src/glabels-batch.c:60
+#: ../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:60
+#: ../src/glabels-batch.c:58
 msgid "first"
 msgstr "prva"
 
-#: ../src/glabels-batch.c:62
-#: ../data/glade/print-custom-widget.glade.h:6
+#: ../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:64
-#: ../data/glade/print-custom-widget.glade.h:5
+#: ../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:66
-#: ../data/glade/print-custom-widget.glade.h:4
+#: ../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:68
+#: ../src/glabels-batch.c:66
 msgid "input file for merging"
 msgstr "vhodna datoteka za združevanje"
 
-#: ../src/glabels-batch.c:96
-msgid "- batch process gLabels label files"
-msgstr "- paketno obdelovanje datotek gLabels nalepk"
+#: ../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:142
+#: ../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:164
+#: ../src/glabels-batch.c:184
 #, c-format
 msgid "cannot open glabels file %s\n"
 msgstr "Datoteke glables %s ni mogoÄ?e odpreti\n"
 
-#: ../src/window.c:259
-msgid "(none) - gLabels"
-msgstr "(brez) - gLabels"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
+msgstr "Zagon snovalnika nalepk in poslovnih vizitk gLabels. "
 
-#: ../src/window.c:432
-msgid "(modified)"
-msgstr " (spremenjeno)"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "Ustvarjanje predmeta Ä?rtne kode"
 
-#: ../src/stock.c:72
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#, fuzzy
+msgid "Barcode data"
+msgstr "Podatki Ä?rtne kode so prazni"
+
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "Lastnosti Ä?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
+#, fuzzy
+msgid "Create box object"
+msgstr "Ustvarjanje besedilnega predmeta"
+
+#: ../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:399
+msgid "Untitled"
+msgstr "Brez naslova"
+
+#: ../src/label.c:702 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Lastnosti združevanja"
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Izbriši"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "Prinesi v ospredje"
+
+#: ../src/label.c:1253 ../src/ui.c:331
+msgid "Send to back"
+msgstr "Pošlji nazaj"
+
+#: ../src/label.c:1294
+msgid "Rotate"
+msgstr "Zavrti"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Zavrti levo"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Zavrti desno"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "Zrcali vodoravno"
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "Zrcali navpiÄ?no"
+
+#: ../src/label.c:1472 ../src/ui.c:366
+msgid "Align left"
+msgstr "Poravnava levo"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr "Poravnava desno"
+
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Poravnava vodoravne sredine"
+
+#: ../src/label.c:1666 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Poravnava vrhov"
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Poravnava dnov"
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Poravnava navpiÄ?ne sredine"
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "Sredini vodoravno"
+
+#: ../src/label.c:1909 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "Sredini navpiÄ?no"
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
+msgstr "Prilepi"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Ustvarjanje Ä?rte"
+
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Ustvarjanje slikovnega predmeta"
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, fuzzy
+msgid "Set image"
+msgstr "Ponastavi velikost slike"
+
+#: ../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 ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Velikost strani:"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "Senca"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "Senca"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "Senca"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "Senca"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Ustvarjanje besedilnega predmeta"
+
+#: ../src/label-text.c:451
+#, fuzzy
+msgid "Typing"
+msgstr "roza"
+
+#: ../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
+#, fuzzy
+msgid "Font weight"
+msgstr "Zavrti desno"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "LežeÄ?e"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Poravnava levo"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "Razmik vrstic:"
+
+#: ../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 ""
+
+#: ../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 "Katerikoli"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "Katerikoli"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "Katerikoli"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "Nedavnih predlog ni mogoÄ?e najti."
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr "Poskusite izbrati predlogo s strani \"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
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Nedavnih predlog 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 ""
+
+#. 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:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Podatki iz privzetega imenika Evolution"
+
+#: ../src/merge-init.c:110
+#, fuzzy
+msgid "VCards"
+msgstr "Vizitk vCard v besedilu"
+
+#: ../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 ""
+
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "NaÄ?in izbiranja"
+
+#: ../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 "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
+#, fuzzy
+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
+#, fuzzy
+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:73
+#: ../src/stock.c:71
 msgid "_Text"
 msgstr "_Besedilo"
 
-#: ../src/stock.c:74
+#: ../src/stock.c:72
 msgid "_Line"
 msgstr "Ä?_rta"
 
-#: ../src/stock.c:75
+#: ../src/stock.c:73
 msgid "_Box"
 msgstr "_Okvir"
 
-#: ../src/stock.c:76
+#: ../src/stock.c:74
 msgid "_Ellipse"
 msgstr "_Elipsa"
 
-#: ../src/stock.c:77
+#: ../src/stock.c:75
 msgid "_Image"
 msgstr "Sl_ika"
 
-#: ../src/stock.c:78
+#: ../src/stock.c:76
 msgid "Bar_code"
 msgstr "Ä?rtna _koda"
 
-#: ../src/stock.c:79
+#: ../src/stock.c:77
 msgid "_Merge Properties"
 msgstr "_Združi lastnosti"
 
-#: ../src/stock.c:80
+#: ../src/stock.c:78
 msgid "Object _Properties"
 msgstr "Lastnosti _predmeta"
 
-#: ../src/stock.c:81
+#: ../src/stock.c:79
 msgid "Bring to _Front"
 msgstr "Prinesi v _ospredje"
 
-#: ../src/stock.c:82
+#: ../src/stock.c:80
 msgid "Send to _Back"
 msgstr "Pošlji _nazaj"
 
-#: ../src/stock.c:83
+#: ../src/stock.c:81
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
-#: ../src/stock.c:84
+#: ../src/stock.c:82
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
-#: ../src/stock.c:85
+#: ../src/stock.c:83
 msgid "Flip _Horizontally"
 msgstr "Zrcali _vodoravno"
 
-#: ../src/stock.c:86
+#: ../src/stock.c:84
 msgid "Flip _Vertically"
 msgstr "Zrcali _navpiÄ?no"
 
-#: ../src/stock.c:87
+#: ../src/stock.c:85
 msgid "_Lefts"
 msgstr "_Levo"
 
-#: ../src/stock.c:88
+#: ../src/stock.c:86
 msgid "_Rights"
 msgstr "_Desno"
 
-#: ../src/stock.c:89
+#: ../src/stock.c:87
 msgid "_Centers"
 msgstr "_SrediÅ¡Ä?a"
 
-#: ../src/stock.c:90
+#: ../src/stock.c:88
 msgid "_Tops"
 msgstr "_Vrhovi"
 
-#: ../src/stock.c:91
+#: ../src/stock.c:89
 msgid "Bottoms"
 msgstr "Dna"
 
-#: ../src/stock.c:92
+#: ../src/stock.c:90
 msgid "Centers"
 msgstr "SrediÅ¡Ä?a"
 
-#: ../src/stock.c:93
-#: ../src/stock.c:94
+#: ../src/stock.c:91 ../src/stock.c:92
 msgid "Label Ce_nter"
 msgstr "Sre_diÅ¡Ä?e nalepke"
 
-#: ../src/stock.c:95
-#: ../data/glade/property-bar.glade.h:3
-msgid "Fill color"
-msgstr "Barva polnila"
-
-#: ../src/stock.c:96
-#: ../data/glade/property-bar.glade.h:8
-msgid "Line color"
-msgstr "Barva Ä?rte"
-
-#: ../src/stock.c:97
-#: ../src/stock.c:99
+#: ../src/stock.c:95 ../src/stock.c:97
 msgid "Linked"
 msgstr "Povezano"
 
-#: ../src/stock.c:98
-#: ../src/stock.c:100
+#: ../src/stock.c:96 ../src/stock.c:98
 msgid "Not Linked"
 msgstr "Nepovezano"
 
+#: ../src/template-designer.c:404
+#, fuzzy
+msgid "New gLabels Template"
+msgstr "Snovalnik predlog gLables"
+
+#: ../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
+#, fuzzy
+msgid "Edit gLabels Template"
+msgstr "Snovalnik predlog gLables"
+
+#: ../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"
@@ -270,8 +1191,7 @@ msgid "_Help"
 msgstr "Pomo_Ä?"
 
 #. Popup entries.
-#: ../src/ui.c:109
-#: ../src/ui.c:110
+#: ../src/ui.c:109 ../src/ui.c:110
 msgid "Context Menu"
 msgstr "Vsebinski meni"
 
@@ -347,403 +1267,288 @@ msgstr "_KonÄ?aj"
 msgid "Quit the program"
 msgstr "KonÄ?anje 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
+msgid "Redo"
+msgstr ""
+
+#: ../src/ui.c:194
 msgid "Cut"
 msgstr "Izreži"
 
-#: ../src/ui.c:182
+#: ../src/ui.c:196
 msgid "Cut the selection"
 msgstr "Izrez izbora"
 
-#: ../src/ui.c:187
+#: ../src/ui.c:201
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: ../src/ui.c:189
+#: ../src/ui.c:203
 msgid "Copy the selection"
 msgstr "Kopiranje izbora"
 
-#: ../src/ui.c:194
-msgid "Paste"
-msgstr "Prilepi"
-
-#: ../src/ui.c:196
+#: ../src/ui.c:210
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odložiÅ¡Ä?a"
 
-#: ../src/ui.c:201
-msgid "Delete"
-msgstr "Izbriši"
-
-#: ../src/ui.c:203
+#: ../src/ui.c:217
 msgid "Delete the selected objects"
 msgstr "Izbriši izbrane predmete"
 
-#: ../src/ui.c:208
+#: ../src/ui.c:222
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:224
 msgid "Select all objects"
 msgstr "Izbor vseh predmetov"
 
-#: ../src/ui.c:215
+#: ../src/ui.c:229
 msgid "Un-select All"
 msgstr "Odstrani izbor vsega"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:231
 msgid "Remove all selections"
 msgstr "Odstrani vse izbore"
 
-#: ../src/ui.c:222
+#: ../src/ui.c:236
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: ../src/ui.c:224
+#: ../src/ui.c:238
 msgid "Configure the application"
 msgstr "Nastavitev programa"
 
-#: ../src/ui.c:231
+#: ../src/ui.c:245
 msgid "Zoom in"
 msgstr "Približaj"
 
-#: ../src/ui.c:233
+#: ../src/ui.c:247
 msgid "Increase magnification"
 msgstr "Približaj predmet"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:252
 msgid "Zoom out"
 msgstr "Oddalji"
 
-#: ../src/ui.c:240
+#: ../src/ui.c:254
 msgid "Decrease magnification"
 msgstr "Oddalji predmet"
 
-#: ../src/ui.c:245
+#: ../src/ui.c:259
 msgid "Zoom 1 to 1"
 msgstr "Velikost 1:1"
 
-#: ../src/ui.c:247
+#: ../src/ui.c:261
 msgid "Restore scale to 100%"
 msgstr "Obnavljanje velikosti na 100%"
 
-#: ../src/ui.c:252
+#: ../src/ui.c:266
 msgid "Zoom to fit"
 msgstr "Prilagodi oknu"
 
-#: ../src/ui.c:254
+#: ../src/ui.c:268
 msgid "Set scale to fit window"
 msgstr "Prilagajanje velikost oknu"
 
-#: ../src/ui.c:261
+#: ../src/ui.c:275
 msgid "Select Mode"
 msgstr "NaÄ?in izbiranja"
 
-#: ../src/ui.c:263
+#: ../src/ui.c:277
 msgid "Select, move and modify objects"
 msgstr "Izbor, premikanje in spreminjanje predmetov"
 
-#: ../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:29
 msgid "Text"
 msgstr "Besedilo"
 
-#: ../src/ui.c:270
-msgid "Create text object"
-msgstr "Ustvarjanje besedilnega predmeta"
-
-#: ../src/ui.c:275
+#: ../src/ui.c:289
 msgid "Box"
 msgstr "Okvir"
 
-#: ../src/ui.c:277
+#: ../src/ui.c:291
 msgid "Create box/rectangle object"
 msgstr "Ustvarjanje okvirja/pravokotnika"
 
-#: ../src/ui.c:282
-#: ../data/glade/object-editor.glade.h:20
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
 msgid "Line"
 msgstr "Ä?rta"
 
-#: ../src/ui.c:284
-msgid "Create line object"
-msgstr "Ustvarjanje Ä?rte"
-
-#: ../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 "Ustvarjanje elipse/kroga"
 
-#: ../src/ui.c:296
-#: ../data/glade/object-editor.glade.h:16
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
 msgid "Image"
 msgstr "Slika"
 
-#: ../src/ui.c:298
-msgid "Create image object"
-msgstr "Ustvarjanje slikovnega predmeta"
-
-#: ../src/ui.c:303
+#: ../src/ui.c:317
 msgid "Barcode"
 msgstr "Ä?rtna koda"
 
-#: ../src/ui.c:305
-msgid "Create barcode object"
-msgstr "Ustvarjanje predmeta Ä?rtne kode"
-
-#: ../src/ui.c:310
-msgid "Bring to front"
-msgstr "Prinesi v ospredje"
-
-#: ../src/ui.c:312
+#: ../src/ui.c:326
 msgid "Raise object to top"
 msgstr "Vzdigni predmet na vrh"
 
-#: ../src/ui.c:317
-msgid "Send to back"
-msgstr "Pošlji nazaj"
-
-#: ../src/ui.c:319
+#: ../src/ui.c:333
 msgid "Lower object to bottom"
 msgstr "Spusti predmet na dno"
 
-#: ../src/ui.c:324
-msgid "Rotate left"
-msgstr "Zavrti levo"
-
-#: ../src/ui.c:326
+#: ../src/ui.c:340
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr "Vrtenje predmeta 90 stopinj v levo"
 
-#: ../src/ui.c:331
-msgid "Rotate right"
-msgstr "Zavrti desno"
-
-#: ../src/ui.c:333
+#: ../src/ui.c:347
 msgid "Rotate object 90 degrees clockwise"
 msgstr "Vrtenje predmeta 90 stopinj v desno"
 
-#: ../src/ui.c:338
-msgid "Flip horizontally"
-msgstr "Zrcali vodoravno"
-
-#: ../src/ui.c:340
+#: ../src/ui.c:354
 msgid "Flip object horizontally"
 msgstr "Zrcaljenje predmeta vodoravno"
 
-#: ../src/ui.c:345
-msgid "Flip vertically"
-msgstr "Zrcali navpiÄ?no"
-
-#: ../src/ui.c:347
+#: ../src/ui.c:361
 msgid "Flip object vertically"
 msgstr "Zrcaljenje predmeta navpiÄ?no"
 
-#: ../src/ui.c:352
-msgid "Align left"
-msgstr "Poravnava levo"
-
-#: ../src/ui.c:354
+#: ../src/ui.c:368
 msgid "Align objects to left edges"
 msgstr "Poravnava predmetov na levi rob"
 
-#: ../src/ui.c:359
-msgid "Align right"
-msgstr "Poravnava desno"
-
-#: ../src/ui.c:361
+#: ../src/ui.c:375
 msgid "Align objects to right edges"
 msgstr "Poravnava predmetov na desni rob"
 
-#: ../src/ui.c:366
-msgid "Align horizontal center"
-msgstr "Poravnava vodoravne sredine"
-
-#: ../src/ui.c:368
+#: ../src/ui.c:382
 msgid "Align objects to horizontal centers"
 msgstr "Poravnava predmetov na vodoravno srediÅ¡Ä?e"
 
-#: ../src/ui.c:373
-msgid "Align tops"
-msgstr "Poravnava vrhov"
-
-#: ../src/ui.c:375
+#: ../src/ui.c:389
 msgid "Align objects to top edges"
 msgstr "Poravnava predmetov na zgornji rob"
 
-#: ../src/ui.c:380
-msgid "Align bottoms"
-msgstr "Poravnava dnov"
-
-#: ../src/ui.c:382
+#: ../src/ui.c:396
 msgid "Align objects to bottom edges"
 msgstr "Poravnava predmetov na spodni rob"
 
-#: ../src/ui.c:387
-msgid "Align vertical center"
-msgstr "Poravnava navpiÄ?ne sredine"
-
-#: ../src/ui.c:389
+#: ../src/ui.c:403
 msgid "Align objects to vertical centers"
 msgstr "Poravnava predmetov na navpiÄ?no srediÅ¡Ä?e"
 
-#: ../src/ui.c:394
-msgid "Center horizontally"
-msgstr "Sredini vodoravno"
-
-#: ../src/ui.c:396
+#: ../src/ui.c:410
 msgid "Center objects to horizontal label center"
 msgstr "Sredinjenje predmetov na vodoravno srediÅ¡Ä?e nalepke"
 
-#: ../src/ui.c:401
-msgid "Center vertically"
-msgstr "Sredini navpiÄ?no"
-
-#: ../src/ui.c:403
+#: ../src/ui.c:417
 msgid "Center objects to vertical label center"
 msgstr "Sredinjenje predmetov na navpiÄ?no srediÅ¡Ä?e nalepke"
 
-#: ../src/ui.c:408
-msgid "Merge properties"
-msgstr "Lastnosti združevanja"
-
-#: ../src/ui.c:410
+#: ../src/ui.c:424
 msgid "Edit merge properties"
 msgstr "Urejanje lastnosti združevanja"
 
-#: ../src/ui.c:417
+#: ../src/ui.c:431
 msgid "Contents"
 msgstr "Vsebina"
 
-#: ../src/ui.c:419
+#: ../src/ui.c:433
 msgid "Open glabels manual"
 msgstr "Odpri priroÄ?nik glables"
 
-#: ../src/ui.c:424
+#: ../src/ui.c:438
 msgid "About..."
 msgstr "O programu ..."
 
-#: ../src/ui.c:426
+#: ../src/ui.c:440
 msgid "About glabels"
 msgstr "O glables"
 
-#: ../src/ui.c:436
+#: ../src/ui.c:450
 msgid "Property toolbar"
 msgstr "Orodna vrstica lastnosti"
 
-#: ../src/ui.c:438
+#: ../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:444
-#: ../src/ui.c:489
-#: ../src/ui.c:497
-msgid "Show tooltips"
-msgstr "Pokaži namige"
-
-#: ../src/ui.c:446
-msgid "Show tooltips for property toolbar"
-msgstr "Pokaži namige za orodno vrstico lastnosti"
-
-#: ../src/ui.c:452
+#: ../src/ui.c:458
 msgid "Grid"
 msgstr "Mreža"
 
-#: ../src/ui.c:454
+#: ../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:460
+#: ../src/ui.c:466
 msgid "Markup"
 msgstr "OznaÄ?eno"
 
-#: ../src/ui.c:462
+#: ../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:473
+#: ../src/ui.c:479
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
-#: ../src/ui.c:475
+#: ../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:481
+#: ../src/ui.c:487
 msgid "Drawing toolbar"
 msgstr "Orodna vrstica risanja"
 
-#: ../src/ui.c:483
+#: ../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.c:491
-msgid "Show tooltips for main toolbar"
-msgstr "Pokaži namige za glavno orodno vrstico"
-
-#: ../src/ui.c:499
-msgid "Show tooltips for drawing toolbar"
-msgstr "Pokaži namige za orodno vrstico risanja"
-
-#: ../src/ui-property-bar.c:1232
-#: ../src/object-editor.c:587
-#: ../src/object-editor.c:593
-msgid "Default"
-msgstr "Privzeto"
-
-#: ../src/ui-property-bar.c:1239
-#: ../src/object-editor.c:599
-msgid "No line"
-msgstr "Brez Ä?rte"
-
-#: ../src/ui-property-bar.c:1247
-#: ../src/object-editor.c:606
-msgid "No fill"
-msgstr "Brez polnila"
-
-#: ../src/ui-sidebar.c:152
-msgid "Object properties"
-msgstr "Lastnosti predmeta"
-
-#: ../src/ui-commands.c:1084
+#: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
 msgstr "Glabels vkljuÄ?uje prispevke od:"
 
-#: ../src/ui-commands.c:1090
+#: ../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:1091
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/ui-commands.c:1142
+#, fuzzy
+msgid "or visit http://glabels.org/";
 msgstr "ali pa obiÅ¡Ä?ite 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 za snovanje nalepk in poslovnih vizitk.\n"
 
-#: ../src/ui-commands.c:1107
+#: ../src/ui-commands.c:1158
 msgid "translator-credits"
 msgstr "Andrej ŽnidarÅ¡iÄ? <andrej znidarsic 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 ""
 "Ta program je prosta programska oprema; 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"
+"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"
@@ -751,794 +1556,158 @@ msgstr ""
 "zagotovila za PRODAJO ali PRIMERNOST ZA DOLOÄ?EN NAMEN.\n"
 " Oglejte si GNU General Public Licence za veÄ? podrobnosti.\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 "Nova nalepka ali vizitka"
-
-#: ../src/file.c:191
-msgid "Label properties"
-msgstr "Lastnosti nalepke"
-
-#: ../src/file.c:292
-#: ../src/file.c:578
-msgid "All files"
-msgstr "Vse datoteke"
-
-#: ../src/file.c:297
-#: ../src/file.c:583
-msgid "gLabels documents"
-msgstr "Dokumenti gLabels"
-
-#: ../src/file.c:343
-#: ../src/file.c:640
-msgid "Empty file name selection"
-msgstr "Prazen izbor imena datoteke"
-
-#: ../src/file.c:346
-#: ../src/file.c:362
-msgid "Please select a file or supply a valid file name"
-msgstr "Izberite datoteko ali vpišite veljavno ime datoteke"
-
-#: ../src/file.c:359
-msgid "File does not exist"
-msgstr "Datoteka ne obstaja"
-
-#: ../src/file.c:433
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "Datoteke \"%s\" ni mogoÄ?e odpreti"
-
-#: ../src/file.c:436
-msgid "Not a supported file format"
-msgstr "Ni podprt zapis datoteke"
-
-#: ../src/file.c:513
-#: ../src/file.c:690
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "Datoteke \"%s\" ni mogoÄ?e shraniti"
-
-#: ../src/file.c:517
-#: ../src/file.c:694
-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:556
-#, c-format
-msgid "Save \"%s\" as"
-msgstr "Shrani \"%s\" kot"
-
-#: ../src/file.c:643
-msgid "Please supply a valid file name"
-msgstr "Vnesite veljavno ime datoteke"
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "Napaka gLables!"
 
-#: ../src/file.c:664
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "Ali naj bo datoteka \"%s\" prepisana?"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(brez) - gLabels"
 
-#: ../src/file.c:668
-msgid "File already exists."
-msgstr "Datoteka že obstaja."
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr " (spremenjeno)"
 
-#: ../src/file.c:764
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
 #, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "Ali želite pred zapiranjem shraniti spremembe v dokumentu \"%s\"?"
-
-#: ../src/file.c:768
-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:771
-msgid "Close without saving"
-msgstr "Zapri brez shranjevanja"
-
-#. 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 "toÄ?ke"
-
-#: ../src/prefs.c:161
-#: ../data/glade/object-editor.glade.h:42
-#: ../data/glade/template-designer.glade.h:64
-msgid "inches"
-msgstr "palcev"
-
-#: ../src/prefs.c:163
-msgid "mm"
-msgstr "mm"
-
-#: ../src/prefs-dialog.c:162
-#: ../data/glade/prefs-dialog.glade.h:21
-msgid "gLabels Preferences"
-msgstr "Nastavitve programa"
-
-#. Build editor.
-#: ../src/view-box.c:175
-msgid "Box object properties"
-msgstr "Lastnosti okvirja"
-
-#. Build editor.
-#: ../src/view-ellipse.c:175
-msgid "Ellipse object properties"
-msgstr "Lastnosti elipse"
-
-#. Build editor.
-#: ../src/view-line.c:174
-msgid "Line object properties"
-msgstr "Lastnosti Ä?rte"
-
-#. Build editor.
-#: ../src/view-image.c:174
-msgid "Image object properties"
-msgstr "Lastnosti slike"
-
-#. Build editor.
-#: ../src/view-text.c:178
-msgid "Text object properties"
-msgstr "Lastnosti besedila"
-
-#. Build editor.
-#: ../src/view-barcode.c:174
-msgid "Barcode object properties"
-msgstr "Lastnosti Ä?rtne kode"
-
-#: ../src/object-editor-image-page.c:270
-msgid "All Files"
-msgstr "Vse datoteke"
-
-#: ../src/object-editor-image-page.c:275
-msgid "All Images"
-msgstr "Vse slike"
+msgid "Bad root node = \"%s\""
+msgstr "Slabo korensko vozliÅ¡Ä?e = \"%s\""
 
-#: ../src/object-editor-image-page.c:290
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
 #, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/merge-properties-dialog.c:263
-msgid "Merge Properties"
-msgstr "Lastnosti združevanja"
-
-#: ../src/merge-properties-dialog.c:289
-#: ../src/merge-properties-dialog.c:397
-msgid "Select merge-database source"
-msgstr "Izbor vira podatkovne zbirke za združevanje"
-
-#: ../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 "Izberi"
-
-#: ../src/merge-properties-dialog.c:332
-msgid "Record/Field"
-msgstr "Posnemi/polje"
-
-#: ../src/merge-properties-dialog.c:340
-#: ../data/glade/object-editor.glade.h:10
-msgid "Data"
-msgstr "Podatki"
-
-#: ../src/merge-properties-dialog.c:410
-msgid "Fixed"
-msgstr "Nespremenljivo"
-
-#. ===================================================================
-#: ../src/print-op.c:237
-#: ../src/wdgt-print-copies.c:171
-#: ../data/templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "Nalepke"
-
-#: ../src/template-designer.c:358
-msgid "gLabels Template Designer"
-msgstr "Snovalnik predlog gLables"
-
-#: ../src/template-designer.c:419
-msgid "Welcome"
-msgstr "Dobrodošli"
-
-#: ../src/template-designer.c:463
-msgid "Name and Description"
-msgstr "Ime in opis"
-
-#: ../src/template-designer.c:516
-msgid "Page Size"
-msgstr "Velikost strani"
-
-#: ../src/template-designer.c:587
-msgid "Label or Card Shape"
-msgstr "Oblika vizitke ali nalepke"
-
-#: ../src/template-designer.c:637
-msgid "Label or Card Size"
-msgstr "Velikost vizitke ali nalepke"
-
-#: ../src/template-designer.c:737
-msgid "Label Size (round)"
-msgstr "Velikost nalepke (okrogla)"
-
-#: ../src/template-designer.c:820
-msgid "Label Size (CD/DVD)"
-msgstr "Velikost nalepke (CD/DVD)"
-
-#: ../src/template-designer.c:913
-msgid "Number of Layouts"
-msgstr "Å tevilo razporeditev"
-
-#: ../src/template-designer.c:976
-msgid "Layout(s)"
-msgstr "Razporeditev"
-
-#: ../src/template-designer.c:1087
-msgid "Design Completed"
-msgstr "Snovanje je konÄ?ano"
-
-#: ../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'>Znamka in Å¡tevilka dela se skladata z obstojeÄ?o predlogo!</span>"
-
-#: ../src/bc.c:67
-msgid "POSTNET (any)"
-msgstr "POSTNET (any)"
-
-#: ../src/bc.c:70
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (ZIP only)"
-
-#: ../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 (katerakoli)"
-
-#: ../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 or 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 "Koda 39"
-
-#: ../src/bc.c:133
-msgid "Code 128"
-msgstr "Koda 128"
-
-#: ../src/bc.c:136
-msgid "Code 128C"
-msgstr "Koda 128C"
-
-#: ../src/bc.c:139
-msgid "Code 128B"
-msgstr "Koda 128B"
-
-#: ../src/bc.c:142
-msgid "Interleaved 2 of 5"
-msgstr "Prepleteno 2 od 5"
-
-#: ../src/bc.c:145
-msgid "Codabar"
-msgstr "Å tevilka Ä?rtne kode"
-
-#: ../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 (Podatkovna matrika)"
-
-#: ../src/label.c:531
-msgid "Untitled"
-msgstr "Brez naslova"
-
-#: ../src/label-barcode.c:426
-msgid "Barcode data empty"
-msgstr "Podatki Ä?rtne kode so prazni"
-
-#: ../src/label-barcode.c:430
-msgid "Invalid barcode data"
-msgstr "Neveljavni podatki Ä?rtne kode"
+msgid "bad node =  \"%s\""
+msgstr "slabo vozliÅ¡Ä?e = \"%s\""
 
-#: ../src/xml-label.c:193
+#: ../src/xml-label.c:189 ../src/xml-label.c:227
 msgid "xmlParseFile error"
 msgstr "napaka xml datoteke razÄ?lenjevanja"
 
-#: ../src/xml-label.c:234
-msgid "xmlParseDoc error"
-msgstr "napaka xmlParseDoc"
-
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:264
 msgid "No document root"
 msgstr "Ni korena dokumenta"
 
-#: ../src/xml-label.c:278
+#: ../src/xml-label.c:272
 msgid "Importing from glabels 0.1 format"
 msgstr "Uvažanje iz zapisa glables 0.1"
 
-#: ../src/xml-label.c:287
+#: ../src/xml-label.c:281
 msgid "Importing from glabels 0.4 format"
 msgstr "Uvažanje iz zapisa glables 0.4"
 
-#: ../src/xml-label.c:296
+#: ../src/xml-label.c:291
 #, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "Neznan imenski prostor glables -- uporaba %s"
 
-#: ../src/xml-label.c:327
-#: ../src/xml-label-04.c:79
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Slabo korensko vozliÅ¡Ä?e = \"%s\""
-
-#: ../src/xml-label.c:364
+#: ../src/xml-label.c:360
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "slabo vozliÅ¡Ä?e v vozliÅ¡Ä?u dokumenta = \"%s\""
 
-#: ../src/xml-label.c:409
-#: ../src/xml-label-04.c:127
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "slabo vozliÅ¡Ä?e = \"%s\""
-
-#: ../src/xml-label.c:851
+#: ../src/xml-label.c:856
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "slabo vozliÅ¡Ä?e v podatkovnem vozliÅ¡Ä?u  = \"%s\""
 
-#: ../src/xml-label.c:1088
-#: ../libglabels/xml-template.c:682
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Napaka pretvarjanja Utf8."
 
-#: ../src/xml-label.c:1095
+#: ../src/xml-label.c:1104
 msgid "Problem saving xml file."
 msgstr "Težava med shranjevanjem xml datoteke."
 
-#: ../src/merge.c:170
-#: ../src/merge.c:211
-#: ../src/merge.c:375
-#: ../src/merge.c:378
-msgid "None"
-msgstr "Brez"
-
-#: ../src/merge-init.c:59
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Besedila datoteka loÄ?ena z vejicami (CSV)"
-
-#: ../src/merge-init.c:66
-msgid "Text file with colon delimeters"
-msgstr "Besedila datoteka loÄ?ena s stolpci"
-
-#: ../src/merge-init.c:73
-msgid "Text file with tab delimeters"
-msgstr "Besedila datoteka loÄ?ena s tabulatorji"
-
-#: ../src/merge-init.c:82
-msgid "Data from default Evolution Addressbook"
-msgstr "Podatki iz privzetega imenika Evolution"
-
-#: ../src/merge-init.c:88
-msgid "Data from a file containing VCards"
-msgstr "Podatki iz datoteke, ki vsebuje VCards"
-
-#: ../src/merge-evolution.c:309
-msgid "Couldn't construct query"
-msgstr "Poizvedbe ni mogoÄ?e izgraditi"
-
-#: ../src/merge-evolution.c:315
-#: ../src/merge-evolution.c:326
-msgid "Couldn't open addressbook."
-msgstr "Imenika ni mogoÄ?e odpreti."
-
-#: ../src/merge-evolution.c:341
-msgid "Couldn't list available fields."
-msgstr "Dostopnih polj ni mogoÄ?e razvrstiti."
-
-#: ../src/merge-evolution.c:377
-msgid "Couldn't get contacts."
-msgstr "Stikov ni mogoÄ?e dobiti."
-
-#: ../src/wdgt-print-copies.c:153
-msgid "Sheets:"
-msgstr "Listi:"
-
-#: ../src/wdgt-print-copies.c:173
-msgid "from:"
-msgstr "od:"
-
-#: ../src/wdgt-print-copies.c:178
-msgid "to:"
-msgstr "za:"
-
-#: ../src/wdgt-print-merge.c:154
-msgid "Start on label"
-msgstr "ZaÄ?ni na nalepki"
+#. 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"
 
-#: ../src/wdgt-print-merge.c:159
-msgid "on 1st sheet"
-msgstr "na prvem listu"
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
+msgid "User defined"
+msgstr "UporabniÅ¡ko doloÄ?eno"
 
-#: ../src/wdgt-print-merge.c:168
-msgid "Copies:"
-msgstr "Kopije:"
+#: ../libglabels/db.c:650
+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!"
 
-#: ../src/wdgt-print-merge.c:173
-msgid "Collate"
-msgstr "Združi"
+#: ../libglabels/db.c:1042
+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!"
 
-#: ../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 "Katerikoli"
+#: ../libglabels/db.c:2061
+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!"
 
-#: ../src/wdgt-media-select.c:643
-#, c-format
-msgid "%d per sheet"
-msgstr "%d na list"
+#: ../libglabels/db.c:2128
+#, fuzzy, c-format
+msgid "%s full page label"
+msgstr "Splošna predloga cele strani %s"
 
-#: ../src/wdgt-media-select.c:673
+#: ../libglabels/template.c:156
 #, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
 
-#: ../src/wdgt-media-select.c:678
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "%d na list"
 
-#: ../src/wdgt-media-select.c:689
-#: ../src/wdgt-media-select.c:703
-#, c-format
-msgid "%s %s diameter"
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, fuzzy
+msgid "diameter"
 msgstr "%s %s premer"
 
-#: ../src/wdgt-media-select.c:693
-#: ../src/wdgt-media-select.c:707
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s premer"
-
-#: ../src/wdgt-media-select.c:781
-msgid "No recent templates found."
-msgstr "Nedavnih predlog ni mogoÄ?e najti."
-
-#: ../src/wdgt-media-select.c:782
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr "Poskusite izbrati predlogo s strani \"IÅ¡Ä?i vse predloge\"."
-
-#: ../src/wdgt-media-select.c:861
-msgid "No match."
-msgstr "Ni skladanja."
-
-#: ../src/wdgt-media-select.c:862
-msgid "Try selecting a different brand, page size or category."
-msgstr "Poskusite z izbiro druge znamke, velikosti strani ali kategorije."
-
-#. This is the default custom color
-#: ../src/mygal/color-palette.c:389
-msgid "custom"
-msgstr "po meri"
-
-#. "Custom" color - we'll pop up a GtkColorButton
-#: ../src/mygal/color-palette.c:431
-msgid "Custom Color:"
-msgstr "Barva po meri:"
-
-#: ../src/mygal/color-palette.c:439
-msgid "Choose Custom Color"
-msgstr "Izberite barvo po meri"
-
-#: ../src/mygal/color-palette.c:572
-msgid "black"
-msgstr "Ä?rna"
-
-#: ../src/mygal/color-palette.c:573
-msgid "light brown"
-msgstr "svetlo rjava"
-
-#: ../src/mygal/color-palette.c:574
-msgid "brown gold"
-msgstr "rjavo zlata"
-
-#: ../src/mygal/color-palette.c:575
-msgid "dark green #2"
-msgstr "temno zelena 2"
-
-#: ../src/mygal/color-palette.c:576
-msgid "navy"
-msgstr "mornarska"
-
-#: ../src/mygal/color-palette.c:577
-#: ../src/mygal/color-palette.c:633
-msgid "dark blue"
-msgstr "temno modra"
-
-#: ../src/mygal/color-palette.c:578
-msgid "purple #2"
-msgstr "vijoliÄ?na 2"
-
-#: ../src/mygal/color-palette.c:579
-msgid "very dark gray"
-msgstr "zelo temno siva"
-
-#: ../src/mygal/color-palette.c:582
-#: ../src/mygal/color-palette.c:638
-msgid "dark red"
-msgstr "temno rdeÄ?a"
-
-#: ../src/mygal/color-palette.c:583
-msgid "red-orange"
-msgstr "rdeÄ?e-oranžna"
-
-#: ../src/mygal/color-palette.c:584
-msgid "gold"
-msgstr "zlata"
-
-#: ../src/mygal/color-palette.c:585
-msgid "dark green"
-msgstr "temno zelena"
-
-#: ../src/mygal/color-palette.c:586
-#: ../src/mygal/color-palette.c:639
-msgid "dull blue"
-msgstr "mraÄ?no modra"
-
-#: ../src/mygal/color-palette.c:587
-#: ../src/mygal/color-palette.c:640
-msgid "blue"
-msgstr "modra"
-
-#: ../src/mygal/color-palette.c:588
-msgid "dull purple"
-msgstr "mraÄ?no vijoliÄ?na"
-
-#: ../src/mygal/color-palette.c:589
-msgid "dark grey"
-msgstr "temno siva"
-
-#: ../src/mygal/color-palette.c:592
-msgid "red"
-msgstr "rdeÄ?a"
-
-#: ../src/mygal/color-palette.c:593
-msgid "orange"
-msgstr "oranžna"
-
-#: ../src/mygal/color-palette.c:594
-msgid "lime"
-msgstr "rumeno-zelena"
-
-#: ../src/mygal/color-palette.c:595
-msgid "dull green"
-msgstr "mraÄ?no zelena"
-
-#: ../src/mygal/color-palette.c:596
-msgid "dull blue #2"
-msgstr "mraÄ?no modra 2"
-
-#: ../src/mygal/color-palette.c:597
-msgid "sky blue #2"
-msgstr "nebeško modra 2"
-
-#: ../src/mygal/color-palette.c:598
-#: ../src/mygal/color-palette.c:637
-msgid "purple"
-msgstr "vijoliÄ?na"
-
-#: ../src/mygal/color-palette.c:599
-msgid "gray"
-msgstr "siva"
-
-#: ../src/mygal/color-palette.c:602
-#: ../src/mygal/color-palette.c:634
-msgid "magenta"
-msgstr "Å¡krlatna"
-
-#: ../src/mygal/color-palette.c:603
-msgid "bright orange"
-msgstr "bistro oranžna"
-
-#: ../src/mygal/color-palette.c:604
-#: ../src/mygal/color-palette.c:635
-msgid "yellow"
-msgstr "rumena"
-
-#: ../src/mygal/color-palette.c:605
-msgid "green"
-msgstr "zelena"
-
-#: ../src/mygal/color-palette.c:606
-#: ../src/mygal/color-palette.c:636
-msgid "cyan"
-msgstr "sinja"
-
-#: ../src/mygal/color-palette.c:607
-msgid "bright blue"
-msgstr "bistro modra"
-
-#: ../src/mygal/color-palette.c:608
-#: ../src/mygal/color-palette.c:625
-msgid "red purple"
-msgstr "rdeÄ?e vijoliÄ?na"
-
-#: ../src/mygal/color-palette.c:609
-msgid "light grey"
-msgstr "svetlo siva"
-
-#: ../src/mygal/color-palette.c:612
-#: ../src/mygal/color-palette.c:629
-msgid "pink"
-msgstr "roza"
-
-#: ../src/mygal/color-palette.c:613
-msgid "light orange"
-msgstr "svetlo oranžna"
-
-#: ../src/mygal/color-palette.c:614
-#: ../src/mygal/color-palette.c:626
-msgid "light yellow"
-msgstr "svetlo rumena"
-
-#: ../src/mygal/color-palette.c:615
-msgid "light green"
-msgstr "svetlo zelena"
-
-#: ../src/mygal/color-palette.c:616
-msgid "light cyan"
-msgstr "svetlo sinja"
-
-#: ../src/mygal/color-palette.c:617
-#: ../src/mygal/color-palette.c:627
-msgid "light blue"
-msgstr "svetlo modra"
-
-#: ../src/mygal/color-palette.c:618
-#: ../src/mygal/color-palette.c:631
-msgid "light purple"
-msgstr "svetlo vijoliÄ?na"
-
-#: ../src/mygal/color-palette.c:619
-msgid "white"
-msgstr "bela"
-
-#: ../src/mygal/color-palette.c:624
-msgid "purplish blue"
-msgstr "vijoliÄ?no modra"
-
-#: ../src/mygal/color-palette.c:628
-msgid "dark purple"
-msgstr "temo vijoliÄ?na"
-
-#: ../src/mygal/color-palette.c:630
-msgid "sky blue"
-msgstr "nebeško modra"
-
-#: ../src/critical-error-handler.c:73
-msgid "gLabels Fatal Error!"
-msgstr "Usodna napaka gLables!"
-
-#: ../src/warning-handler.c:73
-msgid "gLabels Error!"
-msgstr "Napaka gLables!"
-
-#. Create and append an "Other" entry.
-#: ../libglabels/db.c:118
-msgid "Other"
-msgstr "Ostalo"
-
-#. Create and append a "User defined" entry.
-#: ../libglabels/db.c:131
-msgid "User defined"
-msgstr "UporabniÅ¡ko doloÄ?eno"
+#. 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"
 
-#: ../libglabels/db.c:482
-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!"
+#. [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"
 
-#: ../libglabels/db.c:875
-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!"
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
 
-#: ../libglabels/db.c:1461
-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!"
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
+msgstr "cm"
 
-#: ../libglabels/db.c:1538
-#, c-format
-msgid "Generic %s full page template"
-msgstr "Splošna predloga cele strani %s"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
+msgstr "pic"
 
-#: ../libglabels/xml-template.c:227
+#: ../libglabels/xml-template.c:223
 msgid "Missing name or brand/part attributes."
 msgstr "ManjkajoÄ?e ime ali atributa znamke/dela."
 
@@ -1554,393 +1723,421 @@ msgstr "Neznan id velikosti strani \"%s\", poskušanje kot ime"
 msgid "Unknown page size id or name \"%s\""
 msgstr "Neznan id velikosti strani ali ime \"%s\""
 
-#: ../libglabels/xml-template.c:627
-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:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: ../libglabels/xml-template.c:637
+#: ../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."
 
-#: ../data/glade/merge-properties-dialog.glade.h:1
+#.
+#. * 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/glade/merge-properties-dialog.glade.h:2
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "<b>Source</b>"
 msgstr "<b>Vir</b>"
 
-#: ../data/glade/merge-properties-dialog.glade.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "Zapis:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "Mesto:"
 
-#: ../data/glade/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Izberi vse"
 
-#: ../data/glade/merge-properties-dialog.glade.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "PrekliÄ?i izbor vsega"
 
-#: ../data/glade/merge-properties-dialog.glade.h:7
-#: ../data/glade/object-editor.glade.h:39
-msgid "dialog1"
-msgstr "pogovorno okno 1"
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+msgid "Recent"
+msgstr "Nedavne pisave"
 
-#: ../data/glade/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>Usmeritev nalepke</b>"
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "Izberi vse"
 
-#: ../data/glade/new-label-dialog.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>Vrsta medija</b>"
+#: ../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
+#, fuzzy
+msgid "Label size:"
+msgstr "Velikost strani:"
+
+#: ../data/ui/new-label-dialog.ui.h:4
+#, fuzzy
+msgid "Layout:"
+msgstr "Razporeditev"
 
-#: ../data/glade/object-editor.glade.h:2
+#: ../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 ""
+
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "Zavrti"
+
+#: ../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/glade/object-editor.glade.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/glade/object-editor.glade.h:4
+#: ../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/glade/object-editor.glade.h:5
-#: ../data/glade/prefs-dialog.glade.h:7
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Poravnava:"
 
-#: ../data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr "Dovoli samodejno skrÄ?enje besedila ob združevanju"
 
-#: ../data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Kot:"
 
-#: ../data/glade/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "Nadzorna vsota"
 
-#: ../data/glade/object-editor.glade.h:9
-#: ../data/glade/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Barva:"
 
-#: ../data/glade/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "OmogoÄ?i senco"
 
-#: ../data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Družina:"
 
-#: ../data/glade/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Datoteka:"
 
-#: ../data/glade/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "Polnilo"
 
-#: ../data/glade/object-editor.glade.h:15
-#: ../data/glade/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/template-designer.ui.h:30
 msgid "Height:"
 msgstr "Višina:"
 
-#: ../data/glade/object-editor.glade.h:17
-msgid "Insert merge field"
-msgstr "Vstavi polje združevanja"
-
-#: ../data/glade/object-editor.glade.h:18
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "KljuÄ?:"
 
-#: ../data/glade/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "Dolžina:"
 
-#: ../data/glade/object-editor.glade.h:21
-#: ../data/glade/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "Razmik vrstic:"
 
-#: ../data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "Dosledno:"
 
-#: ../data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "Prekrivnost:"
 
-#: ../data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Lega"
 
-#: ../data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "Ponastavi velikost slike"
 
-#: ../data/glade/object-editor.glade.h:26
-msgid "Select A File"
-msgstr "Izbor datoteke"
-
-#: ../data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:24
 msgid "Shadow"
 msgstr "Senca"
 
-#: ../data/glade/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Velikost"
 
-#: ../data/glade/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Velikost:"
 
-#: ../data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Slog"
 
-#: ../data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:28
 msgid "Style:"
 msgstr "Slog:"
 
-#: ../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:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
 msgid "Width:"
 msgstr "Å irina:"
 
-#: ../data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:31
 msgid "X Offset:"
 msgstr "Odmik X osi:"
 
-#: ../data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/glade/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "Odmik Y osi:"
 
-#: ../data/glade/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/glade/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "stopinje"
 
-#: ../data/glade/object-editor.glade.h:40
+#: ../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/glade/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:38
 msgid "format:"
 msgstr "oblika:"
 
-#: ../data/glade/prefs-dialog.glade.h:1
+#: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
-#: ../data/glade/prefs-dialog.glade.h:2
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<span weight=\"bold\">Default page size</span>"
 msgstr "<span weight=\"bold\">Privzeta velikost strani</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">Polnilo</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">Ä?rta</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">Besedilo</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">Enote</span>"
 
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Pisava:"
 
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Palci"
 
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "Jezikovna oznaka"
 
-#: ../data/glade/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Milimetri"
 
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "Privzete vrednosti predmeta"
 
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "ToÄ?ke"
 
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr "Izbor privzeti lastnosti za nove predmete."
 
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/ui/prefs-dialog.ui.h:18
 msgid "Select locale specific behavior."
 msgstr "Izberite z jezikovno oznako doloÄ?eno obnaÅ¡anje."
 
-#. 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:19 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "Ameriško pismo"
 
-#: ../data/glade/print-custom-widget.glade.h:1
-msgid "<b>Options</b>"
-msgstr "<b>Možnosti</b>"
-
-#: ../data/glade/print-custom-widget.glade.h:2
-msgid "<b>Print control (Merge)</b>"
-msgstr "<b>Nadzor tiskanja (združi)</B>"
-
-#: ../data/glade/print-custom-widget.glade.h:3
-msgid "<b>Print control (Simple)</b>"
-msgstr "<b>Nadzor tiskanja (preprost)</b>"
-
-#: ../data/glade/property-bar.glade.h:1
+#: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
 msgstr "Krepko"
 
-#: ../data/glade/property-bar.glade.h:2
+#: ../data/ui/property-bar.ui.h:2
 msgid "Center align"
 msgstr "Poravnava na sredino"
 
-#: ../data/glade/property-bar.glade.h:4
-msgid "Font family"
-msgstr "Družina pisav"
-
-#: ../data/glade/property-bar.glade.h:5
-msgid "Font size"
-msgstr "Velikost pisave"
-
-#: ../data/glade/property-bar.glade.h:6
-msgid "Italic"
-msgstr "LežeÄ?e"
-
-#: ../data/glade/property-bar.glade.h:7
+#: ../data/ui/property-bar.ui.h:7
 msgid "Left align"
 msgstr "Poravnava levo"
 
-#: ../data/glade/property-bar.glade.h:9
-msgid "Line width"
-msgstr "Å irine vrstice"
-
-#: ../data/glade/property-bar.glade.h:10
+#: ../data/ui/property-bar.ui.h:10
 msgid "Right align"
 msgstr "Poravnava desno"
 
-#: ../data/glade/property-bar.glade.h:11
-msgid "Text Color"
-msgstr "Barva besedila"
-
-#: ../data/glade/property-bar.glade.h:12
-msgid "Text color"
-msgstr "Barva besedila"
-
-#: ../data/glade/template-designer.glade.h:1
+#: ../data/ui/template-designer.ui.h:1
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
 msgstr "(na primer \"Poštne nalepke\", \"Poslovne vizitke\" ...)"
 
-#: ../data/glade/template-designer.glade.h:2
+#: ../data/ui/template-designer.ui.h:2
 msgid "(e.g., 8163A)"
 msgstr "(na primer 1000)"
 
-#: ../data/glade/template-designer.glade.h:3
+#: ../data/ui/template-designer.ui.h:3
 msgid "(e.g., Avery, Acme, ...)"
 msgstr "(na primer Mobitel, Simobil, ...)"
 
-#: ../data/glade/template-designer.glade.h:4
+#: ../data/ui/template-designer.ui.h:4
 msgid "1. Outer radius:"
 msgstr "1. Zunanji polmer:"
 
-#: ../data/glade/template-designer.glade.h:5
+#: ../data/ui/template-designer.ui.h:5
 msgid "1. Radius:"
 msgstr "1. Polmer:"
 
-#: ../data/glade/template-designer.glade.h:6
+#: ../data/ui/template-designer.ui.h:6
 msgid "1. Width:"
 msgstr "1. Å irina"
 
-#: ../data/glade/template-designer.glade.h:7
+#: ../data/ui/template-designer.ui.h:7
 msgid "2. Height:"
 msgstr "2. Višina:"
 
-#: ../data/glade/template-designer.glade.h:8
+#: ../data/ui/template-designer.ui.h:8
 msgid "2. Inner radius:"
 msgstr "2. Notranji polmer:"
 
-#: ../data/glade/template-designer.glade.h:9
+#: ../data/ui/template-designer.ui.h:9
 msgid "2. Waste (overprint allowed):"
 msgstr "2. Vmesni prostor:"
 
-#: ../data/glade/template-designer.glade.h:10
+#: ../data/ui/template-designer.ui.h:10
 msgid "3. Clipping width:"
 msgstr "3. Å irina odreza:"
 
-#: ../data/glade/template-designer.glade.h:11
+#: ../data/ui/template-designer.ui.h:11
 msgid "3. Margin"
 msgstr "3. Obroba"
 
-#: ../data/glade/template-designer.glade.h:12
+#: ../data/ui/template-designer.ui.h:12
 msgid "3. Round (radius of corner):"
 msgstr "3. Okroglo (polmer kota):"
 
-#: ../data/glade/template-designer.glade.h:13
+#: ../data/ui/template-designer.ui.h:13
 msgid "4. Clipping height:"
 msgstr "4. Višina odreza:"
 
-#: ../data/glade/template-designer.glade.h:14
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "5. Vodoravni vmesni prostor:"
 
-#: ../data/glade/template-designer.glade.h:15
+#: ../data/ui/template-designer.ui.h:15
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. NavpiÄ?ni vmesni prostor:"
 
-#: ../data/glade/template-designer.glade.h:16
+#: ../data/ui/template-designer.ui.h:16
 msgid "5. Waste (overprint allowed):"
 msgstr "5. Vmesni prostor:"
 
-#: ../data/glade/template-designer.glade.h:17
+#: ../data/ui/template-designer.ui.h:17
 msgid "6. Margin"
 msgstr "6. Obroba"
 
-#: ../data/glade/template-designer.glade.h:18
+#: ../data/ui/template-designer.ui.h:18
 msgid "Brand/Manufacturer:"
 msgstr "Znamka/Izdelovalec:"
 
-#: ../data/glade/template-designer.glade.h:19
+#: ../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/glade/template-designer.glade.h:20
+#: ../data/ui/template-designer.ui.h:20
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1953,28 +2150,25 @@ msgstr ""
 "Ä?estitamo!\n"
 "\n"
 "DokonÄ?ali ste snovanje predloge gLables.\n"
-"V primeru, da želite sprejeti in shraniti vaše oblikovanje, kliknite \"Uporabi.\"\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/glade/template-designer.glade.h:27
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../data/glade/template-designer.glade.h:28
+#: ../data/ui/template-designer.ui.h:28
 msgid "Distance from left edge (x0):"
 msgstr "Razdalja od levega roba (x0):"
 
-#: ../data/glade/template-designer.glade.h:29
+#: ../data/ui/template-designer.ui.h:29
 msgid "Distance from top edge (y0):"
 msgstr "Razdalja od zgornjega roba (y0):"
 
-#: ../data/glade/template-designer.glade.h:31
+#: ../data/ui/template-designer.ui.h:31
 msgid "Horizontal pitch (dx):"
 msgstr "Vodoravna razdalja (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"
@@ -1984,76 +2178,76 @@ msgid ""
 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"
+"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/glade/template-designer.glade.h:37
+#: ../data/ui/template-designer.ui.h:37
 msgid "Layout #1"
 msgstr "Razporeditev Å¡t. 1"
 
-#: ../data/glade/template-designer.glade.h:38
+#: ../data/ui/template-designer.ui.h:38
 msgid "Layout #2"
 msgstr "Razporeditev Å¡t. 2"
 
-#: ../data/glade/template-designer.glade.h:39
+#: ../data/ui/template-designer.ui.h:39
 msgid "Number across (nx):"
 msgstr "Vodoravno Å¡tevilo (nx):"
 
-#: ../data/glade/template-designer.glade.h:40
+#: ../data/ui/template-designer.ui.h:40
 msgid "Number down (ny):"
 msgstr "NavpiÄ?no Å¡tevilo (ny):"
 
-#: ../data/glade/template-designer.glade.h:41
+#: ../data/ui/template-designer.ui.h:41
 msgid "Number of layouts:"
 msgstr "Å tevilo razporeditev:"
 
-#: ../data/glade/template-designer.glade.h:42
-#: ../data/glade/wdgt-media-select.glade.h:3
-msgid "Page size:"
-msgstr "Velikost strani:"
-
-#: ../data/glade/template-designer.glade.h:43
-msgid "Part #:"
-msgstr "Del Å¡t:"
-
-#: ../data/glade/template-designer.glade.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 "Vnesite podrobnosti doloÄ?itve predloge pisalnih pripomoÄ?kov."
 
-#: ../data/glade/template-designer.glade.h:45
+#: ../data/ui/template-designer.ui.h:45
 msgid "Please enter the following layout information."
 msgstr "Vnesite sledeÄ?e podrobnosti razporeditve."
 
-#: ../data/glade/template-designer.glade.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 "Vnesite sledeÄ?e parametre velikosti posamezne nalepke v vaÅ¡i predlogi."
 
-#: ../data/glade/template-designer.glade.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: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/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 "Izberite osnovno obliko nalepk ali vizitk."
 
-#: ../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 "Izberite velikost strani predloge pisalnih pripomoÄ?kov."
 
-#: ../data/glade/template-designer.glade.h:50
+#: ../data/ui/template-designer.ui.h:50
 msgid "Print test sheet"
 msgstr "Natisni preizkusni list"
 
-#: ../data/glade/template-designer.glade.h:51
+#: ../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/glade/template-designer.glade.h:52
+#: ../data/ui/template-designer.ui.h:52
 msgid "Round"
 msgstr "Krog"
 
-#: ../data/glade/template-designer.glade.h:53
+#: ../data/ui/template-designer.ui.h:53
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -2061,7 +2255,7 @@ msgstr ""
 "Predloge z \n"
 "dvema razporeditvama."
 
-#: ../data/glade/template-designer.glade.h:55
+#: ../data/ui/template-designer.ui.h:55
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2069,11 +2263,11 @@ msgstr ""
 "Predloge z le\n"
 "eno razporeditvijo."
 
-#: ../data/glade/template-designer.glade.h:57
+#: ../data/ui/template-designer.ui.h:57
 msgid "Vertical pitch (dy):"
 msgstr "NavpiÄ?na razdalja (dy):"
 
-#: ../data/glade/template-designer.glade.h:58
+#: ../data/ui/template-designer.ui.h:58
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2083,390 +2277,431 @@ msgstr ""
 "\n"
 "To pogovorno okno vam bo pomagalo pri ustvarjanju predloge gLables po meri."
 
-#: ../data/glade/template-designer.glade.h:62
-msgid "cd_size_page"
-msgstr "stran_velikosti_cd"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
+msgid "<b>Copies</b>"
+msgstr "<b>Kopije</b>"
 
-#: ../data/glade/template-designer.glade.h:63
-msgid "finish_page"
-msgstr "konÄ?na_stran"
-
-#: ../data/glade/template-designer.glade.h:65
-msgid "layout_page"
-msgstr "razporeditvena_stran"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "<b>Merge Control</b>"
+msgstr "<b>Nadzor tiskanja (združi)</B>"
 
-#: ../data/glade/template-designer.glade.h:66
-msgid "name_page"
-msgstr "ime_strani"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "<b>Options</b>"
+msgstr "<b>Možnosti</b>"
 
-#: ../data/glade/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "Å¡t_razporeditev_stran"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "Združi"
 
-#: ../data/glade/template-designer.glade.h:68
-msgid "pg_size_page"
-msgstr "stran_velikosti_strani"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+msgstr "Kopije:"
 
-#: ../data/glade/template-designer.glade.h:69
-msgid "rect_size_page"
-msgstr "pravokotna_stran"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
+msgid "Sheets:"
+msgstr "Listi:"
 
-#: ../data/glade/template-designer.glade.h:70
-msgid "round_size_page"
-msgstr "okrogla_stran"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
+msgid "Start on label"
+msgstr "ZaÄ?ni na nalepki"
 
-#: ../data/glade/template-designer.glade.h:71
-msgid "shape_page"
-msgstr "oblikovna_stran"
+#: ../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 "zaÄ?etna_sran"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
+msgid "on 1st sheet"
+msgstr "na prvem listu"
 
-#: ../data/glade/wdgt-media-select.glade.h:1
-msgid "Brand:"
-msgstr "Znamka:"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
+msgid "to:"
+msgstr "za:"
 
-#: ../data/glade/wdgt-media-select.glade.h:2
-msgid "Category:"
-msgstr "Kategorija:"
+#: ../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/glade/wdgt-media-select.glade.h:4
-msgid "Recent templates"
-msgstr "Nedavne predloge"
+#: ../data/desktop/glabels-3.0.desktop.in.h:2
+#, fuzzy
+msgid "gLabels Label Designer 3"
+msgstr "gLabels snovalnik nalepk"
 
-#: ../data/glade/wdgt-media-select.glade.h:5
-msgid "Search all templates"
-msgstr "IÅ¡Ä?i po vseh predlogah"
+#: ../data/mime/glabels-3.0.xml.in.h:1
+msgid "gLabels Project File"
+msgstr "Datoteka projekta gLabels"
 
-#: ../data/glade/wdgt-rotate-label.glade.h:1
-msgid "Rotate"
-msgstr "Zavrti"
+#. Envelopes
+#: ../templates/paper-sizes.xml.h:2
+msgid "#10 Envelope"
+msgstr "Ovojnica Å¡t. 10"
 
 #. 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 "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
-#: ../data/templates/paper-sizes.xml.h:27
+#: ../templates/paper-sizes.xml.h:34
 msgid "US Legal"
 msgstr "Ameriška pravna"
 
-#: ../data/templates/categories.xml.h:1
+#: ../templates/categories.xml.h:1
 msgid "Any card"
 msgstr "Katerakoli vizika"
 
-#: ../data/templates/categories.xml.h:2
+#: ../templates/categories.xml.h:2
 msgid "Any label"
 msgstr "Katerakoli nalepka"
 
-#: ../data/templates/categories.xml.h:3
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "Poslovne nalepke"
 
-#: ../data/templates/categories.xml.h:4
+#: ../templates/categories.xml.h:4
 msgid "CD/DVD or other media"
 msgstr "CD/DVD ali drugi mediji"
 
-#: ../data/templates/categories.xml.h:5
+#: ../templates/categories.xml.h:5
 msgid "Mailing/shipping products"
 msgstr "Pošiljanje izdelkov po pošti"
 
-#: ../data/templates/categories.xml.h:6
+#: ../templates/categories.xml.h:6
 msgid "Rectangular labels"
 msgstr "Pravokotne nalepke"
 
-#: ../data/templates/categories.xml.h:7
+#. ===================================================================
+#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
 msgid "Round labels"
 msgstr "Okrogle nalepke"
 
-#: ../data/templates/categories.xml.h:8
+#: ../templates/categories.xml.h:8
 msgid "Square labels"
 msgstr "Kvadratne nalepke"
 
 #. ===================================================================
-#: ../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 "Nalepke naslovov"
-
+#. ********************************************************************
 #. ===================================================================
-#: ../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 "Nalepke naslovov"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:6
-msgid "Allround labels"
-msgstr "Vsestranske nalepke"
-
 #. ============================================================
 #. ===================================================================
 #. ********************************************************************
 #. ===================================================================
-#: ../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 "Poslovne vizitke"
 
-#. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:10
-msgid "CD Booklet"
-msgstr "CD polica"
-
-#. ===============================================================
-#: ../data/templates/avery-iso-templates.xml.h:12
-msgid "CD Inlet"
-msgstr "Robovi 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 nalepke"
 
 #. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:16
-#: ../data/templates/avery-us-templates.xml.h:12
-msgid "Diskette Labels"
-msgstr "Nalepke disket"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:18
-msgid "Diskette labels"
-msgstr "Nalepke disket"
-
-#. ===============================================================
-#. ===================================================================
-#: ../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 "Poštne nalepke"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:22
-msgid "Mailing labels"
-msgstr "Poštne nalepke"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:24
-msgid "Mini Address Labels"
-msgstr "Mini nalepke naslovov"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:26
-msgid "Mini Labels"
-msgstr "Mini nalepke"
-
-#. ===================================================================
-#: ../data/templates/avery-iso-templates.xml.h:28
-msgid "Shipping labels"
-msgstr "Nalepke pošiljanja"
-
-#. ===================================================================
-#: ../data/templates/avery-other-templates.xml.h:2
-msgid "File Folder Labels"
-msgstr "Nalepke map z datotekami"
-
-#. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:8
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "CD/DVD nalepke (nalepke diska)"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:10
+#: ../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
-#: ../data/templates/avery-us-templates.xml.h:14
+#: ../templates/avery-us-templates.xml.h:14
 msgid "Divider Labels"
 msgstr "Nalepke loÄ?ilnikov"
 
 #. ===================================================================
-#: ../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 "Nalepke map z datotekami"
+
+#. ===================================================================
+#: ../templates/avery-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:5
 msgid "Filing Labels"
 msgstr "Nalepke kartotek"
 
 #. ===================================================================
-#: ../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 "Celostranske nalepke"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:20
+#: ../templates/avery-us-templates.xml.h:22
 msgid "ID Labels"
 msgstr "ID nalepke"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:22
+#: ../templates/avery-us-templates.xml.h:24
 msgid "Index Cards"
 msgstr "Kartice kazal"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:24
+#: ../templates/avery-us-templates.xml.h:26
 msgid "Large Round Labels"
 msgstr "Velike okrogle nalepke"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:26
+#: ../templates/avery-us-templates.xml.h:28
 msgid "Name Badge Labels"
 msgstr "Nalepke z imeni"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:28
+#: ../templates/avery-us-templates.xml.h:30
 msgid "Post cards"
 msgstr "Razglednice"
 
 #. ===================================================================
-#: ../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 "Nalepke za naslov vraÄ?ila"
 
 #. ===================================================================
-#: ../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 "Okrogle nalepke"
 
 #. ===================================================================
-#: ../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 "Nalepke pošiljanja"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:36
+#: ../templates/avery-us-templates.xml.h:38
 msgid "Small Round Labels"
 msgstr "Majhne okrogle nalepke"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:38
+#: ../templates/avery-us-templates.xml.h:40
 msgid "Square Labels"
 msgstr "Kvadratne nalepke"
 
 #. ===================================================================
-#: ../data/templates/avery-us-templates.xml.h:40
+#: ../templates/avery-us-templates.xml.h:42
 msgid "Tent Cards"
 msgstr "Karte za Å¡otorjenje"
 
 #. ===================================================================
-#: ../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 "Nalepke ploskev video kaset"
 
 #. ===================================================================
-#: ../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 "Nalepke robov video kaset"
 
-#: ../data/templates/brother-other-templates.xml.h:1
+#. ===================================================================
+#: ../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"
 
-#: ../data/templates/brother-other-templates.xml.h:2
+#: ../templates/brother-other-templates.xml.h:2
 msgid "Shipping Labels 62mm x 100mm"
 msgstr "Nalepke pošiljanja 62mm x 100 mm"
 
@@ -2487,398 +2722,560 @@ msgstr "Nalepke pošiljanja 62mm 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 "Standardne nalepke naslovov 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-palÄ?na disketa"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:6
+#: ../templates/dymo-other-templates.xml.h:6
 msgid "File Folder"
 msgstr "Mapa z datotekami"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:8
+#: ../templates/dymo-other-templates.xml.h:8
 msgid "Hanging Folder"
 msgstr "IzroÄ?na mapa"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:10
+#: ../templates/dymo-other-templates.xml.h:10
 msgid "Large Address Labels"
 msgstr "Velike nalepke naslovov"
 
 #. ===================================================================
-#: ../data/templates/dymo-other-templates.xml.h:14
+#: ../templates/dymo-other-templates.xml.h:14
 msgid "Shipping Address Labels"
 msgstr "Nalepke naslova pošiljanja"
 
 #. ===================================================================
-#: ../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 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"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:6
+#: ../templates/misc-iso-templates.xml.h:6
 msgid "Arch File Labels"
 msgstr "Nalepke datotek arhiva"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:8
+#: ../templates/misc-iso-templates.xml.h:8
 msgid "Arch File Labels (large)"
 msgstr "Nalepke datotek arhiva (velike)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:10
+#: ../templates/misc-iso-templates.xml.h:10
 msgid "Arch File Labels (small)"
 msgstr "Nalepke datotek arhiva (majhne)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:14
+#: ../templates/misc-iso-templates.xml.h:14
 msgid "CD Labels"
 msgstr "CD nalepke"
 
 #. ===================================================================
-#: ../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 nalepke (le ploskev)"
-
-#. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "CD/DVD Labels Standard Format (face only)"
 msgstr "ObiÄ?ajna oblika CD/DVD nalepk (le ploskev)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:22
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Diskette Labels (face only)"
 msgstr "Nalepke disket (le ploskev)"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:24
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "Foto nalepke EPSON 16"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:26
 msgid "Etiketten"
 msgstr "Nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "Fridge Magnet Stickers"
 msgstr "Nalepke magnetov za na hladilnik"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:30
 msgid "General Labels"
 msgstr "Splošne nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr "Nalepke Ä?rnila/laserja 70x37mm"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:38
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Mailing Labels-2 columns"
 msgstr "Poštne nalepke - 2 stolpca"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:40
+#: ../templates/misc-iso-templates.xml.h:40
 msgid "Mailing Labels-3 columns"
 msgstr "Poštne nalepke - 3 stolpci"
 
 #. ===================================================================
-#: ../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 nalepke 2-up (le ploskev)"
-
-#. ===================================================================
-#: ../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 "Pravokotne nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:46
 msgid "Universal Labels"
 msgstr "Splošne oznake"
 
 #. ===================================================================
-#: ../data/templates/misc-iso-templates.xml.h:48
+#: ../templates/misc-iso-templates.xml.h:48
 msgid "Video Labels (face only)"
 msgstr "Video nalepke (le ploskev)"
 
 #. ===================================================================
-#: ../data/templates/misc-other-templates.xml.h:2
+#: ../templates/misc-other-templates.xml.h:2
 msgid "Multi-Purpose Labels"
 msgstr "VeÄ?namenske nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:2
-msgid "Business Card CD"
-msgstr "CD poslovne vizitke"
+#: ../templates/pearl-iso-templates.xml.h:4
+#, fuzzy
+msgid "Address Labels (STAMPIT)"
+msgstr "Nalepke naslovov"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:6
-msgid "CD Template Rectangles"
-msgstr "Pravokotne CD predloge"
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "Nalepke disket"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:10
-msgid "CD/DVD Labels (Face Only)"
-msgstr "CD/DVD nalepke (le ploskev)"
+#: ../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 "Nalepke kaset"
+#: ../templates/pearl-iso-templates.xml.h:12
+#, fuzzy
+msgid "Business cards high glossy"
+msgstr "Poslovne nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:16
-msgid "DLT Labels"
-msgstr "Nalepke DLT"
+#: ../templates/pearl-iso-templates.xml.h:14
+#, fuzzy
+msgid "Business cards punched"
+msgstr "Poslovne nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:18
-msgid "Jewel Case Booklet"
-msgstr "Knjižica škatlice z dragulji"
+#: ../templates/pearl-iso-templates.xml.h:16
+#, fuzzy
+msgid "Business cards punched dull"
+msgstr "Poslovne nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:22
-msgid "Microtube labels"
-msgstr "Nalepke Microtube"
+#: ../templates/pearl-iso-templates.xml.h:18
+#, fuzzy
+msgid "Business cards punched glossy"
+msgstr "Poslovne nalepke"
 
 #. ===================================================================
-#: ../data/templates/misc-us-templates.xml.h:24
-msgid "Mini-CD Labels"
-msgstr "Nalepke mini CD-jev"
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "Floppy disk labels"
+msgstr "Vsestranske nalepke"
 
-#: ../data/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/pearl-iso-templates.xml.h:24
+#, fuzzy
+msgid "Foldable business cards"
+msgstr "Poslovne nalepke"
 
-#: ../data/templates/misc-us-templates.xml.h:26
-msgid "PRO CD Labels 2-up (Face only)"
-msgstr "PRO CD nalepke 2-up (le ploskev)"
+#. ===================================================================
+#: ../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 "Ozko CD ohišje (od desne navzgor)"
+#: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Labels A4"
+msgstr "Nalepke"
 
-#: ../data/templates/misc-us-templates.xml.h:33
-msgid "Slimline CD Case (upside down)"
-msgstr "Ozko CD ohišje (od zgoraj navzdol)"
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
+msgid "Labels A5"
+msgstr "Nalepke"
+
+#. ===================================================================
+#: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
+msgid "Labels A6"
+msgstr "Nalepke"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:10
+#: ../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 "ime_strani"
+
+#. ===================================================================
+#: ../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 glables"
+
+#. ===================================================================
+#: ../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 "Kvadratne nalepke"
+
+#. ===================================================================
+#: ../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 "Kvadratne nalepke"
+
+#. ===================================================================
+#: ../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 "Nalepke popravljanja in prekrivanja"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:12
 msgid "File Back Labels"
 msgstr "Nalepke predalnikov"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:14
+#: ../templates/zweckform-iso-templates.xml.h:14
 msgid "Lever Arch File Labels"
 msgstr "Nalepke arhivskih datotek"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr "VeÄ?namenske odstranljive lepljive nalepke"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:20
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr "Nalepke QSL-kart 70mm x 50,8 mm"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:22
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
 msgstr "Pravokotne kopirne nalepke"
 
 #. ===================================================================
-#: ../data/templates/zweckform-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Video Labels (back)"
 msgstr "Video nalepke (zadnja stran)"
 
-#: ../data/desktop/glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr "Ustvarjanje nalepk, poslovnih vizitk in medijskih platnic"
+#~ msgid "- gLabels label designer"
+#~ msgstr "- snovalnik nalepk gLabels"
 
-#: ../data/desktop/glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "gLabels snovalnik nalepk"
+#~ msgid "- batch process gLabels label files"
+#~ msgstr "- paketno obdelovanje datotek gLabels nalepk"
 
-#: ../data/mime/glabels.keys.in.h:1
-#: ../data/mime/glabels.xml.in.h:1
-msgid "gLabels Project File"
-msgstr "Datoteka projekta gLabels"
+#~ msgid "Show tooltips"
+#~ msgstr "Pokaži namige"
 
-#: ../barcode-0.98/compat/getopt.c:583
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: možnost `%s' je dvoumna\n"
+#~ msgid "Show tooltips for property toolbar"
+#~ msgstr "Pokaži namige za orodno vrstico lastnosti"
 
-#: ../barcode-0.98/compat/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: možnost `--%s' ne dovoli argumenta\n"
+#~ msgid "Show tooltips for main toolbar"
+#~ msgstr "Pokaži namige za glavno orodno vrstico"
 
-#: ../barcode-0.98/compat/getopt.c:612
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: možnost `%c%s' ne dovoli argumenta\n"
+#~ msgid "Show tooltips for drawing toolbar"
+#~ msgstr "Pokaži namige za orodno vrstico risanja"
 
-#: ../barcode-0.98/compat/getopt.c:629
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: možnost `%s' zahteva argument\n"
+#~ msgid "xmlParseDoc error"
+#~ msgstr "napaka xmlParseDoc"
 
-#. --option
-#: ../barcode-0.98/compat/getopt.c:658
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nepoznana možnost `--%s'\n"
+#~ msgid "Text file with comma delimeters (CSV)"
+#~ msgstr "Besedila datoteka loÄ?ena z vejicami (CSV)"
 
-#. +option or -option
-#: ../barcode-0.98/compat/getopt.c:662
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nepoznana možnost `%c%s'\n"
+#~ msgid "Text file with colon delimeters"
+#~ msgstr "Besedila datoteka loÄ?ena s stolpci"
 
-#. 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: neveljavna možnost -- %c\n"
+#~ msgid "Text file with tab delimeters"
+#~ msgstr "Besedila datoteka loÄ?ena s tabulatorji"
 
-#: ../barcode-0.98/compat/getopt.c:691
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: neveljavna možnost -- %c\n"
+#~ msgid "Data from a file containing VCards"
+#~ msgstr "Podatki iz datoteke, ki vsebuje VCards"
 
-#: ../barcode-0.98/compat/getopt.c:727
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: možnost zahteva argument -- %c\n"
-
-#~ msgid "Code 93"
-#~ msgstr "Koda 93"
-#~ msgid "IEC18004 (QRCode)"
-#~ msgstr "IEC18004 (QRKoda)"
-#~ msgid "Default Color"
-#~ msgstr "Privzeta barva"
-#~ msgid "Brown"
-#~ msgstr "Rjava"
-#~ msgid "Dark Goldenrod"
-#~ msgstr "Temna zlata palica"
-#~ msgid "Dark Cyan"
-#~ msgstr "Temno sinja"
-#~ msgid "Navy Blue"
-#~ msgstr "Mornarsko modra"
-#~ msgid "Dark Yellow"
-#~ msgstr "Temno rumena"
-#~ msgid "Turquoise"
-#~ msgstr "Turkizna"
-#~ msgid "Salmon"
-#~ msgstr "Lososova"
-#~ msgid "Violet"
-#~ msgstr "VijoliÄ?na"
-#~ msgid "Khaki"
-#~ msgstr "Kakijeva"
-#~ msgid "Slate Gray"
-#~ msgstr "SkrilavÄ?no siva"
-#~ msgid "Thistle"
-#~ msgstr "Osatna"
-#~ msgid "10\\% Gray"
-#~ msgstr "10\\% Siva"
-#~ msgid "25\\% Gray"
-#~ msgstr "25\\% Siva"
-#~ msgid "40\\% Gray"
-#~ msgstr "40\\% Siva"
-#~ msgid "50\\% Gray"
-#~ msgstr "50\\% Siva"
-#~ msgid "60\\% Gray"
-#~ msgstr "60\\% siva"
-#~ msgid "Custom Color #%u"
-#~ msgstr "Barva po meri #%u"
-#~ msgid "Recent fonts"
-#~ msgstr "Nedavne pisave"
-#~ msgid "Proportional fonts"
-#~ msgstr "Sorazmerne pisave"
-#~ msgid "Fixed-width fonts"
-#~ msgstr "Pisave stalne Å¡irine"
-#~ msgid "All fonts"
-#~ msgstr "Vse pisave"
-#~ msgctxt "Short sample text"
-#~ msgid "Aa"
-#~ msgstr "Aa"
-#~ msgctxt "Lower case sample text"
-#~ msgid "abcdefghijklmnopqrstuvwxyz"
-#~ msgstr "abcÄ?defghijklmnoprsÅ¡tuvzž"
-#~ msgctxt "Upper case sample text"
-#~ msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#~ msgstr "ABCÄ?DEFGHIJKLMNOPRSÅ TUVZŽ"
-#~ msgctxt "Numbers and special characters sample text"
-#~ msgid "0123456789 .:,;(*!?)"
-#~ msgstr "0123456789 .:,;(*!?)"
-#~ msgid "Sample text"
-#~ msgstr "VzorÄ?no besedilo"
-#~ msgid "Print files created with gLabels."
-#~ msgstr "Tiskanje datotek ustvarjenih z gLables."
-#~ 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"
-#~ msgid "Launch gLabels label and business card designer."
-#~ msgstr "Zagon snovalnika nalepk in poslovnih vizitk gLabels. "
-#~ msgid "Text: Comma Separated Values (CSV)"
-#~ msgstr "Besedilo: Z vejico loÄ?ene vrednosti (CSV)"
-#~ 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"
-#~ msgid "Text: Tab Separated Values (TSV)"
-#~ msgstr "Besedilo: s tabulatorjem loÄ?ene vrednosti (TSV)"
-#~ 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"
-#~ msgid "Text: Colon separated values"
-#~ msgstr "Besedilo: z dvopiÄ?jem loÄ?ene vrednosti"
-#~ msgid "Text: Colon separated values with keys on line 1"
-#~ msgstr "Besedilo: z dvopiÄ?jem loÄ?ene vrednosti s kljuÄ?i v prvi vrstici"
-
-#, fuzzy
-#~ msgid "VCards"
-#~ msgstr "Vizitk vCard v besedilu"
-#~ msgid "Normal"
-#~ msgstr "ObiÄ?ajna"
-#~ msgid "cm"
-#~ msgstr "cm"
-#~ msgid "picas"
-#~ msgstr "pic"
-#~ msgid "<b>Copies</b>"
-#~ msgstr "<b>Kopije</b>"
-#~ msgid "#10 Envelope"
-#~ msgstr "Ovojnica Å¡t. 10"
-#~ msgid "C5"
-#~ msgstr "C5"
-#~ msgid "C6"
-#~ msgstr "C6"
-#~ msgid "DL"
-#~ msgstr "DL"
-#~ msgid "Monarch Envelope"
-#~ msgstr "Ovojnica Monarch"
+#~ 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..551f6ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ 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-05-27 22:36-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"
@@ -16,132 +16,140 @@ msgstr ""
 "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
 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
 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
 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
 msgid "Code 39"
 msgstr "Code 39"
 
-#: ../src/bc.c:131
+#: ../src/bc.c:134
 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
 msgid "Interleaved 2 of 5"
 msgstr ""
 
-#: ../src/bc.c:143
+#: ../src/bc.c:146
 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
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:155
+#: ../src/bc.c:176
 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 +269,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 +311,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:584 ../src/label.c:628
 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:52
 msgid "set output filename (default=\"output.pdf\")"
 msgstr ""
 
-#: ../src/glabels-batch.c:51
-#: ../src/glabels-batch.c:65
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "filnamn"
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:53
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr ""
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:55
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "kopior"
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:58
 msgid "first label on first sheet (default=1)"
 msgstr ""
 
-#: ../src/glabels-batch.c:57
+#: ../src/glabels-batch.c:58
 msgid "first"
 msgstr ""
 
-#: ../src/glabels-batch.c:59
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:13
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr ""
 
-#: ../src/glabels-batch.c:65
+#: ../src/glabels-batch.c:66
 msgid "input file for merging"
 msgstr ""
 
-#: ../src/glabels-batch.c:67
-#: ../src/glabels.c:62
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
 msgid "[FILE...]"
 msgstr "[FIL...]"
 
-#: ../src/glabels-batch.c:96
+#: ../src/glabels-batch.c:98
 msgid "Print files created with gLabels."
 msgstr ""
 
-#: ../src/glabels-batch.c:104
-#: ../src/glabels.c:87
+#: ../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 ""
 
-#: ../src/glabels-batch.c:146
+#: ../src/glabels-batch.c:149
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
 msgstr ""
 
-#: ../src/glabels-batch.c:180
+#: ../src/glabels-batch.c:184
 #, 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:483
 msgid "Barcode data empty"
 msgstr ""
 
-#: ../src/label-barcode.c:439
+#: ../src/label-barcode.c:487
 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:399
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: ../src/merge.c:169
-#: ../src/merge.c:210
-#: ../src/merge.c:374
-#: ../src/merge.c:377
+#: ../src/label.c:702 ../src/ui.c:422
+msgid "Merge properties"
+msgstr ""
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+msgid "Bring to front"
+msgstr ""
+
+#: ../src/label.c:1253 ../src/ui.c:331
+msgid "Send to back"
+msgstr ""
+
+#: ../src/label.c:1294
+#, fuzzy
+msgid "Rotate"
+msgstr "Roterad"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Rotera åt vänster"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Rotera åt höger"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr ""
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr ""
+
+#: ../src/label.c:1472 ../src/ui.c:366
+msgid "Align left"
+msgstr "Justera vänster"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr "Justera höger"
+
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr ""
+
+#: ../src/label.c:1666 ../src/ui.c:387
+msgid "Align tops"
+msgstr ""
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr ""
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr ""
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr ""
+
+#: ../src/label.c:1909 ../src/ui.c:415
+msgid "Center vertically"
+msgstr ""
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../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:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr ""
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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 +781,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 +794,160 @@ 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:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Kunde inte öppna adressboken."
+
+#: ../src/merge-init.c:110
+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:9
 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:122
-msgid "<b>Label orientation</b>"
-msgstr "<b>Etikettorientering</b>"
+#: ../src/new-label-dialog.c:203
+#, fuzzy
+msgid "Select Product"
+msgstr "Markera alla objekt"
 
-#: ../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
 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:6
 #: ../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 +1032,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:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
 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:29
 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:18
 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:15
 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 +1504,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 +1517,178 @@ 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:323
 #, 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:406
 #, c-format
 msgid "bad node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:187
-#: ../src/xml-label.c:225
+#: ../src/xml-label.c:189 ../src/xml-label.c:227
 msgid "xmlParseFile error"
 msgstr "xmlParseFile-fel"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:264
 msgid "No document root"
 msgstr "Ingen dokumentrot"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:272
 msgid "Importing from glabels 0.1 format"
 msgstr "Importerar från formatet glabels 0.1"
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:281
 msgid "Importing from glabels 0.4 format"
 msgstr "Importerar från formatet glabels 0.4"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:291
 #, 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:360
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:850
+#: ../src/xml-label.c:856
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr ""
 
-#: ../src/xml-label.c:1092
-#: ../libglabels/xml-template.c:664
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr ""
 
-#: ../src/xml-label.c:1099
+#: ../src/xml-label.c:1104
 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:650
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
+
+#: ../libglabels/db.c:1042
+msgid ""
+"Unable to locate category 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:2061
+msgid ""
+"Unable to locate any template files.  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:2128
+#, c-format
+msgid "%s full page label"
 msgstr ""
 
-#: ../libglabels/db.c:1527
+#: ../libglabels/template.c:156
 #, c-format
-msgid "Generic %s full page template"
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+msgid "per sheet"
+msgstr ""
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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:40
+#: ../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
+#: ../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: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
-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 +1700,396 @@ msgstr ""
 #. * indent-tabs-mode: nil  -- emacs
 #. * End:                   -- emacs
 #.
-#: ../data/builder/merge-properties-dialog.builder.h:1
+#: ../data/ui/merge-properties-dialog.ui.h:1
 msgid "<b>Record selection/preview</b>"
 msgstr ""
 
-#: ../data/builder/merge-properties-dialog.builder.h:2
+#: ../data/ui/merge-properties-dialog.ui.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:3
 msgid "Format:"
 msgstr "Format:"
 
-#: ../data/builder/merge-properties-dialog.builder.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr ""
 
-#: ../data/builder/merge-properties-dialog.builder.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "Markera allt"
 
-#: ../data/builder/merge-properties-dialog.builder.h:6
+#: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
 msgstr "Avmarkera allt"
 
-#: ../data/builder/object-editor.builder.h:2
+#: ../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/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/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.builder.h:3
-msgid "00000000000 00000"
-msgstr "00000000000 00000"
-
-#: ../data/builder/object-editor.builder.h:4
+#: ../data/ui/object-editor.ui.h:3
 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:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../data/builder/object-editor.builder.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: ../data/builder/object-editor.builder.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "Kontrollsumma"
 
-#: ../data/builder/object-editor.builder.h:9
-#: ../data/builder/prefs-dialog.builder.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "Färg:"
 
-#: ../data/builder/object-editor.builder.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "Aktivera skugga"
 
-#: ../data/builder/object-editor.builder.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "Familj:"
 
-#: ../data/builder/object-editor.builder.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "Fil:"
 
-#: ../data/builder/object-editor.builder.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:15
-#: ../data/builder/template-designer.builder.h:30
+#: ../data/ui/object-editor.ui.h:14 ../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:16
 msgid "Key:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:19
+#: ../data/ui/object-editor.ui.h:17
 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:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "Opacitet:"
 
-#: ../data/builder/object-editor.builder.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "Position"
 
-#: ../data/builder/object-editor.builder.h:25
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "�terställ bildstorlek"
 
-#: ../data/builder/object-editor.builder.h:26
+#: ../data/ui/object-editor.ui.h:24
 msgid "Shadow"
 msgstr "Skugga"
 
-#: ../data/builder/object-editor.builder.h:27
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "Storlek"
 
-#: ../data/builder/object-editor.builder.h:28
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "Storlek:"
 
-#: ../data/builder/object-editor.builder.h:29
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/builder/object-editor.builder.h:30
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:34
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.builder.h:35
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:36
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.builder.h:37
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "grader"
 
-#: ../data/builder/object-editor.builder.h:38
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../data/builder/object-editor.builder.h:39
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr ""
 
-#: ../data/builder/object-editor.builder.h:40
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<span weight=\"bold\">Default page size</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">Linje</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">Text</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">Enheter</span>"
 
-#: ../data/builder/prefs-dialog.builder.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "Typsnitt:"
 
-#: ../data/builder/prefs-dialog.builder.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: ../data/builder/prefs-dialog.builder.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "Tum"
 
-#: ../data/builder/prefs-dialog.builder.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "Millimeter"
 
-#: ../data/builder/prefs-dialog.builder.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "Punkter"
 
-#: ../data/builder/prefs-dialog.builder.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr ""
 
-#: ../data/builder/prefs-dialog.builder.h:18
+#: ../data/ui/prefs-dialog.ui.h:18
 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:19 ../templates/paper-sizes.xml.h:35
 msgid "US Letter"
 msgstr "US Letter"
 
-#: ../data/builder/property-bar.builder.h:1
+#: ../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 +2107,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 +2128,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 +2216,177 @@ 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
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
 msgid "<b>Copies</b>"
 msgstr "<b>Kopior</b>"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:2
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 msgid "<b>Merge Control</b>"
 msgstr ""
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:3
+#: ../data/ui/print-op-dialog-custom-widget.ui.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:4
 msgid "Collate"
 msgstr "Sortera"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:5
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
 msgid "Copies:"
 msgstr "Kopior"
 
-#: ../data/builder/print-op-dialog-custom-widget.builder.h:7
+#: ../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 +2398,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 +2415,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 +2425,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 +2458,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 +2477,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 +2489,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 +2612,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 +2639,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 +2726,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 +2842,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 +2857,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 +3024,62 @@ 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 "%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..1e768d4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,209 +4,1108 @@
 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-05-27 22:36-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
+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
+#, fuzzy
+msgid "Code 93"
+msgstr "Code 39"
+
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
+
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
+msgstr "IEC16022 (DataMatrix)"
+
+#: ../src/bc.c:176
+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/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/glabels.c:91 ../src/glabels-batch.c:105
+#: ../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:584 ../src/label.c:628
+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 ""
-"%s\n"
-"è¿?è¡?'%s --help'æ?¥æ?¥ç??å?¯ç?¨ç??å?½ä»¤å??æ?°ã??\n"
 
-#: ../src/glabels-batch.c:53
+#: ../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:52
 msgid "set output filename (default=\"output.pdf\")"
 msgstr "è¾?å?ºæ??件å??(é»?认å?¼=\"output.pdf\")"
 
-#: src/glabels-batch.c:56 src/glabels-batch.c:70
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
 msgid "filename"
 msgstr "æ??件å??"
 
-#: src/glabels-batch.c:54
+#: ../src/glabels-batch.c:54
 msgid "number of sheets (default=1)"
 msgstr "æ¯?页æ?°é??(é»?认å?¼=1)"
 
-#: src/glabels-batch.c:54
+#: ../src/glabels-batch.c:54
 msgid "sheets"
 msgstr "æ?°é??"
 
-#: src/glabels-batch.c:56
+#: ../src/glabels-batch.c:56
 msgid "number of copies (default=1)"
 msgstr "å?¯æ?¬æ?°é??(é»?认å?¼=1)"
 
-#: src/glabels-batch.c:56
+#: ../src/glabels-batch.c:56
 msgid "copies"
 msgstr "��"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:58
 msgid "first label on first sheet (default=1)"
 msgstr "第1页ç??第1个æ ?ç­¾ (é»?认å?¼=1)"
 
-#: ../src/glabels-batch.c:59
+#: ../src/glabels-batch.c:58
 msgid "first"
 msgstr "第1个"
 
-#: src/glabels-batch.c:64 src/print-dialog.c:336
+#: ../src/glabels-batch.c:60 ../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:62 ../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:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print crop marks"
 msgstr "æ??å?°è£?å?ªæ ?è®°"
 
-#: ../src/glabels-batch.c:67
+#: ../src/glabels-batch.c:66
 msgid "input file for merging"
 msgstr "è¾?å?¥è¦?æ??å?¥ç??æ??件å??"
 
-#: ../src/glabels-batch.c:97
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+msgid "[FILE...]"
+msgstr "[æ??件...]"
+
+#: ../src/glabels-batch.c:98
 msgid "Print files created with gLabels."
 msgstr "æ??å?°gLabelsæ??件ã??"
 
-#: ../src/glabels-batch.c:147
+#: ../src/glabels-batch.c:106 ../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:149
+#, 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:184
 #, 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:483
+msgid "Barcode data empty"
+msgstr "空�形���"
+
+#: ../src/label-barcode.c:487
+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:399
+msgid "Untitled"
+msgstr "æ?ªå?½å??"
+
+#: ../src/label.c:702 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "å??并å±?æ?§"
+
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "å? é?¤"
+
+#: ../src/label.c:1217 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "移���"
+
+#: ../src/label.c:1253 ../src/ui.c:331
+msgid "Send to back"
+msgstr "移���"
+
+#: ../src/label.c:1294
+#, fuzzy
+msgid "Rotate"
+msgstr "æ??转"
+
+#: ../src/label.c:1329 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "å??å·¦æ??转"
+
+#: ../src/label.c:1362 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "å??å?³æ??转"
+
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "水平翻转"
+
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "å??ç?´ç¿»è½¬"
+
+#: ../src/label.c:1472 ../src/ui.c:366
+msgid "Align left"
+msgstr "左对�"
+
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
+msgstr "�对�"
 
-#: src/stock.c:65 data/ui/glabels-ui.xml.h:162
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "水平中��线"
+
+#: ../src/label.c:1666 ../src/ui.c:387
+msgid "Align tops"
+msgstr "顶端对�"
+
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "��对�"
+
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "å??ç?´ä¸­å¿?å?±çº¿"
+
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "水平�中"
+
+#: ../src/label.c:1909 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "å??ç?´å±?中"
+
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
+msgstr "ç²?è´´"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "�建线�对象"
+
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "æ?°å»ºå?¾ç??对象"
+
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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:104
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "ä»?Evolution导å?ºç??é??è¿?å½?"
+
+#: ../src/merge-init.c:110
+#, 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:9
+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:6
+#: ../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:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
+msgstr "<span foreground='red' weight='bold'>模æ?¿ä¸­å·²æ??ç??å??ç??å??è§?æ ¼</span>"
+
 #. Menu entries.
 #: ../src/ui.c:93
 msgid "_File"
@@ -341,365 +1240,270 @@ 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:29
 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:18
 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:15
 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 +1511,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 +1534,154 @@ 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:323
 #, 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:406
 #, 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:189 ../src/xml-label.c:227
 msgid "xmlParseFile error"
 msgstr "xmlæ??件语æ³?é??误"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:264
 msgid "No document root"
 msgstr "没æ??æ??档根"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:272
 msgid "Importing from glabels 0.1 format"
 msgstr "导�glabels 0.1格�"
 
-#: src/xml-label.c:272
+#: ../src/xml-label.c:281
 msgid "Importing from glabels 0.4 format"
 msgstr "导�glabels 0.4格�"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:291
 #, 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:360
 #, 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:856
 #, 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:1097 ../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:1104
 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:650
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr "æ?¾ä¸?å?°çº¸å¼ å°ºå¯¸å®?ä¹?æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1042
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
-msgstr ""
-"æ?¾ä¸?å?°ç±»å??å®?ä¹?æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
+msgstr "æ?¾ä¸?å?°ç±»å??å®?ä¹?æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2061
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
-msgstr ""
-"æ?¾ä¸?å?°æ¨¡æ?¿æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
+msgstr "æ?¾ä¸?å?°æ¨¡æ?¿æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
 
-#: ../libglabels/db.c:1538
-#, c-format
-msgid "Generic %s full page template"
+#: ../libglabels/db.c:2128
+#, 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 ""
+
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
+#, fuzzy
+msgid "per sheet"
+msgstr "�页 %d"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, 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:40
+#: ../data/ui/prefs-dialog.ui.h:22
+msgid "points"
+msgstr "å??ç´ "
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../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:223
 msgid "Missing name or brand/part attributes."
 msgstr "å??称æ??å??ç??/è§?æ ¼ å±?æ?§ä¸?å®?æ?´ã??"
 
@@ -1476,396 +1692,422 @@ 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
+#.
+#. * 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>è®°å½?é??æ?©/é¢?è§?</b>"
 
-#: ../data/builder/merge-properties-dialog.glade.h:2
+#: ../data/ui/merge-properties-dialog.ui.h:2
 msgid "<b>Source</b>"
 msgstr "<b>��</b>"
 
-#: ../data/builder/merge-properties-dialog.glade.h:3
+#: ../data/ui/merge-properties-dialog.ui.h:3
 msgid "Format:"
 msgstr "格��"
 
-#: ../data/builder/merge-properties-dialog.glade.h:4
+#: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Location:"
 msgstr "�置�"
 
-#: ../data/builder/merge-properties-dialog.glade.h:5
+#: ../data/ui/merge-properties-dialog.ui.h:5
 msgid "Select all"
 msgstr "å?¨é??"
 
-#: ../data/builder/merge-properties-dialog.glade.h:6
+#: ../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/builder/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/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/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/builder/object-editor.glade.h:2
+#: ../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
+#: ../data/ui/object-editor.ui.h:3
 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:4 ../data/ui/prefs-dialog.ui.h:7
 msgid "Alignment:"
 msgstr "对��"
 
-#: ../data/builder/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr "è?ªå?¨è°?æ?´å??缩æ?¾æ??å­?"
 
-#: ../data/builder/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "�度�"
 
-#: ../data/builder/object-editor.glade.h:8
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr "校��"
 
-#: ../data/builder/object-editor.glade.h:9
-#: ../data/builder/prefs-dialog.glade.h:8
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
 msgid "Color:"
 msgstr "���"
 
-#: ../data/builder/object-editor.glade.h:11
+#: ../data/ui/object-editor.ui.h:10
 msgid "Enable shadow"
 msgstr "使��影"
 
-#: ../data/builder/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:11
 msgid "Family:"
 msgstr "ç³»å??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:13
+#: ../data/ui/object-editor.ui.h:12
 msgid "File:"
 msgstr "æ??件ï¼?"
 
-#: ../data/builder/object-editor.glade.h:14
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "å¡«å??"
 
-#: ../data/builder/object-editor.glade.h:15
-#: ../data/builder/template-designer.glade.h:30
+#: ../data/ui/object-editor.ui.h:14 ../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:16
 msgid "Key:"
 msgstr "���"
 
-#: ../data/builder/object-editor.glade.h:19
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "�度�"
 
-#: ../data/builder/object-editor.glade.h:21
-#: ../data/builder/prefs-dialog.glade.h:12
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
 msgid "Line Spacing:"
 msgstr "线æ?¡é?´é??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "æ??å­?ï¼?"
 
-#: ../data/builder/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:21
 msgid "Opacity:"
 msgstr "ä¸?é??æ??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../data/builder/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:23
 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:24
 msgid "Shadow"
 msgstr "é?´å½±"
 
-#: ../data/builder/object-editor.glade.h:28
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "尺寸"
 
-#: ../data/builder/object-editor.glade.h:29
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size:"
 msgstr "尺寸�"
 
-#: ../data/builder/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:27
 msgid "Style"
 msgstr "�格"
 
-#: ../data/builder/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:28
 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:30 ../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:31
 msgid "X Offset:"
 msgstr "X å??移é??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: ../data/builder/object-editor.glade.h:36
+#: ../data/ui/object-editor.ui.h:33
 msgid "Y Offset:"
 msgstr "Y å??移é??ï¼?"
 
-#: ../data/builder/object-editor.glade.h:37
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/builder/object-editor.glade.h:38
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "度�"
 
-#: ../data/builder/object-editor.glade.h:40
+#: ../data/ui/object-editor.ui.h:36
+msgid "dialog1"
+msgstr "对��1"
+
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr "æ?°å­?ä½?æ?°ï¼?"
 
-#: ../data/builder/object-editor.glade.h:41
+#: ../data/ui/object-editor.ui.h:38
 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
+#: ../data/ui/prefs-dialog.ui.h:2
 msgid "<span weight=\"bold\">Default page size</span>"
 msgstr "<span weight=\"bold\">�认纸张尺寸</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:3
+#: ../data/ui/prefs-dialog.ui.h:3
 msgid "<span weight=\"bold\">Fill</span>"
 msgstr "<span weight=\"bold\">å¡«å??</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:4
+#: ../data/ui/prefs-dialog.ui.h:4
 msgid "<span weight=\"bold\">Line</span>"
 msgstr "<span weight=\"bold\">线�</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:5
+#: ../data/ui/prefs-dialog.ui.h:5
 msgid "<span weight=\"bold\">Text</span>"
 msgstr "<span weight=\"bold\">æ??å­?</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:6
+#: ../data/ui/prefs-dialog.ui.h:6
 msgid "<span weight=\"bold\">Units</span>"
 msgstr "<span weight=\"bold\">å??ä½?</span>"
 
-#: ../data/builder/prefs-dialog.glade.h:9
+#: ../data/ui/prefs-dialog.ui.h:9
 msgid "Font:"
 msgstr "å­?ä½?ï¼?"
 
-#: ../data/builder/prefs-dialog.glade.h:10
+#: ../data/ui/prefs-dialog.ui.h:10
 msgid "ISO A4"
 msgstr ""
 
-#: ../data/builder/prefs-dialog.glade.h:11
+#: ../data/ui/prefs-dialog.ui.h:11
 msgid "Inches"
 msgstr "�寸"
 
-#: ../data/builder/prefs-dialog.glade.h:13
+#: ../data/ui/prefs-dialog.ui.h:13
 msgid "Locale"
 msgstr "æ?¬å?°å??"
 
-#: ../data/builder/prefs-dialog.glade.h:14
+#: ../data/ui/prefs-dialog.ui.h:14
 msgid "Millimeters"
 msgstr "毫米"
 
-#: ../data/builder/prefs-dialog.glade.h:15
+#: ../data/ui/prefs-dialog.ui.h:15
 msgid "Object defaults"
 msgstr "对象�认�"
 
-#: ../data/builder/prefs-dialog.glade.h:16
+#: ../data/ui/prefs-dialog.ui.h:16
 msgid "Points"
 msgstr "å??ç´ "
 
-#: ../data/builder/prefs-dialog.glade.h:17
+#: ../data/ui/prefs-dialog.ui.h:17
 msgid "Select default properties for new objects."
 msgstr "为æ?°å¯¹è±¡é??æ?©é»?认å±?æ?§"
 
-#: data/glade/prefs-dialog.glade.h:19
+#: ../data/ui/prefs-dialog.ui.h:18
 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:19 ../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/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 +2125,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 +2151,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 +2221,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 +2229,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 +2243,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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "<b>é??项</b>"
 
-#: ../data/builder/template-designer.glade.h:63
-msgid "finish_page"
-msgstr "å®?æ??"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+#, fuzzy
+msgid "<b>Merge Control</b>"
+msgstr "<b>æ??å?°æ?§å?¶(å??并)</b>"
 
-#: ../data/builder/template-designer.glade.h:65
-msgid "layout_page"
-msgstr "��"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+msgid "<b>Options</b>"
+msgstr "<b>é??项</b>"
 
-#: ../data/builder/template-designer.glade.h:66
-msgid "name_page"
-msgstr "å??称"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "é??å??"
 
-#: ../data/builder/template-designer.glade.h:67
-msgid "nlayouts_page"
-msgstr "����"
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+msgstr "��"
 
-#: ../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 +2472,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 +2690,460 @@ 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 "Select A File"
+#~ msgstr "é??æ?©ä¸?个æ??件"
 
-#: ../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 "<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..d8005f9 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-05-27 22:36-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,2186 @@ 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
+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
+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
+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
+msgid "Code 39"
 msgstr ""
 
-#: src/glabels.c:187
-msgid "Could not initialize Bonobo!\n"
+#: ../src/bc.c:134
+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/glabels-batch.c:52
-msgid "set output filename (default=\"output.ps\")"
-msgstr "設å®?輸å?ºæª?å??稱 (é ?設ç?º\"output.ps\")"
-
-#: src/glabels-batch.c:52
-msgid "filename"
-msgstr "æª?æ¡?å??稱"
-
-#: src/glabels-batch.c:54
-msgid "number of sheets (default=1)"
-msgstr "�張�� (�設� 1)"
-
-#: src/glabels-batch.c:54
-msgid "sheets"
-msgstr "ç´?å¼µ"
+#: ../src/bc.c:137
+msgid "Code 128C"
+msgstr ""
 
-#: src/glabels-batch.c:56
-msgid "number of copies (default=1)"
-msgstr "份� (�設� 1)"
+#: ../src/bc.c:140
+msgid "Code 128B"
+msgstr ""
 
-#: src/glabels-batch.c:56
-msgid "copies"
-msgstr "份�"
+#: ../src/bc.c:143
+msgid "Interleaved 2 of 5"
+msgstr ""
 
-#: src/glabels-batch.c:58 src/print-dialog.c:336
-msgid "print outlines (to test printer alignment)"
-msgstr "å?°å?ºå¤?é?? (測試æ??å?°æ©?å??æ?¸)"
+#: ../src/bc.c:146
+msgid "Codabar"
+msgstr ""
 
-#: src/glabels-batch.c:60 src/print-dialog.c:344
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "å??æ?¹å??å??å?° (å¦?å??å??å½±å??)"
+#: ../src/bc.c:149
+msgid "MSI"
+msgstr ""
 
-#: src/glabels-batch.c:96
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr "[��...] GLABELS_FILE..."
+#: ../src/bc.c:152
+msgid "Plessey"
+msgstr ""
 
-#: src/glabels-batch.c:116
-msgid "missing glabels file\n"
-msgstr "æ²?æ??輸å?¥ glabels ç??æª?æ¡?\n"
+#: ../src/bc.c:155
+msgid "Code 93"
+msgstr ""
 
-#: src/glabels-batch.c:157
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "é??å??æª?æ¡?失æ?? %s\n"
+#: ../src/bc.c:162
+msgid "GS1-128"
+msgstr ""
 
-#: src/window.c:244
-msgid "(none) - gLabels"
+#: ../src/bc.c:169
+msgid "IEC16022 (DataMatrix)"
 msgstr ""
 
-#: src/window.c:414
-msgid "(modified)"
+#: ../src/bc.c:176
+msgid "IEC18004 (QRCode)"
 msgstr ""
 
-#: src/stock.c:65 data/ui/glabels-ui.xml.h:165
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
 #, fuzzy
-msgid "_Select Mode"
-msgstr "é?¸æ??"
+msgid "Default Color"
+msgstr "��"
 
-#: src/stock.c:66 data/ui/glabels-ui.xml.h:166
-#, fuzzy
-msgid "_Text"
-msgstr "æ??å­?"
+#: ../src/color-combo-menu.c:83
+msgid "Dark Red"
+msgstr ""
 
-#: src/stock.c:67 data/ui/glabels-ui.xml.h:151
-#, fuzzy
-msgid "_Line"
-msgstr "ç·?"
+#: ../src/color-combo-menu.c:84
+msgid "Brown"
+msgstr ""
 
-#: src/stock.c:68 data/ui/glabels-ui.xml.h:133
-#, fuzzy
-msgid "_Box"
-msgstr "ç??å­?"
+#: ../src/color-combo-menu.c:85
+msgid "Dark Goldenrod"
+msgstr ""
 
-#: src/stock.c:69 data/ui/glabels-ui.xml.h:144
-#, fuzzy
-msgid "_Ellipse"
-msgstr "æ©¢å??å½¢"
+#: ../src/color-combo-menu.c:86
+msgid "Dark Green"
+msgstr ""
 
-#: src/stock.c:70 data/ui/glabels-ui.xml.h:149
-#, fuzzy
-msgid "_Image"
-msgstr "å??å??"
+#: ../src/color-combo-menu.c:87
+msgid "Dark Cyan"
+msgstr ""
 
-#: src/stock.c:71 data/ui/glabels-ui.xml.h:11
-#, fuzzy
-msgid "Bar_code"
-msgstr "�碼�"
+#: ../src/color-combo-menu.c:88
+msgid "Navy Blue"
+msgstr ""
 
-#: src/stock.c:72
-#, fuzzy
-msgid "_Merge Properties"
-msgstr "å??併設å®?"
+#: ../src/color-combo-menu.c:89
+msgid "Dark Violet"
+msgstr ""
 
-#: src/stock.c:73
-#, fuzzy
-msgid "Object _Properties"
-msgstr "æ??å­?樣è²?"
+#: ../src/color-combo-menu.c:91
+msgid "Red"
+msgstr ""
 
-#: src/stock.c:74 data/ui/glabels-ui.xml.h:13
-#, fuzzy
-msgid "Bring to _Front"
-msgstr "帶å?ºå?°å??é?¢"
+#: ../src/color-combo-menu.c:92
+msgid "Orange"
+msgstr ""
 
-#: src/stock.c:75 data/ui/glabels-ui.xml.h:110
-#, fuzzy
-msgid "Send to _Back"
-msgstr "æ?¾å?¨æ??åº?"
+#: ../src/color-combo-menu.c:93
+msgid "Dark Yellow"
+msgstr ""
 
-#: src/stock.c:76 data/ui/glabels-ui.xml.h:97
-#, fuzzy
-msgid "Rotate _Left"
-msgstr "æ??è½?"
+#: ../src/color-combo-menu.c:94
+msgid "Medium green"
+msgstr ""
 
-#: src/stock.c:77 data/ui/glabels-ui.xml.h:98
-#, fuzzy
-msgid "Rotate _Right"
-msgstr "æ??è½?"
+#: ../src/color-combo-menu.c:95
+msgid "Turquoise"
+msgstr ""
 
-#: src/stock.c:78 data/ui/glabels-ui.xml.h:52
-msgid "Flip _Horizontally"
+#: ../src/color-combo-menu.c:96
+msgid "Blue"
 msgstr ""
 
-#: src/stock.c:79 data/ui/glabels-ui.xml.h:53
-msgid "Flip _Vertically"
+#: ../src/color-combo-menu.c:97
+msgid "Purple"
 msgstr ""
 
-#: src/stock.c:80 data/ui/glabels-ui.xml.h:150
-msgid "_Lefts"
+#: ../src/color-combo-menu.c:99
+msgid "Salmon"
 msgstr ""
 
-#: src/stock.c:81 data/ui/glabels-ui.xml.h:162
-msgid "_Rights"
+#: ../src/color-combo-menu.c:100
+msgid "Gold"
 msgstr ""
 
-#: src/stock.c:82 data/ui/glabels-ui.xml.h:134
-msgid "_Centers"
+#: ../src/color-combo-menu.c:101
+msgid "Yellow"
 msgstr ""
 
-#: src/stock.c:83 data/ui/glabels-ui.xml.h:167
+#: ../src/color-combo-menu.c:102
 #, fuzzy
-msgid "_Tops"
-msgstr "工� (&_T)"
+msgid "Green"
+msgstr "度�"
 
-#: src/stock.c:84
-msgid "Bottoms"
+#: ../src/color-combo-menu.c:103
+msgid "Cyan"
 msgstr ""
 
-#: src/stock.c:85
-msgid "Centers"
-msgstr ""
+#: ../src/color-combo-menu.c:104
+#, fuzzy
+msgid "SkyBlue"
+msgstr "樣�"
 
-#: src/stock.c:86 src/stock.c:87 data/ui/glabels-ui.xml.h:62
-msgid "Label Ce_nter"
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
 msgstr ""
 
-#: src/stock.c:88 data/ui/glabels-ui.xml.h:51
-msgid "Fill color"
+#: ../src/color-combo-menu.c:107
+#, fuzzy
+msgid "Pink"
+msgstr "å??å?°"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
 msgstr ""
 
-#: src/stock.c:89 data/ui/glabels-ui.xml.h:64
-msgid "Line color"
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
 msgstr ""
 
-#: src/stock.c:90 src/stock.c:92
+#: ../src/color-combo-menu.c:110
 #, fuzzy
-msgid "Linked"
-msgstr "ç·?"
+msgid "Light Green"
+msgstr "度�"
 
-#: src/stock.c:91 src/stock.c:93
-#, fuzzy
-msgid "Not Linked"
-msgstr "æ²?æ??"
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
+msgstr ""
 
-#: src/ui-property-bar.c:345 src/object-editor.c:499
-#, fuzzy
-msgid "Default"
-msgstr "��"
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr ""
 
-#: src/ui-property-bar.c:360 src/object-editor.c:512
-msgid "No fill"
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
 msgstr ""
 
-#: src/ui-property-bar.c:375 src/object-editor.c:505
-#, fuzzy
-msgid "No line"
-msgstr "æ²?æ??"
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr ""
 
-#: src/ui-sidebar.c:180
-#, fuzzy
-msgid "Object properties"
-msgstr "æ??å­?樣è²?"
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+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:119
+#, no-c-format
+msgid "25% Gray"
 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/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/commands.c:400
-msgid "or visit http://glabels.sourceforge.net/";
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
 msgstr ""
 
-#: src/commands.c:409
-msgid " "
+#: ../src/color-combo-menu.c:126
+msgid "Black"
 msgstr ""
 
-#: src/commands.c:424
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 #, fuzzy
-msgid "glabels"
-msgstr "�簽"
+msgid "Custom Color"
+msgstr "é¡?è?²:"
 
-#: src/file.c:100
-msgid "New Label or Card"
-msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
+#: ../src/color-combo-menu.c:319
+#, fuzzy, c-format
+msgid "Custom Color #%u"
+msgstr "é¡?è?²:"
 
-#: src/file.c:132 src/file.c:304
-msgid "Media Type"
-msgstr "��種�"
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr ""
 
-#: src/file.c:138 src/file.c:310
-msgid "Label orientation"
-msgstr "æ¨?ç°½æ?¹å??"
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
 
-#: src/file.c:269
+#: ../src/file.c:175 ../src/label.c:584 ../src/label.c:628
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy, c-format
 msgid "Could not open file \"%s\""
 msgstr "é??å??æª?æ¡?失æ??"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not save file \"%s\""
 msgstr "������"
 
-#: 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
 #, fuzzy, c-format
 msgid "Save \"%s\" as"
 msgstr "���簽�..."
 
-#: src/file.c:935 src/file.c:1131
+#: ../src/file.c:623
 #, fuzzy
 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 ""
 
-#: 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 ""
 
-#: 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/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/font-combo-menu.c:137
+msgid "Recent fonts"
+msgstr ""
 
-#: src/prefs-dialog.c:248 data/glade/prefs-dialog.glade.h:22
-#, fuzzy
-msgid "gLabels Preferences"
-msgstr "Glabels: 設��"
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
 
-#.
-#. * Submenu: Order
-#.
-#: src/view.c:3570 data/ui/glabels-ui.xml.h:157
-msgid "_Order"
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
 msgstr ""
 
-#.
-#. * Submenu: Rotate/Flip
-#.
-#: src/view.c:3591 data/ui/glabels-ui.xml.h:163
-#, fuzzy
-msgid "_Rotate/Flip"
-msgstr "æ??è½?"
+#: ../src/font-combo-menu.c:168
+msgid "All fonts"
+msgstr ""
 
 #.
-#. * Submenu: Align Horizontally
+#. * 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:3624
-msgid "Align _Horizontally"
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
 msgstr ""
 
-#.
-#. * Submenu: Align Vertically
-#.
-#: src/view.c:3663
-msgid "Align _Vertically"
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
 msgstr ""
 
-#: src/view.c:3724 data/ui/glabels-ui.xml.h:140
-#, fuzzy
-msgid "_Delete"
-msgstr "��"
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
 
-#. Build editor.
-#: src/view-box.c:223
-#, fuzzy
-msgid "Box object properties"
-msgstr "修����件設�"
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
 
-#. Build editor.
-#: src/view-ellipse.c:223
+#: ../src/font-combo-menu-item.c:157
 #, fuzzy
-msgid "Ellipse object properties"
-msgstr "ä¿®æ?¹æ©¢å??ç?©ä»¶è¨­å®?"
+msgid "Sample text"
+msgstr "樣æ?¬è³?æ??"
 
-#. Build editor.
-#: src/view-line.c:223
+#: ../src/glabels-batch.c:52
 #, fuzzy
-msgid "Line object properties"
-msgstr "修����件設�"
+msgid "set output filename (default=\"output.pdf\")"
+msgstr "設å®?輸å?ºæª?å??稱 (é ?設ç?º\"output.ps\")"
 
-#. Build editor.
-#: src/view-image.c:222
-#, fuzzy
-msgid "Image object properties"
-msgstr "ä¿®æ?¹å??å??ç?©ä»¶è¨­å®?"
+#: ../src/glabels-batch.c:52 ../src/glabels-batch.c:66
+msgid "filename"
+msgstr "æª?æ¡?å??稱"
 
-#. Build editor.
-#: src/view-text.c:250
-#, fuzzy
-msgid "Text object properties"
-msgstr "修����件設�"
+#: ../src/glabels-batch.c:54
+msgid "number of sheets (default=1)"
+msgstr "�張�� (�設� 1)"
 
-#: src/view-text.c:562 data/glade/object-editor.glade.h:28
-msgid "Text"
-msgstr "æ??å­?"
+#: ../src/glabels-batch.c:54
+msgid "sheets"
+msgstr "ç´?å¼µ"
 
-#. Build editor.
-#: src/view-barcode.c:209
-#, fuzzy
-msgid "Barcode object properties"
-msgstr "修��碼��件設�"
+#: ../src/glabels-batch.c:56
+msgid "number of copies (default=1)"
+msgstr "份� (�設� 1)"
 
-#: src/view-barcode.c:579 src/print.c:1088
-#, fuzzy
-msgid "Invalid barcode data"
-msgstr "ä¸?正確ç??æ?¸ç¢¼æ¢?"
+#: ../src/glabels-batch.c:56
+msgid "copies"
+msgstr "份�"
 
-#: src/merge-properties-dialog.c:231
+#: ../src/glabels-batch.c:58
 #, fuzzy
-msgid "Merge Properties"
-msgstr "å??併設å®?"
+msgid "first label on first sheet (default=1)"
+msgstr "�張�� (�設� 1)"
 
-#. ---- Source section ----
-#: src/merge-properties-dialog.c:237
-msgid "Source"
-msgstr "���"
+#: ../src/glabels-batch.c:58
+msgid "first"
+msgstr ""
 
-#: src/merge-properties-dialog.c:245
-msgid "Format:"
-msgstr "格�:"
+#: ../src/glabels-batch.c:60 ../data/ui/print-op-dialog-custom-widget.ui.h:13
+msgid "print outlines (to test printer alignment)"
+msgstr "å?°å?ºå¤?é?? (測試æ??å?°æ©?å??æ?¸)"
 
-#. Location line
-#: src/merge-properties-dialog.c:273
-msgid "Location:"
-msgstr "ä½?ç½®:"
+#: ../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 "å??æ?¹å??å??å?° (å¦?å??å??å½±å??)"
 
-#: src/merge-properties-dialog.c:282 src/merge-properties-dialog.c:393
-msgid "Select merge-database source"
-msgstr "é?¸æ??å??ä½µè³?æ??庫ä¾?æº?"
+#: ../src/glabels-batch.c:64 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+msgid "print crop marks"
+msgstr ""
 
-#: src/merge-properties-dialog.c:289 src/merge-properties-dialog.c:404
-msgid "N/A"
-msgstr "N/A"
+#: ../src/glabels-batch.c:66
+msgid "input file for merging"
+msgstr ""
 
-#. ---- Sample Fields section ----
-#: src/merge-properties-dialog.c:300
-msgid "Record selection/preview:"
+#: ../src/glabels-batch.c:68 ../src/glabels.c:64
+msgid "[FILE...]"
 msgstr ""
 
-#: src/merge-properties-dialog.c:326
-msgid "Select"
-msgstr "é?¸æ??"
+#: ../src/glabels-batch.c:98
+msgid "Print files created with gLabels."
+msgstr ""
 
-#: src/merge-properties-dialog.c:334
-msgid "Record/Field"
+#: ../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 ""
 
-#: src/merge-properties-dialog.c:342 data/glade/object-editor.glade.h:9
-msgid "Data"
-msgstr "è³?æ??"
+#: ../src/glabels-batch.c:149
+#, fuzzy, c-format
+msgid "cannot perform document merge with glabels file %s\n"
+msgstr "é??å??æª?æ¡?失æ?? %s\n"
 
-#: src/print-dialog.c:266 data/ui/glabels-ui.xml.h:82
-msgid "Print"
-msgstr "å??å?°"
+#: ../src/glabels-batch.c:184
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "é??å??æª?æ¡?失æ?? %s\n"
 
-#: src/print-dialog.c:281
-msgid "_Job"
+#: ../src/glabels.c:81
+msgid "Launch gLabels label and business card designer."
 msgstr ""
 
-#: src/print-dialog.c:286
-#, fuzzy
-msgid "P_rinter"
-msgstr "å??å?°"
+#: ../src/label-barcode.c:154 ../src/ui.c:319
+msgid "Create barcode object"
+msgstr "建��碼�"
 
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:314
-msgid "Copies"
-msgstr "份�"
+#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+msgid "Barcode data"
+msgstr "æ?¸ç¢¼æ¢?è³?æ??"
 
-#. ------- Add merge control widget ------------
-#: src/print-dialog.c:322
-msgid "Document merge control"
-msgstr "æ??件å??ä½µæ?§å?¶"
+#: ../src/label-barcode.c:263
+#, fuzzy
+msgid "Barcode property"
+msgstr "修��碼��件設�"
 
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:330
-msgid "Options"
-msgstr "設�"
+#: ../src/label-barcode.c:483
+#, fuzzy
+msgid "Barcode data empty"
+msgstr "æ?¸ç¢¼æ¢?è³?æ??"
 
-#: src/print-dialog.c:351
-msgid "print crop marks"
-msgstr ""
+#: ../src/label-barcode.c:487
+#, fuzzy
+msgid "Invalid barcode data"
+msgstr "ä¸?正確ç??æ?¸ç¢¼æ¢?"
 
-#: src/print-dialog.c:553 src/print-dialog.c:592
-msgid "Print preview"
-msgstr "é ?覽å??å?°"
+#: ../src/label-box.c:156
+#, fuzzy
+msgid "Create box object"
+msgstr "建ç«?æ?°ç??æ??å­?ç?©ä»¶"
 
-#: src/template-designer.c:409 data/glade/template-designer.glade.h:73
-msgid "gLabels Template Designer"
+#: ../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/bc.c:60
-msgid "POSTNET (any)"
+#: ../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/bc.c:63
-msgid "POSTNET-5 (ZIP only)"
+#: ../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:66
-msgid "POSTNET-9 (ZIP+4)"
+#: ../src/label.c:399
+msgid "Untitled"
 msgstr ""
 
-#: src/bc.c:69
-msgid "POSTNET-11 (DPBC)"
-msgstr ""
+#: ../src/label.c:702 ../src/ui.c:422
+#, fuzzy
+msgid "Merge properties"
+msgstr "å??併設å®?"
 
-#: src/bc.c:72
-msgid "EAN (any)"
-msgstr ""
+#: ../src/label.c:1184 ../src/ui.c:215
+msgid "Delete"
+msgstr "��"
 
-#: src/bc.c:75
-msgid "EAN-8"
-msgstr ""
+#: ../src/label.c:1217 ../src/ui.c:324
+#, fuzzy
+msgid "Bring to front"
+msgstr "帶å?ºå?°å??é?¢"
 
-#: src/bc.c:78
-msgid "EAN-8 +2"
-msgstr ""
+#: ../src/label.c:1253 ../src/ui.c:331
+#, fuzzy
+msgid "Send to back"
+msgstr "æ?¾å?¨æ??åº?"
 
-#: src/bc.c:81
-msgid "EAN-8 +5"
-msgstr ""
+#: ../src/label.c:1294
+msgid "Rotate"
+msgstr "æ??è½?"
 
-#: src/bc.c:84
-msgid "EAN-13"
-msgstr ""
+#: ../src/label.c:1329 ../src/ui.c:338
+#, fuzzy
+msgid "Rotate left"
+msgstr "æ??è½?"
 
-#: src/bc.c:87
-msgid "EAN-13 +2"
-msgstr ""
+#: ../src/label.c:1362 ../src/ui.c:345
+#, fuzzy
+msgid "Rotate right"
+msgstr "æ??è½?"
 
-#: src/bc.c:90
-msgid "EAN-13 +5"
+#: ../src/label.c:1397 ../src/ui.c:352
+msgid "Flip horizontally"
 msgstr ""
 
-#: src/bc.c:93
-msgid "UPC (UPC-A or UPC-E)"
+#: ../src/label.c:1432 ../src/ui.c:359
+msgid "Flip vertically"
 msgstr ""
 
-#: src/bc.c:96
-msgid "UPC-A"
-msgstr ""
+#: ../src/label.c:1472 ../src/ui.c:366
+#, fuzzy
+msgid "Align left"
+msgstr "å°?ç½®:"
 
-#: src/bc.c:99
-msgid "UPC-A +2"
+#: ../src/label.c:1529 ../src/ui.c:373
+msgid "Align right"
 msgstr ""
 
-#: src/bc.c:102
-msgid "UPC-A +5"
+#: ../src/label.c:1590 ../src/ui.c:380
+msgid "Align horizontal center"
 msgstr ""
 
-#: src/bc.c:105
-msgid "UPC-E"
-msgstr ""
+#: ../src/label.c:1666 ../src/ui.c:387
+#, fuzzy
+msgid "Align tops"
+msgstr "å°?ç½®:"
 
-#: src/bc.c:108
-msgid "UPC-E +2"
+#: ../src/label.c:1723 ../src/ui.c:394
+msgid "Align bottoms"
 msgstr ""
 
-#: src/bc.c:111
-msgid "UPC-E +5"
+#: ../src/label.c:1784 ../src/ui.c:401
+msgid "Align vertical center"
 msgstr ""
 
-#: src/bc.c:114
-msgid "ISBN"
+#: ../src/label.c:1862 ../src/ui.c:408
+msgid "Center horizontally"
 msgstr ""
 
-#: src/bc.c:117
-msgid "ISBN +5"
-msgstr ""
+#: ../src/label.c:1909 ../src/ui.c:415
+#, fuzzy
+msgid "Center vertically"
+msgstr "��"
 
-#: src/bc.c:120
-msgid "Code 39"
+#: ../src/label.c:2595 ../src/label.c:2637 ../src/label.c:2663 ../src/ui.c:208
+msgid "Paste"
 msgstr ""
 
-#: src/bc.c:123
-msgid "Code 128"
-msgstr ""
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "���件"
 
-#: src/bc.c:126
-msgid "Code 128C"
-msgstr ""
+#: ../src/label-image.c:161 ../src/ui.c:312
+msgid "Create image object"
+msgstr "建ç«?å½±å??ç?©ä»¶"
 
-#: src/bc.c:129
-msgid "Code 128B"
+#: ../src/label-image.c:265 ../src/label-image.c:336
+#, 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/bc.c:132
-msgid "Interleaved 2 of 5"
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "�張大�:"
+
+#: ../src/label-object.c:1185
+msgid "Shadow state"
 msgstr ""
 
-#: src/bc.c:135
-msgid "Codabar"
+#: ../src/label-object.c:1228
+msgid "Shadow offset"
 msgstr ""
 
-#: src/bc.c:138
-msgid "MSI"
+#: ../src/label-object.c:1276
+msgid "Shadow color"
 msgstr ""
 
-#: src/bc.c:141
-msgid "Plessey"
+#: ../src/label-object.c:1319
+msgid "Shadow opacity"
 msgstr ""
 
-#: src/label.c:569
-msgid "Untitled"
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "建ç«?æ?°ç??æ??å­?ç?©ä»¶"
+
+#: ../src/label-text.c:451
+msgid "Typing"
 msgstr ""
 
-#: src/xml-label.c:176 src/xml-label.c:213
-msgid "xmlParseFile error"
-msgstr "xmlParseFile �誤"
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#, fuzzy
+msgid "Font family"
+msgstr "����"
 
-#: src/xml-label.c:250
-msgid "No document root"
-msgstr "æ²?æ??æ??件å§?端"
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+#, fuzzy
+msgid "Font size"
+msgstr "����"
 
-#: src/xml-label.c:264
-msgid "Importing from glabels 0.1 format"
+#: ../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/xml-label.c:272
-msgid "Importing from glabels 0.4 format"
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "å°?ç½®:"
+
+#: ../src/label-text.c:754
+msgid "Line spacing"
 msgstr ""
 
-#: src/xml-label.c:279
-msgid "Importing from glabels 1.91 format"
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
 msgstr ""
 
-#: src/xml-label.c:282
-#, fuzzy
-msgid "bad document, unknown glabels Namespace"
-msgstr "ä¸?正確ç??æ??件種é¡?, æ?¾ä¸?å?° glabels æ ¼å¼?"
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+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 "é?¯èª¤ç??å?ºç¢¼ = \"%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:348 src/xml-label-191.c:165
-#, fuzzy, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "é?¯èª¤ç??å?ºç¢¼ = \"%s\""
+#: ../src/media-select.c:358 ../src/media-select.c:871
+msgctxt "Page size"
+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\""
-msgstr "é?¯èª¤ç??ç¯?é»? = \"%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:796 src/xml-label-191.c:605
-#, fuzzy, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "é?¯èª¤ç??ç¯?é»? = \"%s\""
+#: ../src/media-select.c:968
+#, fuzzy
+msgid "No recent templates found."
+msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
 
-#: src/xml-label.c:962 libglabels/xml-template.c:528
-msgid "Utf8 conversion error."
+#: ../src/media-select.c:970
+msgid "Try selecting a template in the \"Search all\" tab."
 msgstr ""
 
-#: src/xml-label.c:969 libglabels/xml-template.c:535
-msgid "Problem saving xml file."
-msgstr "å?²å­? XML æª?æ¡?æ??ç?¼ç??é?¯èª¤."
+#. 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 ""
 
-#. 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/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
 msgstr ""
 
-#: src/xml-label-191.c:690 libglabels/xml-template.c:202
-#, c-format
-msgid "Unknown page size id or name \"%s\""
+#: ../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 ""
 
-#: 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 "æ²?æ??"
 
-#: src/merge-init.c:53
-#, fuzzy
-msgid "Text file with comma delimeters (CSV)"
-msgstr "以é??è??å??æ ¼ (CSV)"
-
-#: src/merge-init.c:60
-#, fuzzy
-msgid "Text file with colon delimeters"
-msgstr "以å??è??å??æ ¼"
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr ""
 
-#: src/merge-init.c:67
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
 #, fuzzy
-msgid "Text file with tab delimeters"
-msgstr "以 [TAB] ç?ºå??æ ¼"
+msgid "Couldn't open addressbook."
+msgstr "é??å??æª?æ¡?失æ??"
 
-#: src/wdgt-image-select.c:201 data/glade/object-editor.glade.h:11
+#: ../src/merge-evolution.c:348
 #, fuzzy
-msgid "File:"
-msgstr "填滿"
-
-#: src/wdgt-image-select.c:245 data/glade/object-editor.glade.h:16
-msgid "Key:"
-msgstr "è³?æ??å?¼:"
-
-#: src/wdgt-print-copies.c:179
-msgid "Sheets:"
-msgstr "ç´?å¼µ:"
+msgid "Couldn't list available fields."
+msgstr "������"
 
-#: src/wdgt-print-copies.c:197
-msgid "Labels"
-msgstr "�簽"
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr ""
 
-#: src/wdgt-print-copies.c:200
-msgid "from:"
-msgstr "ç?±:"
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
 
-#: src/wdgt-print-copies.c:207
-msgid "to:"
-msgstr "å?°:"
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:178
-msgid "Start on label"
-msgstr "ç?±ç¦?ç°½é??ç´?"
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
 
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "��張�"
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
 
-#: src/wdgt-print-merge.c:195
-msgid "Copies:"
-msgstr "份�:"
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
 
-#: src/wdgt-print-merge.c:201
-msgid "Collate"
-msgstr "æ ¡å°?"
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
 
-#: src/wdgt-media-select.c:269 data/glade/template-designer.glade.h:29
-msgid "Description:"
-msgstr "æ??è¿°:"
+#: ../src/merge-init.c:104
+msgid "Evolution Addressbook"
+msgstr ""
 
-#: src/wdgt-media-select.c:279 data/glade/template-designer.glade.h:53
-msgid "Page size:"
-msgstr "�張大�:"
+#: ../src/merge-init.c:110
+msgid "VCards"
+msgstr ""
 
-#: src/wdgt-media-select.c:290
-msgid "Label size:"
-msgstr "�簽大�:"
+#: ../src/merge-properties-dialog.c:282
+#, fuzzy
+msgid "Merge Properties"
+msgstr "å??併設å®?"
 
-#: src/wdgt-media-select.c:301
-msgid "Layout:"
-msgstr "ç??é?¢:"
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "é?¸æ??å??ä½µè³?æ??庫ä¾?æº?"
 
-#: 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:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "N/A"
 
-#: src/wdgt-media-select.c:582
-#, fuzzy, c-format
-msgid "%d per sheet"
-msgstr "%d x %d (�� %d)"
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "é?¸æ??"
 
-#: src/wdgt-media-select.c:614
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr ""
 
-#: src/wdgt-media-select.c:619
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:9
+msgid "Data"
+msgstr "è³?æ??"
 
-#: src/wdgt-media-select.c:630 src/wdgt-media-select.c:644
-#, c-format
-msgid "%s %s diameter"
-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 "Fixed"
+msgstr "��"
 
-#: src/wdgt-media-select.c:634 src/wdgt-media-select.c:648
-#, c-format
-msgid "%.5g %s diameter"
+#. Translators: "Up" refers to the direction towards the top of a label.
+#: ../src/mini-preview.c:1074
+msgid "Up"
 msgstr ""
 
-#: src/wdgt-rotate-label.c:193
-msgid "Rotate"
-msgstr "æ??è½?"
-
-#. This is the default custom color
-#: src/mygal/color-palette.c:396
+#: ../src/new-label-dialog.c:203
 #, fuzzy
-msgid "custom"
-msgstr "�����"
+msgid "Select Product"
+msgstr "é?¸æ??"
 
-#. "Custom" color - we'll pop up a GnomeColorPicker
-#: src/mygal/color-palette.c:438
+#: ../src/new-label-dialog.c:215
 #, fuzzy
-msgid "Custom Color:"
-msgstr "é¡?è?²:"
+msgid "Choose Orientation"
+msgstr "æ¨?ç°½æ?¹å??"
 
-#: src/mygal/color-palette.c:446
-msgid "Choose Custom Color"
+#: ../src/new-label-dialog.c:229
+msgid "Review"
 msgstr ""
 
-#: src/mygal/color-palette.c:579
-msgid "black"
-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 "��"
 
-#: src/mygal/color-palette.c:580
-msgid "light brown"
-msgstr ""
+#: ../src/object-editor.c:159 ../src/object-editor.c:460
+#, fuzzy
+msgid "Object properties"
+msgstr "æ??å­?樣è²?"
 
-#: src/mygal/color-palette.c:581
-msgid "brown gold"
-msgstr ""
+#: ../src/object-editor.c:309
+#, fuzzy
+msgid "Box object properties"
+msgstr "修����件設�"
 
-#: src/mygal/color-palette.c:582
-msgid "dark green #2"
-msgstr ""
+#: ../src/object-editor.c:328
+#, fuzzy
+msgid "Ellipse object properties"
+msgstr "ä¿®æ?¹æ©¢å??ç?©ä»¶è¨­å®?"
 
-#: src/mygal/color-palette.c:583
-msgid "navy"
-msgstr ""
+#: ../src/object-editor.c:347
+#, fuzzy
+msgid "Line object properties"
+msgstr "修����件設�"
 
-#: src/mygal/color-palette.c:584 src/mygal/color-palette.c:640
-msgid "dark blue"
-msgstr ""
+#: ../src/object-editor.c:364
+#, fuzzy
+msgid "Image object properties"
+msgstr "ä¿®æ?¹å??å??ç?©ä»¶è¨­å®?"
 
-#: src/mygal/color-palette.c:585
-msgid "purple #2"
-msgstr ""
+#: ../src/object-editor.c:381
+#, fuzzy
+msgid "Text object properties"
+msgstr "修����件設�"
 
-#: src/mygal/color-palette.c:586
-msgid "very dark gray"
-msgstr ""
+#: ../src/object-editor.c:403
+#, fuzzy
+msgid "Barcode object properties"
+msgstr "修��碼��件設�"
 
-#: src/mygal/color-palette.c:589 src/mygal/color-palette.c:645
-msgid "dark red"
-msgstr ""
+#: ../src/object-editor-edit-page.c:76
+msgid "Insert merge field"
+msgstr "æ??å?¥å??ä½µå??"
 
-#: src/mygal/color-palette.c:590
-msgid "red-orange"
-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:591
-msgid "gold"
+#: ../src/object-editor-image-page.c:278
+msgid "All Files"
 msgstr ""
 
-#: src/mygal/color-palette.c:592
-msgid "dark green"
-msgstr ""
+#: ../src/object-editor-image-page.c:283
+#, fuzzy
+msgid "All Images"
+msgstr "å??å??"
 
-#: src/mygal/color-palette.c:593 src/mygal/color-palette.c:646
-msgid "dull blue"
+#: ../src/object-editor-image-page.c:298
+#, c-format
+msgid "%s (*.%s)"
 msgstr ""
 
-#: src/mygal/color-palette.c:594 src/mygal/color-palette.c:647
-msgid "blue"
-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:595
-msgid "dull purple"
-msgstr ""
+#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+#, fuzzy
+msgid "gLabels Preferences"
+msgstr "Glabels: 設��"
 
-#: src/mygal/color-palette.c:596
-msgid "dark grey"
-msgstr ""
+#. ===================================================================
+#: ../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 "�簽"
 
-#: src/mygal/color-palette.c:599
-msgid "red"
-msgstr ""
+#: ../src/stock.c:70
+#, fuzzy
+msgid "_Select Mode"
+msgstr "é?¸æ??"
 
-#: src/mygal/color-palette.c:600
-msgid "orange"
-msgstr ""
+#: ../src/stock.c:71
+#, fuzzy
+msgid "_Text"
+msgstr "æ??å­?"
 
-#: src/mygal/color-palette.c:601
-msgid "lime"
-msgstr ""
+#: ../src/stock.c:72
+#, fuzzy
+msgid "_Line"
+msgstr "ç·?"
 
-#: src/mygal/color-palette.c:602
-msgid "dull green"
-msgstr ""
+#: ../src/stock.c:73
+#, fuzzy
+msgid "_Box"
+msgstr "ç??å­?"
 
-#: src/mygal/color-palette.c:603
-msgid "dull blue #2"
-msgstr ""
+#: ../src/stock.c:74
+#, fuzzy
+msgid "_Ellipse"
+msgstr "æ©¢å??å½¢"
 
-#: src/mygal/color-palette.c:604
-msgid "sky blue #2"
-msgstr ""
+#: ../src/stock.c:75
+#, fuzzy
+msgid "_Image"
+msgstr "å??å??"
 
-#: src/mygal/color-palette.c:605 src/mygal/color-palette.c:644
-msgid "purple"
-msgstr ""
+#: ../src/stock.c:76
+#, fuzzy
+msgid "Bar_code"
+msgstr "�碼�"
 
-#: src/mygal/color-palette.c:606
-msgid "gray"
-msgstr ""
+#: ../src/stock.c:77
+#, fuzzy
+msgid "_Merge Properties"
+msgstr "å??併設å®?"
 
-#: src/mygal/color-palette.c:609 src/mygal/color-palette.c:641
+#: ../src/stock.c:78
 #, fuzzy
-msgid "magenta"
-msgstr "å??å??"
+msgid "Object _Properties"
+msgstr "æ??å­?樣è²?"
 
-#: src/mygal/color-palette.c:610
-msgid "bright orange"
-msgstr ""
+#: ../src/stock.c:79
+#, fuzzy
+msgid "Bring to _Front"
+msgstr "帶å?ºå?°å??é?¢"
 
-#: src/mygal/color-palette.c:611 src/mygal/color-palette.c:642
-msgid "yellow"
-msgstr ""
+#: ../src/stock.c:80
+#, fuzzy
+msgid "Send to _Back"
+msgstr "æ?¾å?¨æ??åº?"
 
-#: src/mygal/color-palette.c:612
+#: ../src/stock.c:81
 #, fuzzy
-msgid "green"
-msgstr "度�"
+msgid "Rotate _Left"
+msgstr "æ??è½?"
 
-#: src/mygal/color-palette.c:613 src/mygal/color-palette.c:643
-msgid "cyan"
-msgstr ""
+#: ../src/stock.c:82
+#, fuzzy
+msgid "Rotate _Right"
+msgstr "æ??è½?"
 
-#: src/mygal/color-palette.c:614
-msgid "bright blue"
+#: ../src/stock.c:83
+msgid "Flip _Horizontally"
 msgstr ""
 
-#: src/mygal/color-palette.c:615 src/mygal/color-palette.c:632
-msgid "red purple"
+#: ../src/stock.c:84
+msgid "Flip _Vertically"
 msgstr ""
 
-#: src/mygal/color-palette.c:616
-msgid "light grey"
+#: ../src/stock.c:85
+msgid "_Lefts"
 msgstr ""
 
-#: src/mygal/color-palette.c:619 src/mygal/color-palette.c:636
-msgid "pink"
+#: ../src/stock.c:86
+msgid "_Rights"
 msgstr ""
 
-#: src/mygal/color-palette.c:620
-msgid "light orange"
+#: ../src/stock.c:87
+msgid "_Centers"
 msgstr ""
 
-#: src/mygal/color-palette.c:621 src/mygal/color-palette.c:633
-msgid "light yellow"
-msgstr ""
+#: ../src/stock.c:88
+#, fuzzy
+msgid "_Tops"
+msgstr "工� (&_T)"
 
-#: src/mygal/color-palette.c:622
-msgid "light green"
+#: ../src/stock.c:89
+msgid "Bottoms"
 msgstr ""
 
-#: src/mygal/color-palette.c:623
-msgid "light cyan"
+#: ../src/stock.c:90
+msgid "Centers"
 msgstr ""
 
-#: src/mygal/color-palette.c:624 src/mygal/color-palette.c:634
-msgid "light blue"
+#: ../src/stock.c:91 ../src/stock.c:92
+msgid "Label Ce_nter"
 msgstr ""
 
-#: src/mygal/color-palette.c:625 src/mygal/color-palette.c:638
-msgid "light purple"
-msgstr ""
+#: ../src/stock.c:95 ../src/stock.c:97
+#, fuzzy
+msgid "Linked"
+msgstr "ç·?"
 
-#: src/mygal/color-palette.c:626
-msgid "white"
-msgstr ""
+#: ../src/stock.c:96 ../src/stock.c:98
+#, fuzzy
+msgid "Not Linked"
+msgstr "æ²?æ??"
 
-#: src/mygal/color-palette.c:631
-msgid "purplish blue"
+#: ../src/template-designer.c:404
+msgid "New gLabels Template"
 msgstr ""
 
-#: src/mygal/color-palette.c:635
-msgid "dark purple"
+#: ../src/template-designer.c:461
+msgid "Welcome"
 msgstr ""
 
-#: src/mygal/color-palette.c:637
-msgid "sky blue"
-msgstr ""
+#: ../src/template-designer.c:500
+#, fuzzy
+msgid "Name and Description"
+msgstr "æ??è¿°:"
 
-#: libglabels/template.c:848
-#, c-format
-msgid "Generic %s full page"
-msgstr ""
+#: ../src/template-designer.c:548
+#, fuzzy
+msgid "Page Size"
+msgstr "�張大�:"
 
-#: libglabels/template.c:897
-msgid "No template files found!"
-msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
+#: ../src/template-designer.c:614
+#, fuzzy
+msgid "Label or Card Shape"
+msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
 
-#. Create and append an "Other" entry.
-#: libglabels/paper.c:67
-msgid "Other"
-msgstr ""
+#: ../src/template-designer.c:661
+#, fuzzy
+msgid "Label or Card Size"
+msgstr "æ?°å¢?æ¨?ç°½æ??å?¡"
 
-#: libglabels/paper.c:361
+#: ../src/template-designer.c:760
 #, fuzzy
-msgid "No paper files found!"
-msgstr "æ?¾ä¸?å?°æ¨£ç??æª?æ¡? !"
+msgid "Label Size (round)"
+msgstr "�簽大�:"
 
-#: data/ui/glabels-ui.xml.h:1
-msgid "About glabels"
+#: ../src/template-designer.c:841
+msgid "Label Size (CD/DVD)"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:2
-msgid "About..."
+#: ../src/template-designer.c:932
+msgid "Number of Layouts"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:3
-msgid "Align _Horizontal"
-msgstr ""
+#: ../src/template-designer.c:1000
+#, fuzzy
+msgid "Layout(s)"
+msgstr "ç??é?¢:"
 
-#: data/ui/glabels-ui.xml.h:4
-msgid "Align _Vertical"
+#: ../src/template-designer.c:1105
+msgid "Design Completed"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:5
-msgid "Align objects to bottoms"
+#: ../src/template-designer.c:1133
+msgid "Edit gLabels Template"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:6
-msgid "Align objects to horizontal centers"
+#: ../src/template-designer.c:1422
+msgid ""
+"<span foreground='red' weight='bold'>Brand and part# match an existing "
+"template!</span>"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:7
-msgid "Align objects to left edges"
+#. Menu entries.
+#: ../src/ui.c:93
+#, fuzzy
+msgid "_File"
+msgstr "填滿"
+
+#: ../src/ui.c:94
+#, fuzzy
+msgid "Open Recent _Files"
+msgstr "é??å??æª?æ¡?"
+
+#: ../src/ui.c:95
+msgid "_Edit"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:8
-msgid "Align objects to right edges"
+#: ../src/ui.c:96
+#, fuzzy
+msgid "_View"
+msgstr "�� (&_N)"
+
+#: ../src/ui.c:97
+msgid "Customize Main Toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:9
-msgid "Align objects to tops"
+#: ../src/ui.c:98
+msgid "Customize Drawing Toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:10
-msgid "Align objects to vertical centers"
+#: ../src/ui.c:99
+msgid "Customize Properties Toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:12
-msgid "Bold"
+#: ../src/ui.c:100
+msgid "_Objects"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:14
+#: ../src/ui.c:101
 #, fuzzy
-msgid "Center align"
-msgstr "��"
+msgid "_Create"
+msgstr "建ç«?æ?°ç??æ??å­?ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:15
-msgid "Center objects to horizontal label center"
+#: ../src/ui.c:102
+msgid "_Order"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:16
-msgid "Center objects to vertical label center"
-msgstr ""
+#: ../src/ui.c:103
+#, fuzzy
+msgid "_Rotate/Flip"
+msgstr "æ??è½?"
 
-#: data/ui/glabels-ui.xml.h:17
-msgid "Change the visibility of markup lines in the current window"
+#: ../src/ui.c:104
+msgid "Align _Horizontal"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:18
-msgid "Change the visibility of the drawing toolbar in the current window"
+#: ../src/ui.c:105
+msgid "Align _Vertical"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:19
-msgid "Change the visibility of the grid in the current window"
+#: ../src/ui.c:106
+msgid "_Help"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:20
-msgid "Change the visibility of the main toolbar in the current window"
+#. Popup entries.
+#: ../src/ui.c:109 ../src/ui.c:110
+msgid "Context Menu"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:21
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr ""
+#: ../src/ui.c:115
+msgid "_New"
+msgstr "�� (&_N)"
 
-#: data/ui/glabels-ui.xml.h:22
-msgid "Close"
-msgstr ""
+#: ../src/ui.c:117
+#, fuzzy
+msgid "Create a new file"
+msgstr "���件"
 
-#: data/ui/glabels-ui.xml.h:23
+#: ../src/ui.c:122
 #, fuzzy
-msgid "Close the current file"
-msgstr "������"
+msgid "_Open..."
+msgstr "é??å??"
 
-#: data/ui/glabels-ui.xml.h:24
-msgid "Configure the application"
-msgstr ""
+#: ../src/ui.c:124
+msgid "Open a file"
+msgstr "é??å??æª?æ¡?"
 
-#: data/ui/glabels-ui.xml.h:25
-msgid "Contents"
-msgstr ""
+#: ../src/ui.c:129
+#, fuzzy
+msgid "_Save"
+msgstr "���..."
 
-#: data/ui/glabels-ui.xml.h:26
-msgid "Copy"
-msgstr ""
+#: ../src/ui.c:131
+#, fuzzy
+msgid "Save current file"
+msgstr "������"
 
-#: data/ui/glabels-ui.xml.h:27
+#: ../src/ui.c:136
 #, fuzzy
-msgid "Copy the selection"
-msgstr "移é?¤æ??æ??é?¸æ??é ?"
+msgid "Save _As..."
+msgstr "���..."
 
-#: data/ui/glabels-ui.xml.h:28
+#: ../src/ui.c:138
 #, fuzzy
-msgid "Create a custom template"
-msgstr "���件"
+msgid "Save the current file to a different name"
+msgstr "������"
 
-#: data/ui/glabels-ui.xml.h:29
+#: ../src/ui.c:143
 #, fuzzy
-msgid "Create a new document"
-msgstr "���件"
+msgid "_Print..."
+msgstr "å??å?°"
 
-#: data/ui/glabels-ui.xml.h:30
-msgid "Create barcode object"
-msgstr "建��碼�"
+#: ../src/ui.c:145
+#, fuzzy
+msgid "Print the current file"
+msgstr "å??å?°ç?¾æ??æª?æ¡?"
 
-#: data/ui/glabels-ui.xml.h:31
-msgid "Create box/rectangle object"
-msgstr "建ç«?æ?°ç??ç??å­?/æ?¹å½¢ç?©ä»¶"
+#: ../src/ui.c:150
+#, fuzzy
+msgid "Properties..."
+msgstr "æ??å­?樣è²?"
 
-#: data/ui/glabels-ui.xml.h:32
-msgid "Create ellipse/circle object"
-msgstr "建ç«?æ©¢å??å½¢/å??å½¢ç?©ä»¶"
+#: ../src/ui.c:152
+#, fuzzy
+msgid "Modify document properties"
+msgstr "ä¿®æ?¹æ??件å??併設å®?"
 
-#: data/ui/glabels-ui.xml.h:33
-msgid "Create image object"
-msgstr "建ç«?å½±å??ç?©ä»¶"
+#: ../src/ui.c:157
+msgid "Template _Designer..."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:34
-msgid "Create line object"
+#: ../src/ui.c:159
+#, fuzzy
+msgid "Create a custom template"
 msgstr "���件"
 
-#: data/ui/glabels-ui.xml.h:35
-msgid "Create text object"
-msgstr "建ç«?æ?°ç??æ??å­?ç?©ä»¶"
-
-#: data/ui/glabels-ui.xml.h:36
-msgid "Cu_t"
+#: ../src/ui.c:164
+msgid "_Close"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:37
+#: ../src/ui.c:166
 #, fuzzy
-msgid "Customize"
-msgstr "�����"
+msgid "Close the current file"
+msgstr "������"
 
-#: data/ui/glabels-ui.xml.h:38
-msgid "Customize Drawing Toolbar"
+#: ../src/ui.c:171
+msgid "_Quit"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:39
-msgid "Customize Main Toolbar"
+#: ../src/ui.c:173
+msgid "Quit the program"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:40
-msgid "Customize Property Toolbar"
+#: ../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"
+#: ../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"
+#: ../src/ui.c:201
+msgid "Copy"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:45
-msgid "Delete"
-msgstr "��"
-
-#: data/ui/glabels-ui.xml.h:46
+#: ../src/ui.c:203
 #, fuzzy
-msgid "Delete the selected objects"
-msgstr "建ç«?æ?°ç??æ??å­?ç?©ä»¶"
-
-#: data/ui/glabels-ui.xml.h:47
-msgid "Drawing toolbar"
-msgstr ""
-
-#: data/ui/glabels-ui.xml.h:48
-msgid "Dump XML"
-msgstr ""
-
-#: 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 "ä¿®æ?¹å??併設å®?"
+msgid "Copy the selection"
+msgstr "移é?¤æ??æ??é?¸æ??é ?"
 
-#: data/ui/glabels-ui.xml.h:54
-msgid "Flip object horizontally"
+#: ../src/ui.c:210
+msgid "Paste the clipboard"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:55
-msgid "Flip object vertically"
-msgstr ""
+#: ../src/ui.c:217
+#, fuzzy
+msgid "Delete the selected objects"
+msgstr "建ç«?æ?°ç??æ??å­?ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:56
+#: ../src/ui.c:222
 #, fuzzy
-msgid "Font name"
-msgstr "����"
+msgid "Select All"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/ui/glabels-ui.xml.h:57
+#: ../src/ui.c:224
 #, fuzzy
-msgid "Font selector"
-msgstr "移é?¤æ??æ??é?¸æ??é ?"
+msgid "Select all objects"
+msgstr "é?¸æ??, 移å??å??ä¿®æ?¹ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:58
+#: ../src/ui.c:229
 #, fuzzy
-msgid "Font size"
-msgstr "����"
+msgid "Un-select All"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/ui/glabels-ui.xml.h:59
-msgid "Icon and _Text"
-msgstr ""
+#: ../src/ui.c:231
+msgid "Remove all selections"
+msgstr "移é?¤æ??æ??é?¸æ??é ?"
 
-#: data/ui/glabels-ui.xml.h:60
-msgid "Increase magnification"
-msgstr ""
+#: ../src/ui.c:236
+#, fuzzy
+msgid "Preferences"
+msgstr "Glabels: 設��"
 
-#: data/ui/glabels-ui.xml.h:61
-msgid "Italic"
+#: ../src/ui.c:238
+msgid "Configure the application"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:63
-msgid "Left align"
-msgstr ""
+#: ../src/ui.c:245
+#, fuzzy
+msgid "Zoom in"
+msgstr "�大"
 
-#: data/ui/glabels-ui.xml.h:65
-msgid "Line width"
+#: ../src/ui.c:247
+msgid "Increase magnification"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:66
-msgid "Lower object to bottom"
-msgstr ""
+#: ../src/ui.c:252
+#, fuzzy
+msgid "Zoom out"
+msgstr "縮�"
 
-#: data/ui/glabels-ui.xml.h:67
-msgid "M_arkup"
+#: ../src/ui.c:254
+msgid "Decrease magnification"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:68
-msgid "Main toolbar"
-msgstr ""
+#: ../src/ui.c:259
+#, fuzzy
+msgid "Zoom 1 to 1"
+msgstr "1:1 顯示"
 
-#: data/ui/glabels-ui.xml.h:69
-msgid "Markup"
+#: ../src/ui.c:261
+msgid "Restore scale to 100%"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:70
+#: ../src/ui.c:266
 #, fuzzy
-msgid "Modify document properties"
-msgstr "ä¿®æ?¹æ??件å??併設å®?"
+msgid "Zoom to fit"
+msgstr "1:1 顯示"
 
-#: data/ui/glabels-ui.xml.h:71
-#, fuzzy
-msgid "New"
-msgstr "�� (&_N)"
+#: ../src/ui.c:268
+msgid "Set scale to fit window"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:72
+#: ../src/ui.c:275
 #, fuzzy
-msgid "Object property editor"
-msgstr "æ??å­?樣è²?"
-
-#: data/ui/glabels-ui.xml.h:73
-msgid "Only show icons in the drawing toolbar"
-msgstr ""
+msgid "Select Mode"
+msgstr "é?¸æ??"
 
-#: data/ui/glabels-ui.xml.h:74
-msgid "Only show icons in the main toolbar"
-msgstr ""
+#: ../src/ui.c:277
+msgid "Select, move and modify objects"
+msgstr "é?¸æ??, 移å??å??ä¿®æ?¹ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:76
-msgid "Open a file"
-msgstr "é??å??æª?æ¡?"
+#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:29
+msgid "Text"
+msgstr "æ??å­?"
 
-#: data/ui/glabels-ui.xml.h:77
+#: ../src/ui.c:289
 #, fuzzy
-msgid "Open the glabels manual"
-msgstr "é??å??æ¨?ç°½"
+msgid "Box"
+msgstr "ç??å­?"
 
-#: data/ui/glabels-ui.xml.h:78
-msgid "Paste"
-msgstr ""
+#: ../src/ui.c:291
+msgid "Create box/rectangle object"
+msgstr "建ç«?æ?°ç??ç??å­?/æ?¹å½¢ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:79
-msgid "Paste the clipboard"
-msgstr ""
+#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:18
+msgid "Line"
+msgstr "ç·?"
 
-#: data/ui/glabels-ui.xml.h:80
+#: ../src/ui.c:303
 #, fuzzy
-msgid "Pr_eferences..."
-msgstr "Glabels: 設��"
+msgid "Ellipse"
+msgstr "æ©¢å??å½¢"
 
-#: data/ui/glabels-ui.xml.h:81
-#, fuzzy
-msgid "Preferences"
-msgstr "Glabels: 設��"
+#: ../src/ui.c:305
+msgid "Create ellipse/circle object"
+msgstr "建ç«?æ©¢å??å½¢/å??å½¢ç?©ä»¶"
 
-#: data/ui/glabels-ui.xml.h:83
-#, fuzzy
-msgid "Print the current file"
-msgstr "å??å?°ç?¾æ??æª?æ¡?"
+#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:15
+msgid "Image"
+msgstr "å??å??"
 
-#: data/ui/glabels-ui.xml.h:84
+#: ../src/ui.c:317
 #, fuzzy
-msgid "Proper_ties..."
-msgstr "æ??å­?樣è²?"
+msgid "Barcode"
+msgstr "�碼�"
 
-#: data/ui/glabels-ui.xml.h:85
-#, fuzzy
-msgid "Properties"
-msgstr "æ??å­?樣è²?"
+#: ../src/ui.c:326
+msgid "Raise object to top"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:86
-msgid "Property toolbar"
+#: ../src/ui.c:333
+msgid "Lower object to bottom"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:87
-msgid "Quit"
+#: ../src/ui.c:340
+msgid "Rotate object 90 degrees counter-clockwise"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:88
-msgid "Quit the program"
+#: ../src/ui.c:347
+msgid "Rotate object 90 degrees clockwise"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:89
-msgid "Raise object to top"
+#: ../src/ui.c:354
+msgid "Flip object horizontally"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:90
-msgid "Recent _Files"
+#: ../src/ui.c:361
+msgid "Flip object vertically"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:91
-msgid "Redo"
+#: ../src/ui.c:368
+msgid "Align objects to left edges"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:92
-msgid "Redo the undone action"
+#: ../src/ui.c:375
+msgid "Align objects to right edges"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:93
-msgid "Remove all selections"
-msgstr "移é?¤æ??æ??é?¸æ??é ?"
+#: ../src/ui.c:382
+msgid "Align objects to horizontal centers"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:95
-#, no-c-format
-msgid "Restore scale to 100%"
+#: ../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:96
-msgid "Right align"
+#: ../src/ui.c:403
+msgid "Align objects to vertical centers"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:99
-msgid "Rotate object 90 clockwise"
+#: ../src/ui.c:410
+msgid "Center objects to horizontal label center"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:100
-msgid "Rotate object 90 counter-clockwise"
+#: ../src/ui.c:417
+msgid "Center objects to vertical label center"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:101
-#, fuzzy
-msgid "Save"
-msgstr "���..."
+#: ../src/ui.c:424
+msgid "Edit merge properties"
+msgstr "ä¿®æ?¹å??併設å®?"
 
-#: data/ui/glabels-ui.xml.h:102
-msgid "Save As"
-msgstr "���..."
+#: ../src/ui.c:431
+msgid "Contents"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:103
+#: ../src/ui.c:433
 #, fuzzy
-msgid "Save _As..."
-msgstr "���..."
+msgid "Open glabels manual"
+msgstr "é??å??æ¨?ç°½"
 
-#: data/ui/glabels-ui.xml.h:104
-#, fuzzy
-msgid "Save the current file"
-msgstr "������"
+#: ../src/ui.c:438
+msgid "About..."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:105
-msgid "Save the current file with a different name"
+#: ../src/ui.c:440
+msgid "About glabels"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:106
-#, fuzzy
-msgid "Select All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+#: ../src/ui.c:450
+msgid "Property toolbar"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:107
-#, fuzzy
-msgid "Select _All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+#: ../src/ui.c:452
+msgid "Change the visibility of the property toolbar in the current window"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:108
-#, fuzzy
-msgid "Select all objects"
-msgstr "é?¸æ??, 移å??å??ä¿®æ?¹ç?©ä»¶"
+#: ../src/ui.c:458
+msgid "Grid"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:109
-msgid "Select, move and modify objects"
-msgstr "é?¸æ??, 移å??å??ä¿®æ?¹ç?©ä»¶"
+#: ../src/ui.c:460
+msgid "Change the visibility of the grid in the current window"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:111
-msgid "Set drawing toolbar button style according to desktop default"
+#: ../src/ui.c:466
+msgid "Markup"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:112
-msgid "Set main toolbar button style according to desktop default"
+#: ../src/ui.c:468
+msgid "Change the visibility of markup lines in the current window"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:113
-msgid "Show _Tooltips"
+#: ../src/ui.c:479
+msgid "Main toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:114
-msgid "Show both icons and texts in the drawing toolbar"
+#: ../src/ui.c:481
+msgid "Change the visibility of the main toolbar in the current window"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:115
-msgid "Show both icons and texts in the main toolbar"
+#: ../src/ui.c:487
+msgid "Drawing toolbar"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:116
-msgid "Show tooltips in the drawing toolbar"
+#: ../src/ui.c:489
+msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:117
-msgid "Show tooltips in the main toolbar"
+#: ../src/ui-commands.c:1135
+msgid "Glabels includes contributions from:"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:118
-msgid "Show tooltips in the property toolbar"
+#: ../src/ui-commands.c:1141
+msgid "See the file AUTHORS for additional credits,"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:119
-msgid "Template Designer"
+#: ../src/ui-commands.c:1142
+msgid "or visit http://glabels.org/";
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:120
-msgid "Template _Designer..."
+#: ../src/ui-commands.c:1154
+msgid "A label and business card creation program.\n"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:121
-msgid "Text color"
+#: ../src/ui-commands.c:1158
+msgid "translator-credits"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:122
+#: ../src/ui-commands.c:1161
 #, fuzzy
-msgid "U_n-select All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+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:123
+#: ../src/ui-commands.c:1190
 #, fuzzy
-msgid "Un-select All"
-msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
+msgid "glabels"
+msgstr "�簽"
 
-#: data/ui/glabels-ui.xml.h:124
-msgid "Undo"
+#: ../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:125
-msgid "Undo the last action"
+#: ../src/window.c:485
+msgid "(modified)"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:126
-#, fuzzy
-msgid "Zoom _1:1"
-msgstr "1:1 顯示"
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:323
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "é?¯èª¤ç??å?ºç¢¼ = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:127
-#, fuzzy
-msgid "Zoom _In"
-msgstr "�大"
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:406
+#, c-format
+msgid "bad node =  \"%s\""
+msgstr "é?¯èª¤ç??ç¯?é»? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:128
-#, fuzzy
-msgid "Zoom _Out"
-msgstr "縮�"
+#: ../src/xml-label.c:189 ../src/xml-label.c:227
+msgid "xmlParseFile error"
+msgstr "xmlParseFile �誤"
 
-#: data/ui/glabels-ui.xml.h:129
-#, fuzzy
-msgid "Zoom to _fit"
-msgstr "1:1 顯示"
+#: ../src/xml-label.c:264
+msgid "No document root"
+msgstr "æ²?æ??æ??件å§?端"
 
-#: data/ui/glabels-ui.xml.h:130
-msgid "Zoom to fit window"
+#: ../src/xml-label.c:272
+msgid "Importing from glabels 0.1 format"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:131
-msgid "_About..."
+#: ../src/xml-label.c:281
+msgid "Importing from glabels 0.4 format"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:132
-msgid "_Bottoms"
-msgstr ""
+#: ../src/xml-label.c:291
+#, fuzzy, c-format
+msgid "Unknown glabels Namespace -- Using %s"
+msgstr "ä¸?正確ç??æ??件種é¡?, æ?¾ä¸?å?° glabels æ ¼å¼?"
 
-#: data/ui/glabels-ui.xml.h:135
-msgid "_Close"
-msgstr ""
+#: ../src/xml-label.c:360
+#, fuzzy, c-format
+msgid "bad node in Document node =  \"%s\""
+msgstr "é?¯èª¤ç??å?ºç¢¼ = \"%s\""
+
+#: ../src/xml-label.c:856
+#, fuzzy, c-format
+msgid "bad node in Data node =  \"%s\""
+msgstr "é?¯èª¤ç??ç¯?é»? = \"%s\""
 
-#: data/ui/glabels-ui.xml.h:136
-msgid "_Contents"
+#: ../src/xml-label.c:1097 ../libglabels/xml-template.c:802
+msgid "Utf8 conversion error."
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:137
-msgid "_Copy"
+#: ../src/xml-label.c:1104
+msgid "Problem saving xml file."
+msgstr "å?²å­? XML æª?æ¡?æ??ç?¼ç??é?¯èª¤."
+
+#. 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:138
+#. Create and append a "User defined" entry.
+#: ../libglabels/db.c:279
 #, fuzzy
-msgid "_Create Object"
-msgstr "建ç«?æ?°ç??æ??å­?ç?©ä»¶"
+msgid "User defined"
+msgstr "æ??å?¥å??ä½µå??"
+
+#: ../libglabels/db.c:650
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:139
-msgid "_Debug"
+#: ../libglabels/db.c:1042
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:141
-msgid "_Desktop Default"
+#: ../libglabels/db.c:2061
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:142
-msgid "_Drawing Toolbar"
+#: ../libglabels/db.c:2128
+#, c-format
+msgid "%s full page label"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:143
-msgid "_Edit"
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:145
+#: ../libglabels/template.c:722 ../libglabels/template.c:726
 #, fuzzy
-msgid "_File"
-msgstr "填滿"
+msgid "per sheet"
+msgstr "%d x %d (�� %d)"
+
+#: ../libglabels/template.c:796 ../libglabels/template.c:802
+#: ../libglabels/template.c:812 ../libglabels/template.c:818
+#, fuzzy
+msgid "diameter"
+msgstr "毫米"
+
+#. 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 "é»?"
+
+#. [LGL_UNITS_INCH]
+#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:39
+#: ../data/ui/template-designer.ui.h:62
+msgid "inches"
+msgstr "�寸"
+
+#. [LGL_UNITS_MM]
+#: ../libglabels/units.c:67
+msgid "mm"
+msgstr "mm"
 
-#: data/ui/glabels-ui.xml.h:146
-msgid "_Grid"
+#. [LGL_UNITS_CM]
+#: ../libglabels/units.c:68
+msgid "cm"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:147
-msgid "_Help"
+#. [LGL_UNITS_PICA]
+#: ../libglabels/units.c:69
+msgid "picas"
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:148
-msgid "_Icon"
+#: ../libglabels/xml-template.c:223
+msgid "Missing name or brand/part attributes."
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:152
-msgid "_Main Toolbar"
+#. 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:153
-#, fuzzy
-msgid "_Merge Properties..."
-msgstr "å??併設å®?"
+#: ../libglabels/xml-template.c:256
+#, c-format
+msgid "Unknown page size id or name \"%s\""
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:154
-msgid "_New"
-msgstr "�� (&_N)"
+#: ../libglabels/xml-template.c:275
+msgid "Forward references not supported."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:155
-msgid "_Objects"
+#: ../libglabels/xml-template.c:747
+msgid ""
+"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
 msgstr ""
 
-#: data/ui/glabels-ui.xml.h:156
-#, fuzzy
-msgid "_Open..."
-msgstr "é??å??"
+#: ../libglabels/xml-template.c:757
+msgid "Name attribute also missing."
+msgstr ""
 
-#: data/ui/glabels-ui.xml.h:158
-msgid "_Paste"
+#.
+#. * 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 ""
 
-#: data/ui/glabels-ui.xml.h:159
+#: ../data/ui/merge-properties-dialog.ui.h:2
 #, fuzzy
-msgid "_Print..."
-msgstr "å??å?°"
+msgid "<b>Source</b>"
+msgstr "���"
 
-#: data/ui/glabels-ui.xml.h:160
-msgid "_Property Toolbar"
-msgstr ""
+#: ../data/ui/merge-properties-dialog.ui.h:3
+msgid "Format:"
+msgstr "格�:"
 
-#: data/ui/glabels-ui.xml.h:161
-msgid "_Quit"
-msgstr ""
+#: ../data/ui/merge-properties-dialog.ui.h:4
+msgid "Location:"
+msgstr "ä½?ç½®:"
 
-#: data/ui/glabels-ui.xml.h:164
+#: ../data/ui/merge-properties-dialog.ui.h:5
 #, fuzzy
-msgid "_Save"
-msgstr "���..."
+msgid "Select all"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/ui/glabels-ui.xml.h:168
+#: ../data/ui/merge-properties-dialog.ui.h:6
 #, fuzzy
-msgid "_View"
-msgstr "�� (&_N)"
+msgid "Unselect all"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
+#: ../data/ui/media-select.ui.h:1
+msgid "Brand:"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:2 data/glade/object-editor.glade.h:1
-#: data/glade/template-designer.glade.h:5
-msgid "*"
+#: ../data/ui/media-select.ui.h:2
+msgid "Category:"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:3
-msgid "<span weight=\"bold\">Default page size</span>"
-msgstr ""
+#: ../data/ui/media-select.ui.h:3
+#, fuzzy
+msgid "Custom"
+msgstr "�����"
 
-#: data/glade/prefs-dialog.glade.h:4
-msgid "<span weight=\"bold\">Fill</span>"
-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:5
-msgid "<span weight=\"bold\">Line</span>"
+#: ../data/ui/media-select.ui.h:5
+msgid "Recent"
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:6
-msgid "<span weight=\"bold\">Text</span>"
-msgstr ""
+#: ../data/ui/media-select.ui.h:6
+#, fuzzy
+msgid "Search all"
+msgstr "å??é?¸æ??å?¨é?¨ (&_N)"
 
-#: data/glade/prefs-dialog.glade.h:7
-msgid "<span weight=\"bold\">Units</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 ""
 
-#: data/glade/prefs-dialog.glade.h:8 data/glade/object-editor.glade.h:4
-msgid "Alignment:"
-msgstr "å°?ç½®:"
-
-#: data/glade/prefs-dialog.glade.h:9 data/glade/object-editor.glade.h:8
-msgid "Color:"
-msgstr "é¡?è?²:"
-
-#: data/glade/prefs-dialog.glade.h:10
-msgid "Font:"
-msgstr "å­?å??:"
-
-#: data/glade/prefs-dialog.glade.h:11
-msgid "ISO A4"
-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:12
-msgid "Inches"
-msgstr "�寸"
+#: ../data/ui/new-label-dialog.ui.h:3
+msgid "Label size:"
+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:4
+msgid "Layout:"
+msgstr "ç??é?¢:"
 
-#: data/glade/prefs-dialog.glade.h:14
+#: ../data/ui/new-label-dialog.ui.h:5
 #, fuzzy
-msgid "Locale"
-msgstr "��:"
+msgid "Normal"
+msgstr "格�:"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Millimeters"
-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:16
-msgid "Object defaults"
+#: ../data/ui/new-label-dialog.ui.h:8
+msgid "Please review and confirm your selection."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:17
-msgid "Points"
-msgstr "é»?"
+#: ../data/ui/new-label-dialog.ui.h:9
+#, fuzzy
+msgid "Rotated"
+msgstr "æ??è½?"
 
-#: data/glade/prefs-dialog.glade.h:18
-msgid "Select default properties for new objects."
+#: ../data/ui/new-label-dialog.ui.h:10
+msgid "Select orientation of label content."
 msgstr ""
 
-#: data/glade/prefs-dialog.glade.h:19
-msgid "Select locale specific behavior."
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
 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:12
+msgid "Vendor:"
 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/glade/object-editor.glade.h:2
-msgid "00000000000 00000"
-msgstr ""
+#: ../data/ui/object-editor.ui.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: data/glade/object-editor.glade.h:3
+#: ../data/ui/object-editor.ui.h:3
 msgid "<span weight=\"bold\" size=\"larger\">Xxx object properties</span>"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:5
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:7
+msgid "Alignment:"
+msgstr "å°?ç½®:"
+
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:6
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "�度:"
 
-#: data/glade/object-editor.glade.h:7
+#: ../data/ui/object-editor.ui.h:7
 msgid "Checksum"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:10
+#: ../data/ui/object-editor.ui.h:8 ../data/ui/prefs-dialog.ui.h:8
+msgid "Color:"
+msgstr "é¡?è?²:"
+
+#: ../data/ui/object-editor.ui.h:10
+msgid "Enable shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:11
 #, fuzzy
 msgid "Family:"
 msgstr "填滿"
 
-#: data/glade/object-editor.glade.h:12
+#: ../data/ui/object-editor.ui.h:12
+#, fuzzy
+msgid "File:"
+msgstr "填滿"
+
+#: ../data/ui/object-editor.ui.h:13
 msgid "Fill"
 msgstr "填滿"
 
-#: data/glade/object-editor.glade.h:13 data/glade/template-designer.glade.h:33
+#: ../data/ui/object-editor.ui.h:14 ../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:16
+msgid "Key:"
+msgstr "è³?æ??å?¼:"
 
-#: data/glade/object-editor.glade.h:17
+#: ../data/ui/object-editor.ui.h:17
 msgid "Length:"
 msgstr "�度:"
 
-#: data/glade/object-editor.glade.h:18
-msgid "Line"
-msgstr "ç·?"
+#: ../data/ui/object-editor.ui.h:19 ../data/ui/prefs-dialog.ui.h:12
+msgid "Line Spacing:"
+msgstr ""
 
-#: data/glade/object-editor.glade.h:20
+#: ../data/ui/object-editor.ui.h:20
 msgid "Literal:"
 msgstr "æ??å­?:"
 
-#: data/glade/object-editor.glade.h:21
-msgid "Load image"
+#: ../data/ui/object-editor.ui.h:21
+msgid "Opacity:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:22
+#: ../data/ui/object-editor.ui.h:22
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: data/glade/object-editor.glade.h:23
+#: ../data/ui/object-editor.ui.h:23
 msgid "Reset image size"
 msgstr "é??設å??å??大å°?"
 
-#: data/glade/object-editor.glade.h:24
+#: ../data/ui/object-editor.ui.h:24
+msgid "Shadow"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:25
 msgid "Size"
 msgstr "大�"
 
-#: data/glade/object-editor.glade.h:25
+#: ../data/ui/object-editor.ui.h:26
 #, fuzzy
 msgid "Size:"
 msgstr "大�"
 
-#: data/glade/object-editor.glade.h:26
+#: ../data/ui/object-editor.ui.h:27
 #, fuzzy
 msgid "Style"
 msgstr "樣�"
 
-#: data/glade/object-editor.glade.h:27
+#: ../data/ui/object-editor.ui.h:28
 #, fuzzy
 msgid "Style:"
 msgstr "樣�"
 
-#: data/glade/object-editor.glade.h:30
+#: ../data/ui/object-editor.ui.h:30 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:61
+msgid "Width:"
+msgstr "é??度:"
+
+#: ../data/ui/object-editor.ui.h:31
+msgid "X Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:32
 msgid "X:"
 msgstr "X:"
 
-#: data/glade/object-editor.glade.h:31
+#: ../data/ui/object-editor.ui.h:33
+msgid "Y Offset:"
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y:"
 msgstr "Y:"
 
-#: data/glade/object-editor.glade.h:32
+#: ../data/ui/object-editor.ui.h:35
 msgid "degrees"
 msgstr "度�"
 
-#: data/glade/object-editor.glade.h:33
+#: ../data/ui/object-editor.ui.h:36
 msgid "dialog1"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:34
+#: ../data/ui/object-editor.ui.h:37
 msgid "digits:"
 msgstr ""
 
-#: data/glade/object-editor.glade.h:35
+#: ../data/ui/object-editor.ui.h:38
 #, 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:2
+msgid "<span weight=\"bold\">Default page size</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:3
+msgid "<span weight=\"bold\">Fill</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:4
+msgid "<span weight=\"bold\">Line</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:5
+msgid "<span weight=\"bold\">Text</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:6
+msgid "<span weight=\"bold\">Units</span>"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:9
+msgid "Font:"
+msgstr "å­?å??:"
+
+#: ../data/ui/prefs-dialog.ui.h:10
+msgid "ISO A4"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:11
+msgid "Inches"
+msgstr "�寸"
+
+#: ../data/ui/prefs-dialog.ui.h:13
+#, fuzzy
+msgid "Locale"
+msgstr "��:"
+
+#: ../data/ui/prefs-dialog.ui.h:14
+msgid "Millimeters"
+msgstr "毫米"
+
+#: ../data/ui/prefs-dialog.ui.h:15
+msgid "Object defaults"
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Points"
+msgstr "é»?"
+
+#: ../data/ui/prefs-dialog.ui.h:17
+msgid "Select default properties for new objects."
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:18
+msgid "Select locale specific behavior."
+msgstr ""
+
+#: ../data/ui/prefs-dialog.ui.h:19 ../templates/paper-sizes.xml.h:35
+msgid "US Letter"
+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/glade/template-designer.glade.h:2
+#: ../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 +2204,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 +2225,1023 @@ 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
+#, fuzzy
+msgid "<b>Copies</b>"
+msgstr "份�"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
+msgid "<b>Merge Control</b>"
+msgstr ""
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "設�"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
+msgid "Collate"
+msgstr "æ ¡å°?"
+
+#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
+msgid "Copies:"
+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 "Document merge control"
+#~ 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 "%d x %d  (%d per sheet)"
+#~ msgstr "%d x %d (�� %d)"
+
+#~ 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..."
@@ -2567,10 +3266,6 @@ msgstr "æ??å­?樣è²?"
 #~ msgstr "ä¿?ç??ç?¾æ??ç??大å°?æ¯?ä¾?"
 
 #, fuzzy
-#~ msgid "CD Labels"
-#~ msgstr "�簽"
-
-#, fuzzy
 #~ msgid "Open %s"
 #~ msgstr "é??å??"
 
@@ -2610,24 +3305,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 "製ä½?æ?°æª?, 空ç??樣簽"
 



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