[glabels/gsettings: 1/2] Initial port to GSettings.

From: Jim Evins <jimevins src gnome org>
To: commits-list gnome org
Cc:
Subject: [glabels/gsettings: 1/2] Initial port to GSettings.
Date: Tue, 6 Jul 2010 00:31:16 +0000 (UTC)
commit 7a0031d76ef6eaebc58f602faa1a59eddc25ee65
Author: Jim Evins <evins snaught com>
Date:   Mon Jul 5 20:17:28 2010 -0400

    Initial port to GSettings.
    
    Ported code to use GSettings instead of GConf.

 configure.ac                                       |   16 +-
 data/Makefile.am                                   |    8 +-
 data/schemas/Makefile.am                           |   23 +
 data/schemas/org.gnome.glabels-3.gschema.xml.in.in |  180 ++
 po/ru.po                                           | 3075 +++++++++++---------
 src/color-history-model.c                          |  195 +-
 src/font-history-model.c                           |  140 +-
 src/prefs-model.c                                  |  578 ++---
 src/template-history-model.c                       |  116 +-
 src/ui.c                                           |    1 -
 10 files changed, 2321 insertions(+), 2011 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d3ee342..e161018 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,8 @@ LT_INIT
 GNOME_DOC_INIT
 GTK_DOC_CHECK(1.0)
 
+GLIB_GSETTINGS
+
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -70,9 +72,8 @@ dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ---------------------------------------------------------------------------
 dnl Required dependencies
-GLIB_REQUIRED=2.24.0
+GLIB_REQUIRED=2.25.11
 GTK_REQUIRED=2.20.0
-GCONF_REQUIRED=2.28.0
 LIBXML_REQUIRED=2.7.0
 LIBRSVG_REQUIRED=2.26.0
 
@@ -86,7 +87,6 @@ LIBZINT_REQUIRED=2.3.1
 dnl Make above strings available for packaging files (e.g. rpm spec files)
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
-AC_SUBST(GCONF_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
 AC_SUBST(LIBEBOOK_REQUIRED)
 AC_SUBST(LIBBARCODE_REQUIRED)
@@ -101,7 +101,6 @@ dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(GLABELS, [\
 	glib-2.0 >= $GLIB_REQUIRED \
 	gtk+-2.0 >= $GTK_REQUIRED \
-	gconf-2.0 >= $GCONF_REQUIRED \
 	libxml-2.0 >= $LIBXML_REQUIRED \
 	librsvg-2.0 > $LIBRSVG_REQUIRED \
 ])
@@ -115,7 +114,6 @@ dnl - LIBGLABELS more modest prerequisites
 dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(LIBGLABELS, [\
 	glib-2.0 >= $GLIB_REQUIRED \
-	gconf-2.0 >= $GCONF_REQUIRED \
 	libxml-2.0 >= $LIBXML_REQUIRED \
 ])
 
@@ -275,11 +273,13 @@ src/Makefile
 src/pixmaps/Makefile
 src/stock-pixmaps/Makefile
 data/Makefile
-data/pixmaps/Makefile
-data/mime/Makefile
-data/ui/Makefile
 data/desktop/Makefile
 data/man/Makefile
+data/mime/Makefile
+data/pixmaps/Makefile
+data/schemas/Makefile
+data/schemas/org.gnome.glabels-3.gschema.xml.in
+data/ui/Makefile
 templates/Makefile
 po/Makefile.in
 help/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 1a11481..12de922 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = desktop man mime pixmaps ui
+SUBDIRS = \
+	desktop \
+	man \
+	mime \
+	pixmaps \
+	schemas \
+	ui
 
 
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
new file mode 100644
index 0000000..b971934
--- /dev/null
+++ b/data/schemas/Makefile.am
@@ -0,0 +1,23 @@
+
+gsettings_files = \
+	org.gnome.glabels-3.gschema.xml.in
+
+gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
+
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+
+EXTRA_DIST = \
+	$(gsettings_files)
+
+CLEANFILES = \
+	$(gsettings_SCHEMAS)
+
+DISTCLEANFILES = \
+	$(gsettings_files) \
+	$(gsettings_SCHEMAS)
+
+MAINTAINERCLEANFILES = \
+	$(DISTCLEANFILES) \
+	$(gsettings_SCHEMAS:.xml=.valid)
diff --git a/data/schemas/org.gnome.glabels-3.gschema.xml.in.in b/data/schemas/org.gnome.glabels-3.gschema.xml.in.in
new file mode 100644
index 0000000..415cf02
--- /dev/null
+++ b/data/schemas/org.gnome.glabels-3.gschema.xml.in.in
@@ -0,0 +1,180 @@
+<schemalist>
+
+
+  <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@">
+    <child name="ui" schema="org.gnome.glabels.ui"/>
+    <child name="locale" schema="org.gnome.glabels.locale"/>
+    <child name="objects" schema="org.gnome.glabels.objects"/>
+    <child name="history" schema="org.gnome.glabels.history"/>
+  </schema>
+
+
+  <schema id="org.gnome.glabels-3.ui" path="/apps/glabels-3/ui/" gettext-domain="@GETTEXT_PACKAGE@">
+
+    <key name="main-toolbar-visible" type="b">
+      <default>true</default>
+      <_summary>Show/hide main toolbar.</_summary>
+      <_description>Controls visibility of main toolbar.</_description>
+    </key>
+
+    <key name="drawing-toolbar-visible" type="b">
+      <default>true</default>
+      <_summary>Show/hide drawing toolbar.</_summary>
+      <_description>Controls visibility of drawing toolbar.</_description>
+    </key>
+
+    <key name="property-toolbar-visible" type="b">
+      <default>true</default>
+      <_summary>Show/hide property toolbar.</_summary>
+      <_description>Controls visibility of property toolbar.</_description>
+    </key>
+
+    <key name="grid-visible" type="b">
+      <default>false</default>
+      <_summary>Show/hide grid.</_summary>
+      <_description>Controls visibility of grid.</_description>
+    </key>
+
+    <key name="markup-visible" type="b">
+      <default>true</default>
+      <_summary>Show/hide markup.</_summary>
+      <_description>Controls visibility of markup lines.</_description>
+    </key>
+
+    <key name="max-recents" type="i">
+      <default>-1</default>
+      <_summary>Maximum recent files.</_summary>
+      <_description>Controls maximum number of recent files tracked.</_description>
+    </key>
+
+  </schema>
+
+
+  <schema id="org.gnome.glabels-3.locale" path="/apps/glabels-3/locale/" gettext-domain="@GETTEXT_PACKAGE@">
+
+    <key name="units" type="s">
+      <choices>
+	<choice value=""/>
+	<choice value="pt"/>
+	<choice value="in"/>
+	<choice value="mm"/>
+      </choices>
+      <default>''</default>
+      <_summary>Units.</_summary>
+      <_description>The default unit of measurement.</_description>
+    </key>
+
+    <key name="default-page-size" type="s">
+      <choices>
+	<choice value=""/>
+	<choice value="A4"/>
+	<choice value="US-Letter"/>
+      </choices>
+      <default>''</default>
+      <_summary>Default page size.</_summary>
+      <_description>The prefered page size when searching templates.</_description>
+    </key>
+
+  </schema>
+
+
+  <schema id="org.gnome.glabels-3.objects" path="/apps/glabels-3/objects/" gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="default-font-family" type="s">
+      <default>'Sans'</default>
+      <_summary>Default font family.</_summary>
+      <_description>The default font family for new text objects.</_description>
+    </key>
+
+    <key name="default-font-size" type="d">
+      <range min="0.01" max="250"/>
+      <default>12</default>
+      <_summary>Default font size.</_summary>
+      <_description>The default font size for new text objects.</_description>
+    </key>
+
+    <key name="default-font-weight" type="s">
+      <choices>
+	<choice value="Regular"/>
+	<choice value="Bold"/>
+      </choices>
+      <default>'Regular'</default>
+      <_summary>Default font weight.</_summary>
+      <_description>The default font weight for new text objects.</_description>
+    </key>
+
+    <key name="default-font-italic-flag" type="b">
+      <default>false</default>
+      <_summary>Default font italic flag.</_summary>
+      <_description>The default font italic state for new text objects.</_description>
+    </key>
+
+    <key name="default-text-color" type="u">
+      <default>0x000000ff</default>
+      <_summary>Default text color.</_summary>
+      <_description>The default color of text for new text objects (0xRRGGBBAA).</_description>
+    </key>
+
+    <key name="default-text-alignment" type="s">
+      <choices>
+	<choice value="Left"/>
+	<choice value="Center"/>
+	<choice value="Right"/>
+      </choices>
+      <default>'Left'</default>
+      <_summary>Default text alignment.</_summary>
+      <_description>The default text alignment for new text objects.</_description>
+    </key>
+
+    <key name="default-text-line-spacing" type="d">
+      <range min="0.1" max="5"/>
+      <default>1.0</default>
+      <_summary>Default text line spacing.</_summary>
+      <_description>The default line spacing for new text objects.</_description>
+    </key>
+
+    <key name="default-line-width" type="d">
+      <range min="0.25" max="10"/>
+      <default>1.0</default>
+      <_summary>Default line width.</_summary>
+      <_description>The default line width for new objects.</_description>
+    </key>
+
+    <key name="default-line-color" type="u">
+      <default>0x000000ff</default>
+      <_summary>Default line color.</_summary>
+      <_description>The default line color new objects (0xRRGGBBAA).</_description>
+    </key>
+
+    <key name="default-fill-color" type="u">
+      <default>0x00ff00ff</default>
+      <_summary>Default fill color.</_summary>
+      <_description>The default fill color new objects (0xRRGGBBAA).</_description>
+    </key>
+
+  </schema>
+
+
+  <schema id="org.gnome.glabels-3.history" path="/apps/glabels-3/history/" gettext-domain="@GETTEXT_PACKAGE@">
+
+    <key name="recent-templates" type="as">
+      <default>[]</default>
+      <_summary>Recent templates.</_summary>
+      <_description>Recently used templates.</_description>
+    </key>
+
+    <key name="recent-fonts" type="as">
+      <default>[]</default>
+      <_summary>Recent fonts.</_summary>
+      <_description>Recently used font families.</_description>
+    </key>
+
+    <key name="recent-colors" type="au">
+      <default>[]</default>
+      <_summary>Recent colors.</_summary>
+      <_description>Recently created custom colors.</_description>
+    </key>
+
+  </schema>
+
+
+</schemalist>
diff --git a/po/ru.po b/po/ru.po
index ff02c9e..2524ab3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-29 00:34+0400\n"
+"POT-Creation-Date: 2010-07-05 11:03-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,1103 @@ 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/glabels.c:91 ../src/glabels-batch.c:105
+#: ../src/color-combo-menu.c:104
+msgid "SkyBlue"
+msgstr "Ð?ÐµÐ±ÐµÑ?Ð½Ð¾-Ñ?Ð¸Ð½Ð¸Ð¹"
+
+#: ../src/color-combo-menu.c:105
+msgid "Violet"
+msgstr "Ð¤Ð¸Ð¾Ð»ÐµÑ?Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:107
+msgid "Pink"
+msgstr "Ð Ð¾Ð·Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:108
+msgid "Khaki"
+msgstr "Ð¥Ð°ÐºÐ¸"
+
+#: ../src/color-combo-menu.c:109
+msgid "Light Yellow"
+msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð¶Ñ?Ð»Ñ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:110
+msgid "Light Green"
+msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:111
+msgid "Light Cyan"
+msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ñ?Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:112
+msgid "Slate Gray"
+msgstr "Ð?Ñ?Ð¿Ð¸Ð´Ð½Ð¾-Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:113
+msgid "Thistle"
+msgstr "Ð§ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ñ?"
+
+#: ../src/color-combo-menu.c:115
+msgid "White"
+msgstr "Ð?ÐµÐ»Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:117
+#, no-c-format
+msgid "10% Gray"
+msgstr "10% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:119
+#, no-c-format
+msgid "25% Gray"
+msgstr "25% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:121
+#, no-c-format
+msgid "40% Gray"
+msgstr "40% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:123
+#, no-c-format
+msgid "50% Gray"
+msgstr "50% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:125
+#, no-c-format
+msgid "60% Gray"
+msgstr "60% Ñ?ÐµÑ?Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:126
+msgid "Black"
+msgstr "Ð§Ñ?Ñ?Ð½Ñ?Ð¹"
+
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
+msgid "Custom Color"
+msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ?:"
+
+#: ../src/color-combo-menu.c:319
 #, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+msgid "Custom Color #%u"
+msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ? #%u"
+
+#: ../src/critical-error-handler.c:70
+msgid "gLabels Fatal Error!"
+msgstr "Ð¤Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ° gLabels!"
+
+#: ../src/file.c:84
+msgid "New Label or Card"
+msgstr "Ð?Ð¾Ð²Ð°Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ° Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ°"
+
+#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+msgid "Label properties"
+msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
+
+#: ../src/file.c:267 ../src/file.c:557
+msgid "All files"
+msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
+
+#: ../src/file.c:272 ../src/file.c:562
+msgid "gLabels documents"
+msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ñ? gLabels"
+
+#: ../src/file.c:319 ../src/file.c:620
+msgid "Empty file name selection"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ Ð²Ñ?Ð±Ð¾Ñ? Ñ?Ð°Ð¹Ð»Ð°"
+
+#: ../src/file.c:322 ../src/file.c:338
+msgid "Please select a file or supply a valid file name"
+msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð²Ð²ÐµÐ´Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
+
+#: ../src/file.c:335
+msgid "File does not exist"
+msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
+
+#: ../src/file.c:410
+#, c-format
+msgid "Could not open file \"%s\""
+msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð»  \"%s\""
+
+#: ../src/file.c:413
+msgid "Not a supported file format"
+msgstr "Ð¤Ð°Ð¹Ð» Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð°"
+
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
+msgid "Could not save file \"%s\""
+msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\""
+
+#: ../src/file.c:495 ../src/file.c:674
+msgid "Error encountered during save.  The file is still not saved."
+msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Ñ?Ð°Ð¹Ð»Ð°.  Ð¤Ð°Ð¹Ð» Ð²Ñ?Ñ? ÐµÑ?Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ð½."
+
+#: ../src/file.c:535
+#, c-format
+msgid "Save \"%s\" as"
+msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? \"%s\" ÐºÐ°Ðº"
+
+#: ../src/file.c:623
+msgid "Please supply a valid file name"
+msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
+
+#: ../src/file.c:644
+#, c-format
+msgid "Overwrite file \"%s\"?"
+msgstr "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ð¸Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\"?"
+
+#: ../src/file.c:648
+msgid "File already exists."
+msgstr "Ð¤Ð°Ð¹Ð» Ñ?Ð¶Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?."
+
+#: ../src/file.c:744
+#, c-format
+msgid "Save changes to document \"%s\" before closing?"
+msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð² Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ðµ \"%s\" Ð¿ÐµÑ?ÐµÐ´ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð¸ÐµÐ¼?"
+
+#: ../src/file.c:748
+msgid "Your changes will be lost if you don't save them."
+msgstr "Ð?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð´Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÑ?Ñ?Ð½Ñ?, ÐµÑ?Ð»Ð¸ Ð²Ñ? Ð¸Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ."
+
+#: ../src/file.c:751
+msgid "Close without saving"
+msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ? Ð±ÐµÐ· Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ?"
+
+#: ../src/font-combo-menu.c:137
+#, fuzzy
+msgid "Recent fonts"
+msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ñ?Ð°Ð±Ð»Ð¾Ð½Ñ?"
+
+#: ../src/font-combo-menu.c:152
+msgid "Proportional fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:160
+msgid "Fixed-width fonts"
+msgstr ""
+
+#: ../src/font-combo-menu.c:168
+#, fuzzy
+msgid "All fonts"
+msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
+
+#.
+#. * Allow text samples to be localized.
+#. *
+#. * FIXME: if we could extract enough meta information from the fonts
+#. * themselves, perhaps rather than setting these globally for the
+#. * current locale, they could be unique to each font family.
+#.
+#: ../src/font-combo-menu-item.c:132
+msgctxt "Short sample text"
+msgid "Aa"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:134
+msgctxt "Lower case sample text"
+msgid "abcdefghijklmnopqrstuvwxyz"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:136
+msgctxt "Upper case sample text"
+msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:138
+msgctxt "Numbers and special characters sample text"
+msgid "0123456789 .:,;(*!?)"
+msgstr ""
+
+#: ../src/font-combo-menu-item.c:157
+msgid "Sample text"
 msgstr ""
 
-#: ../src/glabels-batch.c:53
+#: ../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:402
+msgid "Untitled"
+msgstr "Ð?ÐµÐ· Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ?"
+
+#: ../src/label.c:705 ../src/ui.c:422
+msgid "Merge properties"
+msgstr "Ð?Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ?Ñ? Ð¿Ð¾Ð»Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
+
+#: ../src/label.c:1197 ../src/ui.c:215
+msgid "Delete"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ?"
+
+#: ../src/label.c:1230 ../src/ui.c:324
+msgid "Bring to front"
+msgstr "Ð?Ð° Ð¿ÐµÑ?ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
+
+#: ../src/label.c:1266 ../src/ui.c:331
+msgid "Send to back"
+msgstr "Ð?Ð° Ð·Ð°Ð´Ð½Ð¸Ð¹ Ð¿Ð»Ð°Ð½"
+
+#: ../src/label.c:1307
+#, fuzzy
+msgid "Rotate"
+msgstr "Ð¡ Ð¿Ð¾Ð²Ð¾Ñ?Ð¾Ñ?Ð¾Ð¼"
+
+#: ../src/label.c:1342 ../src/ui.c:338
+msgid "Rotate left"
+msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð»ÐµÐ²Ð¾"
+
+#: ../src/label.c:1375 ../src/ui.c:345
+msgid "Rotate right"
+msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð¿Ñ?Ð°Ð²Ð¾"
+
+#: ../src/label.c:1410 ../src/ui.c:352
+msgid "Flip horizontally"
+msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ð¾"
+
+#: ../src/label.c:1445 ../src/ui.c:359
+msgid "Flip vertically"
+msgstr "Ð?Ñ?Ñ?Ð°Ð·Ð¸Ñ?Ñ? Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ð¾"
+
+#: ../src/label.c:1485 ../src/ui.c:366
+msgid "Align left"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð»ÐµÐ²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1542 ../src/ui.c:373
+msgid "Align right"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð¿Ñ?Ð°Ð²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1603 ../src/ui.c:380
+msgid "Align horizontal center"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
+
+#: ../src/label.c:1679 ../src/ui.c:387
+msgid "Align tops"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð½ÐµÐ¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1736 ../src/ui.c:394
+msgid "Align bottoms"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð½Ð¸Ð¶Ð½ÐµÐ¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label.c:1797 ../src/ui.c:401
+msgid "Align vertical center"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¼ Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð¼"
+
+#: ../src/label.c:1875 ../src/ui.c:408
+msgid "Center horizontally"
+msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾ Ð³Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð¸"
+
+#: ../src/label.c:1922 ../src/ui.c:415
+msgid "Center vertically"
+msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð¸"
+
+#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+msgid "Paste"
+msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ñ?"
+
+#: ../src/label-ellipse.c:160
+#, fuzzy
+msgid "Create ellipse object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?"
+
+#: ../src/label-image.c:199 ../src/ui.c:312
+msgid "Create image object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ñ?Ð¾Ð²Ð¾Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ðµ"
+
+#: ../src/label-image.c:332 ../src/label-image.c:473
+#, fuzzy
+msgid "Set image"
+msgstr "Ð£Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸Ñ?Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ? Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
+
+#: ../src/label-line.c:147 ../src/ui.c:298
+msgid "Create line object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð»Ð¸Ð½Ð¸Ñ?"
+
+#: ../src/label-object.c:383 ../src/label-object.c:416
+msgid "Move"
+msgstr ""
+
+#: ../src/label-object.c:467
+#, fuzzy
+msgid "Resize"
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?:"
+
+#: ../src/label-object.c:1185
+#, fuzzy
+msgid "Shadow state"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-object.c:1228
+#, fuzzy
+msgid "Shadow offset"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-object.c:1276
+#, fuzzy
+msgid "Shadow color"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-object.c:1319
+#, fuzzy
+msgid "Shadow opacity"
+msgstr "Ð¢ÐµÐ½Ñ?"
+
+#: ../src/label-text.c:279 ../src/ui.c:284
+msgid "Create text object"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ñ?ÐµÐºÑ?Ñ?"
+
+#: ../src/label-text.c:451
+msgid "Typing"
+msgstr ""
+
+#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+msgid "Font family"
+msgstr "Ð?Ð°Ñ?Ð½Ð¸Ñ?Ñ?Ñ?Ð°"
+
+#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+msgid "Font size"
+msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ñ?Ñ?Ð¸Ñ?Ñ?Ð°"
+
+#: ../src/label-text.c:655
+#, fuzzy
+msgid "Font weight"
+msgstr "Ð?Ð¾Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ? Ð²Ð¿Ñ?Ð°Ð²Ð¾"
+
+#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+msgid "Italic"
+msgstr "Ð?Ñ?Ñ?Ñ?Ð¸Ð²"
+
+#: ../src/label-text.c:721
+#, fuzzy
+msgid "Align text"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð²Ð½Ñ?Ñ?Ñ? Ð¿Ð¾ Ð»ÐµÐ²Ð¾Ð¼Ñ? ÐºÑ?Ð°Ñ?"
+
+#: ../src/label-text.c:754
+#, fuzzy
+msgid "Line spacing"
+msgstr "Ð?ÐµÐ¶Ð´Ñ? Ñ?Ñ?Ñ?Ð¾Ðº:"
+
+#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+msgid "Text color"
+msgstr "Ð¦Ð²ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
+
+#: ../src/label-text.c:931
+msgid "Auto shrink"
+msgstr ""
+
+#: ../src/media-select.c:349 ../src/media-select.c:353
+#: ../src/media-select.c:502 ../src/media-select.c:701
+#, fuzzy
+msgctxt "Brand"
+msgid "Any"
+msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
+
+#: ../src/media-select.c:358 ../src/media-select.c:871
+#, fuzzy
+msgctxt "Page size"
+msgid "Any"
+msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
+
+#: ../src/media-select.c:367 ../src/media-select.c:370
+#: ../src/media-select.c:880
+#, fuzzy
+msgctxt "Category"
+msgid "Any"
+msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
+
+#: ../src/media-select.c:968
+msgid "No recent templates found."
+msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°Ð²Ñ?Ð¸Ñ?Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¾."
+
+#: ../src/media-select.c:970
+#, fuzzy
+msgid "Try selecting a template in the \"Search all\" tab."
+msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½ Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐµ Â«Ð?Ð¾Ð¸Ñ?Ðº Ð¿Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°Ð¼Â»."
+
+#. Translators: "No match" means that for the given template search criteria, there
+#. * were no matches found.
+#: ../src/media-select.c:1061
+msgid "No match."
+msgstr "Ð?ÐµÑ? Ñ?Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹."
+
+#: ../src/media-select.c:1063
+msgid "Try selecting a different brand, page size or category."
+msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ñ?Ñ? Ð¼Ð°Ñ?ÐºÑ?, Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
+
+#: ../src/media-select.c:1157
+#, fuzzy
+msgid "No custom templates found."
+msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°Ð²Ñ?Ð¸Ñ?Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¾."
+
+#: ../src/media-select.c:1159
+msgid ""
+"You may create new templates or try searching for pre-defined templates in "
+"the \"Search all\" tab."
+msgstr ""
+
+#. Translators: "None" here means that no document-merge source or
+#. * method has been selected.
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
+msgid "None"
+msgstr "Ð?ÐµÑ?"
+
+#: ../src/merge-evolution.c:316
+msgid "Couldn't construct query"
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?."
+
+#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
+msgid "Couldn't open addressbook."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ñ?Ñ? ÐºÐ½Ð¸Ð³Ñ?."
+
+#: ../src/merge-evolution.c:348
+msgid "Couldn't list available fields."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÑ?Ð¸Ñ?Ð»Ð¸Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ðµ Ð¿Ð¾Ð»Ñ?."
+
+#: ../src/merge-evolution.c:384
+msgid "Couldn't get contacts."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ."
+
+#: ../src/merge-init.c:57
+msgid "Text: Comma Separated Values (CSV)"
+msgstr ""
+
+#: ../src/merge-init.c:64
+msgid "Text: Comma Separated Values (CSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:72
+msgid "Text: Tab Separated Values (TSV)"
+msgstr ""
+
+#: ../src/merge-init.c:79
+msgid "Text: Tab Separated Values (TSV) with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:87
+msgid "Text: Colon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:94
+msgid "Text: Colon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:102
+msgid "Text: Semicolon separated values"
+msgstr ""
+
+#: ../src/merge-init.c:109
+msgid "Text: Semicolon separated values with keys on line 1"
+msgstr ""
+
+#: ../src/merge-init.c:119
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð· Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÐ¼Ð¾Ð¹ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸ Evolution"
+
+#: ../src/merge-init.c:125
+msgid "VCards"
+msgstr ""
+
+#: ../src/merge-properties-dialog.c:282
+msgid "Merge Properties"
+msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
+
+#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+msgid "Select merge-database source"
+msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð´Ð°Ð½Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
+
+#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+msgid "N/A"
+msgstr "Ð?/Ð?"
+
+#: ../src/merge-properties-dialog.c:345
+msgid "Select"
+msgstr "Ð?Ñ?Ð±Ñ?Ð°Ð½Ð¾"
+
+#: ../src/merge-properties-dialog.c:352
+msgid "Record/Field"
+msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ñ?/Ð?Ð¾Ð»Ðµ"
+
+#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h: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 +1248,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 +1544,159 @@ msgstr ""
 "Ð¦Ð?Ð?Ð¯Ð¥. Ð?Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾Ð¹ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ñ?Ñ?ÐµÑ?Ñ?\n"
 "Ñ?Ð¾ Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¾Ð¹ Ð?Ð±Ñ?ÐµÑ?Ñ?Ð²ÐµÐ½Ð½Ð¾Ð¹ Ð?Ð¸Ñ?ÐµÐ½Ð·Ð¸ÐµÐ¹ GNU.\n"
 
-#: ../src/ui-commands.c:1116
+#: ../src/ui-commands.c:1190
 msgid "glabels"
 msgstr "glabels"
 
-#: ../src/file.c:91
-msgid "New Label or Card"
-msgstr "Ð?Ð¾Ð²Ð°Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ° Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ°"
-
-#: ../src/file.c:191
-msgid "Label properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
-
-#: ../src/file.c:292 ../src/file.c:578
-msgid "All files"
-msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
-
-#: ../src/file.c:297 ../src/file.c:583
-msgid "gLabels documents"
-msgstr "Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ñ? gLabels"
-
-#: ../src/file.c:343 ../src/file.c:640
-msgid "Empty file name selection"
-msgstr "Ð?Ñ?Ñ?Ñ?Ð¾Ð¹ Ð²Ñ?Ð±Ð¾Ñ? Ñ?Ð°Ð¹Ð»Ð°"
-
-#: ../src/file.c:346 ../src/file.c:362
-msgid "Please select a file or supply a valid file name"
-msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð¹Ð» Ð¸Ð»Ð¸ Ð²Ð²ÐµÐ´Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
-
-#: ../src/file.c:359
-msgid "File does not exist"
-msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?"
-
-#: ../src/file.c:433
-#, c-format
-msgid "Could not open file \"%s\""
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ð»  \"%s\""
-
-#: ../src/file.c:436
-msgid "Not a supported file format"
-msgstr "Ð¤Ð°Ð¹Ð» Ð½ÐµÐ¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð°"
-
-#: ../src/file.c:513 ../src/file.c:690
-#, c-format
-msgid "Could not save file \"%s\""
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\""
-
-#: ../src/file.c:517 ../src/file.c:694
-msgid "Error encountered during save.  The file is still not saved."
-msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Ñ?Ð°Ð¹Ð»Ð°.  Ð¤Ð°Ð¹Ð» Ð²Ñ?Ñ? ÐµÑ?Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ñ?Ð½."
-
-#: ../src/file.c:556
-#, c-format
-msgid "Save \"%s\" as"
-msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? \"%s\" ÐºÐ°Ðº"
-
-#: ../src/file.c:643
-msgid "Please supply a valid file name"
-msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ñ?ÐµÐºÑ?Ð½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ?Ð°Ð¹Ð»Ð°"
+#: ../src/warning-handler.c:69
+msgid "gLabels Error!"
+msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° gLabels!"
 
-#: ../src/file.c:664
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr "Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ð¸Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð¹Ð» \"%s\"?"
+#: ../src/window.c:284
+msgid "(none) - gLabels"
+msgstr "(Ð½ÐµÑ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ? Ð¼Ð°ÐºÐµÑ?Ð¾Ð²) - gLabels"
 
-#: ../src/file.c:668
-msgid "File already exists."
-msgstr "Ð¤Ð°Ð¹Ð» Ñ?Ð¶Ðµ Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?ÐµÑ?."
+#: ../src/window.c:485
+msgid "(modified)"
+msgstr "(Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾)"
 
-#: ../src/file.c:764
+#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
 #, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð² Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ðµ \"%s\" Ð¿ÐµÑ?ÐµÐ´ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð¸ÐµÐ¼?"
-
-#: ../src/file.c:768
-msgid "Your changes will be lost if you don't save them."
-msgstr "Ð?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð±Ñ?Ð´Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÑ?Ñ?Ð½Ñ?, ÐµÑ?Ð»Ð¸ Ð²Ñ? Ð¸Ñ? Ð½Ðµ Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ."
-
-#: ../src/file.c:771
-msgid "Close without saving"
-msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ? Ð±ÐµÐ· Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ?"
-
-#. Should not happen
-#: ../src/prefs.c:159 ../src/prefs.c:166
-#: ../data/builder/object-editor.glade.h:43
-#: ../data/builder/prefs-dialog.glade.h:22
-msgid "points"
-msgstr "Ð¿Ñ?Ð½ÐºÑ?Ð¾Ð²"
-
-#: ../src/prefs.c:161 ../data/builder/object-editor.glade.h:42
-#: ../data/builder/template-designer.glade.h:64
-msgid "inches"
-msgstr "Ð´Ñ?Ð¹Ð¼Ð¾Ð²"
-
-#: ../src/prefs.c:163
-msgid "mm"
-msgstr "Ð¼Ð¼"
-
-#: ../src/prefs-dialog.c:167 ../data/builder/prefs-dialog.glade.h:21
-msgid "gLabels Preferences"
-msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? gLabels"
-
-#. Build editor.
-#: ../src/view-box.c:175
-msgid "Box object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¿Ñ?Ñ?Ð¼Ð¾Ñ?Ð³Ð¾Ð»Ñ?Ð½Ð¸ÐºÐ°"
-
-#. Build editor.
-#: ../src/view-ellipse.c:175
-msgid "Ellipse object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?Ð»Ð»Ð¸Ð¿Ñ?Ð°"
-
-#. Build editor.
-#: ../src/view-line.c:174
-msgid "Line object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð¾ Ð»Ð¸Ð½Ð¸Ð¸"
-
-#. Build editor.
-#: ../src/view-image.c:174
-msgid "Image object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
-
-#. Build editor.
-#: ../src/view-text.c:178
-msgid "Text object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ñ?ÐµÐºÑ?Ñ?Ð°"
-
-#. Build editor.
-#: ../src/view-barcode.c:174
-msgid "Barcode object properties"
-msgstr "Ð¡Ð²Ð¾Ð¹Ñ?Ñ?Ð²Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ñ?Ð¸Ð¿Ð° Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´"
-
-#: ../src/object-editor-image-page.c:267
-msgid "All Files"
-msgstr "Ð?Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ñ?"
-
-#: ../src/object-editor-image-page.c:272
-msgid "All Images"
-msgstr "Ð?Ñ?Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ?"
+msgid "Bad root node = \"%s\""
+msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ ÐºÐ¾Ñ?Ð½ÐµÐ²Ð¾Ð¹ Ñ?Ð·ÐµÐ» = \"%s\""
 
-#: ../src/object-editor-image-page.c:287
+#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
 #, c-format
-msgid "%s (*.%s)"
-msgstr "%s (*.%s)"
-
-#: ../src/merge-properties-dialog.c:271
-msgid "Merge Properties"
-msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
-
-#: ../src/merge-properties-dialog.c:297 ../src/merge-properties-dialog.c:405
-msgid "Select merge-database source"
-msgstr "Ð?Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðº Ð´Ð°Ð½Ð½Ñ?Ñ? Ð´Ð»Ñ? Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð´Ð°Ð½Ð½Ñ?Ð¼Ð¸"
-
-#: ../src/merge-properties-dialog.c:306 ../src/merge-properties-dialog.c:425
-msgid "N/A"
-msgstr "Ð?/Ð?"
-
-#: ../src/merge-properties-dialog.c:332
-msgid "Select"
-msgstr "Ð?Ñ?Ð±Ñ?Ð°Ð½Ð¾"
-
-#: ../src/merge-properties-dialog.c:340
-msgid "Record/Field"
-msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ñ?/Ð?Ð¾Ð»Ðµ"
-
-#: ../src/merge-properties-dialog.c:348
-#: ../data/builder/object-editor.glade.h:10
-msgid "Data"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ"
-
-#: ../src/merge-properties-dialog.c:418
-msgid "Fixed"
-msgstr ""
-
-#. ===================================================================
-#: ../src/print-op.c:242 ../src/wdgt-print-copies.c:171
-#: ../data/templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "ÐÑ?Ð¸ÐºÐµÑ?ÐºÐ¸"
-
-#: ../src/template-designer.c:411
-msgid "gLabels Template Designer"
-msgstr "Ð?Ð¸Ð·Ð°Ð¹Ð½ÐµÑ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² gLabels"
-
-#: ../src/template-designer.c:481
-msgid "Welcome"
-msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ?"
-
-#: ../src/template-designer.c:534
-msgid "Name and Description"
-msgstr "Ð?Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¸ Ð¾Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ"
-
-#: ../src/template-designer.c:595
-msgid "Page Size"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
-
-#: ../src/template-designer.c:675
-msgid "Label or Card Shape"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ¸"
-
-#: ../src/template-designer.c:735
-#, fuzzy
-msgid "Label or Card Size"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð° Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸ Ð¸Ð»Ð¸ Ð²Ð¸Ð·Ð¸Ñ?ÐºÐ¸"
-
-#: ../src/template-designer.c:844
-#, fuzzy
-msgid "Label Size (round)"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ð¼ÐµÑ?ÐºÐ¸ (Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?)"
-
-#: ../src/template-designer.c:935
-msgid "Label Size (CD/DVD)"
-msgstr "Ð Ð°Ð·Ð¼ÐµÑ? Ð¼ÐµÑ?ÐºÐ¸ (CD/DVD)"
-
-#: ../src/template-designer.c:1036
-msgid "Number of Layouts"
-msgstr "Ð?Ð¾Ð»Ð¸Ñ?ÐµÑ?Ñ?Ð²Ð¾ Ñ?Ð¾Ñ?Ð¼"
-
-#: ../src/template-designer.c:1110
-msgid "Layout(s)"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ñ?"
-
-#: ../src/template-designer.c:1229
-msgid "Design Completed"
-msgstr "Ð?Ñ?Ð¾Ñ?Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑ?Ñ?ÐµÐ½Ð¾"
-
-#: ../src/template-designer.c:1396
-msgid ""
-"<span foreground='red' weight='bold'>Brand and part# match an existing "
-"template!</span>"
-msgstr ""
-
-#: ../src/bc.c:68
-msgid "POSTNET (any)"
-msgstr "POSTNET (Ð»Ñ?Ð±Ð¾Ð¹)"
-
-#: ../src/bc.c:71
-msgid "POSTNET-5 (ZIP only)"
-msgstr "POSTNET-5 (Ñ?Ð¾Ð»Ñ?ÐºÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ñ?Ð¹ Ð¸Ð½Ð´ÐµÐºÑ?)"
-
-#: ../src/bc.c:74
-msgid "POSTNET-9 (ZIP+4)"
-msgstr "POSTNET-9 (ZIP+4)"
-
-#: ../src/bc.c:77
-msgid "POSTNET-11 (DPBC)"
-msgstr "POSTNET-11 (DPBC)"
-
-#: ../src/bc.c:80
-msgid "CEPNET"
-msgstr "CEPNET"
-
-#: ../src/bc.c:83
-msgid "EAN (any)"
-msgstr "EAN (Ð»Ñ?Ð±Ð¾Ð¹)"
-
-#: ../src/bc.c:86
-msgid "EAN-8"
-msgstr "EAN-8"
-
-#: ../src/bc.c:89
-msgid "EAN-8 +2"
-msgstr "EAN-8 +2"
-
-#: ../src/bc.c:92
-msgid "EAN-8 +5"
-msgstr "EAN-8 +5"
-
-#: ../src/bc.c:95
-msgid "EAN-13"
-msgstr "EAN-13"
-
-#: ../src/bc.c:98
-msgid "EAN-13 +2"
-msgstr "EAN-13 +2"
-
-#: ../src/bc.c:101
-msgid "EAN-13 +5"
-msgstr "EAN-13 +5"
-
-#: ../src/bc.c:104
-msgid "UPC (UPC-A or UPC-E)"
-msgstr "UPC (UPC-A or UPC-E)"
-
-#: ../src/bc.c:107
-msgid "UPC-A"
-msgstr "UPC-A"
-
-#: ../src/bc.c:110
-msgid "UPC-A +2"
-msgstr "UPC-A +2"
-
-#: ../src/bc.c:113
-msgid "UPC-A +5"
-msgstr "UPC-A +5"
-
-#: ../src/bc.c:116
-msgid "UPC-E"
-msgstr "UPC-E"
-
-#: ../src/bc.c:119
-msgid "UPC-E +2"
-msgstr "UPC-E +2"
-
-#: ../src/bc.c:122
-msgid "UPC-E +5"
-msgstr "UPC-E +5"
-
-#: ../src/bc.c:125
-msgid "ISBN"
-msgstr "ISBN"
-
-#: ../src/bc.c:128
-msgid "ISBN +5"
-msgstr "ISBN +5"
-
-#: ../src/bc.c:131
-msgid "Code 39"
-msgstr "Code 39"
-
-#: ../src/bc.c:134
-msgid "Code 128"
-msgstr "Code 128"
-
-#: ../src/bc.c:137
-msgid "Code 128C"
-msgstr "Code 128C"
-
-#: ../src/bc.c:140
-msgid "Code 128B"
-msgstr "Code 128B"
-
-#: ../src/bc.c:143
-msgid "Interleaved 2 of 5"
-msgstr "Interleaved 2 of 5"
-
-#: ../src/bc.c:146
-msgid "Codabar"
-msgstr "Codabar"
-
-#: ../src/bc.c:149
-msgid "MSI"
-msgstr "MSI"
-
-#: ../src/bc.c:152
-msgid "Plessey"
-msgstr "Plessey"
-
-#: ../src/bc.c:155
-msgid "IEC16022 (DataMatrix)"
-msgstr "IEC16022 (DataMatrix)"
-
-#: ../src/bc.c:158
-msgid "IEC18004 (QRCode)"
-msgstr "IEC18004 (QRCode)"
-
-#: ../src/label.c:531
-msgid "Untitled"
-msgstr "Ð?ÐµÐ· Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ?"
-
-#: ../src/label-barcode.c:426
-msgid "Barcode data empty"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´Ð° Ð½Ðµ Ð²Ð²ÐµÐ´ÐµÐ½Ñ?"
-
-#: ../src/label-barcode.c:430
-msgid "Invalid barcode data"
-msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ Ñ?Ñ?Ñ?Ð¸Ñ?-ÐºÐ¾Ð´Ð°"
+msgid "bad node =  \"%s\""
+msgstr "Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» =  \"%s\""
 
-#: ../src/xml-label.c:189 ../src/xml-label.c:226
+#: ../src/xml-label.c:199 ../src/xml-label.c:237
 msgid "xmlParseFile error"
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð°Ð·Ð±Ð¾Ñ?Ðµ Ñ?Ð°Ð¹Ð»Ð° XML"
 
-#: ../src/xml-label.c:262
+#: ../src/xml-label.c:274
 msgid "No document root"
 msgstr "Ð?ÐµÑ? ÐºÐ¾Ñ?Ð½Ñ? Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°"
 
-#: ../src/xml-label.c:270
+#: ../src/xml-label.c:282
 msgid "Importing from glabels 0.1 format"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ? Ð¸Ð¼Ð¿Ð¾Ñ?Ñ? Ð¸Ð· Ñ?Ð°Ð¹Ð»Ð° gLabels Ð²ÐµÑ?Ñ?Ð¸Ð¸ 0.1"
 
-#: ../src/xml-label.c:279
+#: ../src/xml-label.c:291
 msgid "Importing from glabels 0.4 format"
 msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ? Ð¸Ð¼Ð¿Ð¾Ñ?Ñ? Ð¸Ð· Ñ?Ð°Ð¹Ð»Ð° gLabels Ð²ÐµÑ?Ñ?Ð¸Ð¸ 0.4"
 
-#: ../src/xml-label.c:288
+#: ../src/xml-label.c:301
 #, fuzzy, c-format
 msgid "Unknown glabels Namespace -- Using %s"
 msgstr "Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ? Ð½ÐµÐ²ÐµÑ?Ð½Ð¾Ð³Ð¾ Ñ?Ð¸Ð¿Ð°, Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾Ðµ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ð¸Ð¼Ñ?Ð½ glabels"
 
-#: ../src/xml-label.c:319 ../src/xml-label-04.c:79
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ ÐºÐ¾Ñ?Ð½ÐµÐ²Ð¾Ð¹ Ñ?Ð·ÐµÐ» = \"%s\""
-
-#: ../src/xml-label.c:356
+#: ../src/xml-label.c:370
 #, c-format
 msgid "bad node in Document node =  \"%s\""
 msgstr "Ð?ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» Ð² Ñ?Ð·Ð»Ðµ Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°=  \"%s\""
 
-#: ../src/xml-label.c:401 ../src/xml-label-04.c:127
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» =  \"%s\""
-
-#: ../src/xml-label.c:840
+#: ../src/xml-label.c:868
 #, c-format
 msgid "bad node in Data node =  \"%s\""
 msgstr "Ð½ÐµÐ²ÐµÑ?Ð½Ñ?Ð¹ Ñ?Ð·ÐµÐ» Ð² Ñ?Ð·Ð»Ðµ Ð´Ð°Ð½Ð½Ñ?Ñ?=  \"%s\""
 
-#: ../src/xml-label.c:1077 ../libglabels/xml-template.c:670
+#: ../src/xml-label.c:944
+#, fuzzy, c-format
+msgid "Unknown embedded file format: \"%s\""
+msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ñ? Ñ?Ð°Ð·Ð¼ÐµÑ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ \"%s\""
+
+#: ../src/xml-label.c:1143 ../libglabels/xml-template.c:802
 msgid "Utf8 conversion error."
 msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?ÐµÐ¾Ð±Ñ?Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? UTF8."
 
-#: ../src/xml-label.c:1084
+#: ../src/xml-label.c:1150
 msgid "Problem saving xml file."
 msgstr "Ð?ÐµÐ¿Ð¾Ð»Ð°Ð´ÐºÐ¸ Ð¿Ñ?Ð¸ Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ð¸ Ñ?Ð°Ð¹Ð»Ð° XML."
 
-#: ../src/merge.c:170 ../src/merge.c:211 ../src/merge.c:375 ../src/merge.c:378
-msgid "None"
-msgstr "Ð?ÐµÑ?"
-
-#: ../src/merge-init.c:59
-msgid "Text file with comma delimeters (CSV)"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ð·Ð°Ð¿Ñ?Ñ?Ð°Ñ?Â» (CSV)"
-
-#: ../src/merge-init.c:66
-msgid "Text file with colon delimeters"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ð´Ð²Ð¾ÐµÑ?Ð¾Ñ?Ð¸ÐµÂ»"
-
-#: ../src/merge-init.c:73
-msgid "Text file with tab delimeters"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ñ? Ñ?Ð°Ð·Ð´ÐµÐ»Ð¸Ñ?ÐµÐ»ÐµÐ¼ Â«Ñ?Ð¸Ð¼Ð²Ð¾Ð» Ñ?Ð°Ð±Ñ?Ð»Ñ?Ñ?Ð¸Ð¸Â»"
-
-#: ../src/merge-init.c:82
-msgid "Data from default Evolution Addressbook"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð· Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?ÐµÐ¼Ð¾Ð¹ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸ Evolution"
-
-#: ../src/merge-init.c:88
-msgid "Data from a file containing VCards"
-msgstr "Ð?Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð· Ñ?Ð°Ð¹Ð»Ð°, Ñ?Ð¾Ð´ÐµÑ?Ð¶Ð°Ñ?ÐµÐ³Ð¾ VCard"
-
-#: ../src/merge-evolution.c:309
-msgid "Couldn't construct query"
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ?."
-
-#: ../src/merge-evolution.c:315 ../src/merge-evolution.c:326
-msgid "Couldn't open addressbook."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð½Ñ?Ñ? ÐºÐ½Ð¸Ð³Ñ?."
-
-#: ../src/merge-evolution.c:341
-msgid "Couldn't list available fields."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿ÐµÑ?ÐµÑ?Ð¸Ñ?Ð»Ð¸Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?Ðµ Ð¿Ð¾Ð»Ñ?."
-
-#: ../src/merge-evolution.c:377
-msgid "Couldn't get contacts."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð½Ñ?Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ."
-
-#: ../src/color-combo.c:210
-msgid "Default Color"
-msgstr "Ð¦Ð²ÐµÑ? Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
-
-#: ../src/color-combo-menu.c:86
-msgid "Dark Red"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-ÐºÑ?Ð°Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:87
-msgid "Brown"
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½ÐµÐ²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:88
-msgid "Dark Goldenrod"
-msgstr "Ð¢ÐµÐ¼Ð½Ñ?Ð¹ Ð·Ð¾Ð»Ð¾Ñ?Ð°Ñ?Ð½Ð¸Ðº"
-
-#: ../src/color-combo-menu.c:89
-msgid "Dark Green"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:90
-msgid "Dark Cyan"
-msgstr "Ð¢ÐµÐ¼Ð½Ð¾-Ñ?Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:91
-msgid "Navy Blue"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ñ?Ð¸Ð½Ð¸Ð¹"
-
-#: ../src/color-combo-menu.c:92
-msgid "Dark Violet"
-msgstr "Ð¢Ñ?Ð¼Ð½Ð¾-Ñ?Ð¸Ð¾Ð»ÐµÑ?Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:94
-msgid "Red"
-msgstr "Ð?Ñ?Ð°Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:95
-msgid "Orange"
-msgstr "Ð?Ñ?Ð°Ð½Ð¶ÐµÐ²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:96
-msgid "Dark Yellow"
-msgstr "Ð¢ÐµÐ¼Ð½Ð¾-Ð¶ÐµÐ»Ñ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:97
-msgid "Medium green"
-msgstr "Ð¢Ñ?Ñ?ÐºÐ»Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:98
-msgid "Turquoise"
-msgstr "Ð?Ð¸Ñ?Ñ?Ð·Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:99
-msgid "Blue"
-msgstr "Ð¡Ð¸Ð½Ð¸Ð¹"
-
-#: ../src/color-combo-menu.c:100
-msgid "Purple"
-msgstr "Ð?Ñ?Ñ?Ð¿Ñ?Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:102
-msgid "Salmon"
-msgstr "Ð¡Ð¾Ð¼Ð¾Ð½"
-
-#: ../src/color-combo-menu.c:103
-msgid "Gold"
-msgstr "Ð?Ð¾Ð»Ð¾Ñ?Ð¾Ð¹"
-
-#: ../src/color-combo-menu.c:104
-msgid "Yellow"
-msgstr "Ð?Ñ?Ð»Ñ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:105
-msgid "Green"
-msgstr "Ð?ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:106
-msgid "Cyan"
-msgstr "Ð¦Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:107
-msgid "SkyBlue"
-msgstr "Ð?ÐµÐ±ÐµÑ?Ð½Ð¾-Ñ?Ð¸Ð½Ð¸Ð¹"
-
-#: ../src/color-combo-menu.c:108
-msgid "Violet"
-msgstr "Ð¤Ð¸Ð¾Ð»ÐµÑ?Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:110
-msgid "Pink"
-msgstr "Ð Ð¾Ð·Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:111
-msgid "Khaki"
-msgstr "Ð¥Ð°ÐºÐ¸"
-
-#: ../src/color-combo-menu.c:112
-msgid "Light Yellow"
-msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð¶Ñ?Ð»Ñ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:113
-msgid "Light Green"
-msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ð·ÐµÐ»Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:114
-msgid "Light Cyan"
-msgstr "Ð¡Ð²ÐµÑ?Ð»Ð¾-Ñ?Ð¸Ð°Ð½Ð¾Ð²Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:115
-msgid "Slate Gray"
-msgstr "Ð?Ñ?Ð¿Ð¸Ð´Ð½Ð¾-Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:116
-msgid "Thistle"
-msgstr "Ð§ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ñ?"
-
-#: ../src/color-combo-menu.c:118
-msgid "White"
-msgstr "Ð?ÐµÐ»Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:119
-#, c-format
-msgid "10% Gray"
-msgstr "10% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:120
-#, c-format
-msgid "25% Gray"
-msgstr "25% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:121
-#, c-format
-msgid "40% Gray"
-msgstr "40% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:122
-#, c-format
-msgid "50% Gray"
-msgstr "50% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:123
-#, c-format
-msgid "60% Gray"
-msgstr "60% Ñ?ÐµÑ?Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:124
-msgid "Black"
-msgstr "Ð§Ñ?Ñ?Ð½Ñ?Ð¹"
-
-#: ../src/color-combo-menu.c:252 ../src/color-combo-menu.c:369
-msgid "Custom Color"
-msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ?:"
-
-#: ../src/color-combo-menu.c:317
-#, c-format
-msgid "Custom Color #%u"
-msgstr "Ð?Ð°ÐºÐ°Ð·Ð½Ð¾Ð¹ Ñ?Ð²ÐµÑ? #%u"
-
-#: ../src/wdgt-print-copies.c:153
-msgid "Sheets:"
-msgstr "Ð?Ð¸Ñ?Ñ?Ð¾Ð²:"
-
-#: ../src/wdgt-print-copies.c:173
-msgid "from:"
-msgstr "Ñ?:"
-
-#: ../src/wdgt-print-copies.c:179
-msgid "to:"
-msgstr "Ð¿Ð¾:"
-
-#: ../src/wdgt-print-merge.c:154
-msgid "Start on label"
-msgstr "Ð?Ð°Ñ?Ð°Ñ?Ñ? Ñ? Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸"
-
-#: ../src/wdgt-print-merge.c:161
-msgid "on 1st sheet"
-msgstr "Ð½Ð° Ð¿ÐµÑ?Ð²Ð¾Ð¼ Ð»Ð¸Ñ?Ñ?Ðµ"
-
-#: ../src/wdgt-print-merge.c:170
-msgid "Copies:"
-msgstr "Ð?Ð¾Ð¿Ð¸Ð¹:"
-
-#: ../src/wdgt-print-merge.c:176
-msgid "Collate"
-msgstr "Ð¡Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ñ?"
-
-#: ../src/wdgt-media-select.c:290 ../src/wdgt-media-select.c:294
-#: ../src/wdgt-media-select.c:299 ../src/wdgt-media-select.c:308
-#: ../src/wdgt-media-select.c:311 ../src/wdgt-media-select.c:404
-#: ../src/wdgt-media-select.c:611 ../src/wdgt-media-select.c:620
-msgid "Any"
-msgstr "Ð?Ñ?Ð±Ð¾Ð¹ Ð²Ð°Ñ?Ð¸Ð°Ð½Ñ?"
-
-#: ../src/wdgt-media-select.c:645
-#, c-format
-msgid "%d per sheet"
-msgstr "%d Ð½Ð° Ð»Ð¸Ñ?Ñ?"
-
-#: ../src/wdgt-media-select.c:675
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-#: ../src/wdgt-media-select.c:680
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-#: ../src/wdgt-media-select.c:691 ../src/wdgt-media-select.c:705
-#, c-format
-msgid "%s %s diameter"
-msgstr "%s %s Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?"
-
-#: ../src/wdgt-media-select.c:695 ../src/wdgt-media-select.c:709
-#, c-format
-msgid "%.5g %s diameter"
-msgstr "%.5g %s Ð´Ð¸Ð°Ð¼ÐµÑ?Ñ?"
-
-#: ../src/wdgt-media-select.c:783
-msgid "No recent templates found."
-msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°Ð²Ñ?Ð¸Ñ?Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½Ð¾Ð² Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶ÐµÐ½Ð¾."
-
-#: ../src/wdgt-media-select.c:784
-msgid "Try selecting a template from the \"Search all templates\" page."
-msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð±Ð»Ð¾Ð½ Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐµ Â«Ð?Ð¾Ð¸Ñ?Ðº Ð¿Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½Ð°Ð¼Â»."
-
-#: ../src/wdgt-media-select.c:863
-msgid "No match."
-msgstr "Ð?ÐµÑ? Ñ?Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¹."
-
-#: ../src/wdgt-media-select.c:864
-msgid "Try selecting a different brand, page size or category."
-msgstr "Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð²Ñ?Ð±Ñ?Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ñ?Ñ? Ð¼Ð°Ñ?ÐºÑ?, Ñ?Ð¾Ñ?Ð¼Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð¸Ð»Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
-
-#: ../src/wdgt-rotate-label.c:129
-msgid "Normal"
-msgstr "Ð?Ð±Ñ?Ñ?Ð½Ð¾Ðµ"
-
-#: ../src/wdgt-rotate-label.c:130
-msgid "Rotated"
-msgstr "Ð¡ Ð¿Ð¾Ð²Ð¾Ñ?Ð¾Ñ?Ð¾Ð¼"
-
-#: ../src/critical-error-handler.c:73
-msgid "gLabels Fatal Error!"
-msgstr "Ð¤Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ð¾Ñ?Ð¸Ð±ÐºÐ° gLabels!"
-
-#: ../src/warning-handler.c:73
-msgid "gLabels Error!"
-msgstr "Ð?Ñ?Ð¸Ð±ÐºÐ° gLabels!"
-
 #. Create and append an "Other" entry.
-#: ../libglabels/db.c:118
+#. Translators: "Other" here means other page size.  Meaning a page size
+#. * other than the standard ones that libglabels knows about such as
+#. * "letter", "A4", etc.
+#: ../libglabels/db.c:270
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¾Ð¹"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:131
+#: ../libglabels/db.c:279
 msgid "User defined"
 msgstr "Ð?Ð¿Ñ?ÐµÐ´ÐµÐ»ÐµÐ½Ð¾ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»ÐµÐ¼"
 
-#: ../libglabels/db.c:482
+#: ../libglabels/db.c:665
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:875
+#: ../libglabels/db.c:1057
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1461
+#: ../libglabels/db.c:2097
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr ""
 
-#: ../libglabels/db.c:1538
+#: ../libglabels/db.c:2164
 #, fuzzy, c-format
-msgid "Generic %s full page template"
+msgid "%s full page label"
 msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð°Ñ? %s Ð¿Ð¾Ð»Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°"
 
-#: ../libglabels/xml-template.c:227
+#: ../libglabels/template.c:156
+#, c-format
+msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
+msgstr ""
+
+#: ../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 +1713,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/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
+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/builder/new-label-dialog.glade.h:1
-msgid "<b>Label orientation</b>"
-msgstr "<b>Ð Ð°Ñ?Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð¸ÐºÐµÑ?ÐºÐ¸</b>"
+#: ../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.glade.h:2
-msgid "<b>Media type</b>"
-msgstr "<b>Ð¢Ð¸Ð¿ Ð½Ð¾Ñ?Ð¸Ñ?ÐµÐ»Ñ?</b>"
+#: ../data/ui/new-label-dialog.ui.h:11
+msgid "Similar products:"
+msgstr ""
+
+#: ../data/ui/new-label-dialog.ui.h:12
+msgid "Vendor:"
+msgstr ""
 
-#: ../data/builder/object-editor.glade.h:2
+#: ../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 +2139,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 +2166,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 +2210,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 +2238,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 +2246,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 +2261,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 +2490,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 +2712,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 +3157,6 @@ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 #~ msgid "Show tooltips for drawing toolbar"
 #~ msgstr "Ð?Ð¾ÐºÐ°Ð·Ñ?Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ð´Ñ?ÐºÐ°Ð·ÐºÐ¸ Ð² Ð¿Ð°Ð½ÐµÐ»Ð¸ Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?"
 
-#~ msgid "custom"
-#~ msgstr "Ð²Ñ?Ð±Ð¾Ñ?Ð¾Ñ?Ð½Ð¾"
-
 #~ msgid "Choose Custom Color"
 #~ msgstr "Ð?Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¸Ð¹ Ñ?Ð²ÐµÑ?"
 
@@ -2816,9 +3235,6 @@ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 #~ msgid "dark purple"
 #~ msgstr "Ñ?Ñ?Ð¼Ð½Ð¾-Ð¿Ñ?Ñ?Ð¿Ñ?Ñ?Ð½Ñ?Ð¹"
 
-#~ msgid "Text color"
-#~ msgstr "Ð¦Ð²ÐµÑ? Ñ?ÐµÐºÑ?Ñ?Ð°"
-
 #~ msgid "         "
 #~ msgstr "         "
 
@@ -2873,12 +3289,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 +3366,6 @@ msgstr "%s: ÐºÐ»Ñ?Ñ?Ñ? Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? -- %c\n"
 #~ msgid "U_n-select All"
 #~ msgstr "_Ð¡Ð½Ñ?Ñ?Ñ? Ð²Ñ?Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ?Ð¾ Ð²Ñ?ÐµÐ³Ð¾"
 
-#~ msgid "Undo"
-#~ msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ?"
-
 #~ msgid "Undo the last action"
 #~ msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð½ÐµÐµ Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ðµ"
 
diff --git a/src/color-history-model.c b/src/color-history-model.c
index cf11a80..78bc6a0 100644
--- a/src/color-history-model.c
+++ b/src/color-history-model.c
@@ -22,30 +22,25 @@
 
 #include "color-history-model.h"
 
-#include <gconf/gconf-client.h>
+#include <gio/gio.h>
 
 #include "marshal.h"
 
 
-#define BASE_KEY          "/apps/glabels"
-#define RECENT_COLORS_KEY  BASE_KEY "/recent-colors"
-
-
 /*========================================================*/
 /* Private types.                                         */
 /*========================================================*/
 
-/** GL_COLOR_HISTORY_MODEL Private fields */
 struct _glColorHistoryModelPrivate {
 
-	GConfClient *gconf_client;
+        GSettings   *history;
 
         guint        max_n;
 };
 
 enum {
-	CHANGED,
-	LAST_SIGNAL
+        CHANGED,
+        LAST_SIGNAL
 };
 
 
@@ -60,14 +55,15 @@ static guint signals[LAST_SIGNAL] = {0};
 /* Private function prototypes.                           */
 /*========================================================*/
 
-static void gl_color_history_model_finalize     (GObject             *object);
+static void    gl_color_history_model_finalize  (GObject             *object);
 
-static void conf_notify_cb                      (GConfClient         *client,
-                                                 guint                cnxn_id,
-                                                 GConfEntry          *entry,
-                                                 glColorHistoryModel *this);
+static void    history_changed_cb               (glColorHistoryModel *this);
 
-static GSList *get_color_list                   (glColorHistoryModel *this);
+static guint  *get_color_array                  (glColorHistoryModel *this,
+                                                 guint               *n_elements);
+static void    set_color_array                  (glColorHistoryModel *this,
+                                                 guint               *array,
+                                                 guint                n_elements);
 
 
 /*****************************************************************************/
@@ -88,15 +84,15 @@ gl_color_history_model_class_init (glColorHistoryModelClass *class)
 
         gobject_class->finalize = gl_color_history_model_finalize;
 
-	signals[CHANGED] =
-		g_signal_new ("changed",
-			      G_OBJECT_CLASS_TYPE (gobject_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (glColorHistoryModelClass, changed),
-			      NULL, NULL,
-			      gl_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0);
+        signals[CHANGED] =
+                g_signal_new ("changed",
+                              G_OBJECT_CLASS_TYPE (gobject_class),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (glColorHistoryModelClass, changed),
+                              NULL, NULL,
+                              gl_marshal_VOID__VOID,
+                              G_TYPE_NONE,
+                              0);
 }
 
 
@@ -108,19 +104,13 @@ gl_color_history_model_init (glColorHistoryModel *this)
 {
         this->priv = g_new0 (glColorHistoryModelPrivate, 1);
 
-        this->priv->gconf_client = gconf_client_get_default ();
+        this->priv->history = g_settings_new ("org.gnome.glabels-3.history");
 
-        g_return_if_fail (this->priv->gconf_client != NULL);
+        g_return_if_fail (this->priv->history != NULL);
 
-        gconf_client_add_dir (this->priv->gconf_client,
-                              BASE_KEY,
-                              GCONF_CLIENT_PRELOAD_ONELEVEL,
-                              NULL);
-
-        gconf_client_notify_add (this->priv->gconf_client,
-                                 RECENT_COLORS_KEY,
-                                 (GConfClientNotifyFunc)conf_notify_cb, this,
-                                 NULL, NULL);
+        g_signal_connect_swapped (G_OBJECT (this->priv->history),
+                                  "changed::recent-colors",
+                                  G_CALLBACK (history_changed_cb), this);
 }
 
 
@@ -135,7 +125,7 @@ gl_color_history_model_finalize (GObject *object)
         g_return_if_fail (object && IS_GL_COLOR_HISTORY_MODEL (object));
         this = GL_COLOR_HISTORY_MODEL (object);
 
-        g_object_unref (G_OBJECT(this->priv->gconf_client));
+        g_object_unref (G_OBJECT(this->priv->history));
         g_free (this->priv);
 
         G_OBJECT_CLASS (gl_color_history_model_parent_class)->finalize (object);
@@ -165,57 +155,33 @@ void
 gl_color_history_model_add_color (glColorHistoryModel *this,
                                   guint                color)
 {
-        GSList  *list = NULL;
-        GSList  *old_list;
-        GSList  *p;
-
-        /*
-         * Start new list with this color.
-         */
-        list = g_slist_append (list, GINT_TO_POINTER (color));
-
-        /*
-         * Transfer old list to new list, ignoring any duplicate of this color
-         */
-        old_list = get_color_list (this);
-        for ( p = old_list; p; p=p->next )
-        {
-                if ( color != (guint)GPOINTER_TO_INT (p->data) )
-                {
-                        list = g_slist_append (list, p->data);
-                }
-        }
-        g_slist_free (old_list);
+        guint  *old;
+        guint  *new;
+        guint   i, n;
+
+        old = get_color_array (this, &n);
+                                   
+        new = g_new0 (guint, this->priv->max_n);
 
-        /*
-         * Truncate list to maximum size
-         */
-        while (g_slist_length (list) > this->priv->max_n)
+        new[0] = color;
+
+        for ( i = 0; (i < this->priv->max_n) && (i < n); i++ )
         {
-                p = g_slist_last (list);
-                list = g_slist_remove_link (list, p);
-                g_slist_free_1 (p);
+                new[i+1] = old[i];
         }
 
-        /*
-         * Update conf
-         */
-        gconf_client_set_list (this->priv->gconf_client,
-                               RECENT_COLORS_KEY,
-                               GCONF_VALUE_INT,
-                               list,
-                               NULL);
+        set_color_array (this, new, i);
+
+        g_free (old);
+        g_free (new);
 }
 
 
 /*****************************************************************************/
-/* GConf notify callback.                                                    */
+/* History changed callback.                                                 */
 /*****************************************************************************/
 static void
-conf_notify_cb (GConfClient         *client,
-                guint                cnxn_id,
-                GConfEntry          *entry,
-                glColorHistoryModel  *this)
+history_changed_cb (glColorHistoryModel  *this)
 {
         g_signal_emit (G_OBJECT(this), signals[CHANGED], 0);
 }
@@ -224,19 +190,57 @@ conf_notify_cb (GConfClient         *client,
 /*****************************************************************************/
 /* Get list of colors.                                                       */
 /*****************************************************************************/
-static GSList *
-get_color_list (glColorHistoryModel *this)
+static guint *
+get_color_array (glColorHistoryModel *this,
+                 guint               *n_elements)
 {
-        GSList *list;
-
-        /*
-         * Get color list.
-         */
-	list = gconf_client_get_list (this->priv->gconf_client,
-                                      RECENT_COLORS_KEY,
-                                      GCONF_VALUE_INT,
-                                      NULL);
-        return list;
+        GVariant *value;
+        GVariant *child_value;
+        gsize     i;
+        guint    *array;
+
+        value = g_settings_get_value (this->priv->history, "recent-colors");
+        *n_elements = g_variant_n_children (value);
+
+        array = g_new0 (guint, *n_elements);
+
+        for ( i = 0; i < *n_elements; i++ )
+        {
+                child_value = g_variant_get_child_value (value, i);
+                array[i] = g_variant_get_uint32 (child_value);
+                g_variant_unref (child_value);
+        }
+
+        g_variant_unref (value);
+
+        return array;
+}
+
+
+/*****************************************************************************/
+/* Set list of colors.                                                       */
+/*****************************************************************************/
+static void
+set_color_array (glColorHistoryModel *this,
+                 guint               *array,
+                 guint                n_elements)
+{
+        GVariant  *value;
+        GVariant **child_values;
+        gsize      i;
+
+        child_values = g_new (GVariant *, n_elements);
+
+        for ( i = 0; i < n_elements; i++ )
+        {
+                child_values[i] = g_variant_ref_sink (g_variant_new_uint32 (array[i]));
+        }
+
+        g_variant_new_array (G_VARIANT_TYPE ("u"), child_values, n_elements);
+
+        g_settings_set_value (this->priv->history, "recent-colors", value);
+
+        g_variant_unref (value);
 }
 
 
@@ -247,17 +251,16 @@ guint
 gl_color_history_model_get_color (glColorHistoryModel *this,
                                   guint                i)
 {
+        guint  *array;
         guint   color = 0;
-        GSList *list;
-        GSList *p;
+        guint   n;
 
-        list = get_color_list (this);
-        p = g_slist_nth (list, i);
-        if (p)
+        array = get_color_array (this, &n);
+        if ( array && (i < n) )
         {
-                color = GPOINTER_TO_INT (p->data);
+                color = array[i];
         }
-        g_slist_free (list);
+        g_free (array);
 
         return color;
 }
diff --git a/src/font-history-model.c b/src/font-history-model.c
index 0b25f05..ef7b142 100644
--- a/src/font-history-model.c
+++ b/src/font-history-model.c
@@ -22,32 +22,27 @@
 
 #include "font-history-model.h"
 
-#include <gconf/gconf-client.h>
+#include <gio/gio.h>
 
 #include <libglabels.h>
 #include "font-util.h"
 #include "marshal.h"
 
 
-#define BASE_KEY          "/apps/glabels"
-#define RECENT_FONTS_KEY  BASE_KEY "/recent-fonts"
-
-
 /*========================================================*/
 /* Private types.                                         */
 /*========================================================*/
 
-/** GL_FONT_HISTORY_MODEL Private fields */
 struct _glFontHistoryModelPrivate {
 
-	GConfClient *gconf_client;
+        GSettings   *history;
 
         guint        max_n;
 };
 
 enum {
-	CHANGED,
-	LAST_SIGNAL
+        CHANGED,
+        LAST_SIGNAL
 };
 
 
@@ -64,10 +59,7 @@ static guint signals[LAST_SIGNAL] = {0};
 
 static void gl_font_history_model_finalize      (GObject             *object);
 
-static void conf_notify_cb                      (GConfClient         *client,
-                                                 guint                cnxn_id,
-                                                 GConfEntry          *entry,
-                                                 glFontHistoryModel  *this);
+static void history_changed_cb                  (glFontHistoryModel  *this);
 
 
 /*****************************************************************************/
@@ -88,15 +80,15 @@ gl_font_history_model_class_init (glFontHistoryModelClass *class)
 
         gobject_class->finalize = gl_font_history_model_finalize;
 
-	signals[CHANGED] =
-		g_signal_new ("changed",
-			      G_OBJECT_CLASS_TYPE (gobject_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (glFontHistoryModelClass, changed),
-			      NULL, NULL,
-			      gl_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0);
+        signals[CHANGED] =
+                g_signal_new ("changed",
+                              G_OBJECT_CLASS_TYPE (gobject_class),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (glFontHistoryModelClass, changed),
+                              NULL, NULL,
+                              gl_marshal_VOID__VOID,
+                              G_TYPE_NONE,
+                              0);
 }
 
 
@@ -108,19 +100,13 @@ gl_font_history_model_init (glFontHistoryModel *this)
 {
         this->priv = g_new0 (glFontHistoryModelPrivate, 1);
 
-        this->priv->gconf_client = gconf_client_get_default ();
-
-        g_return_if_fail (this->priv->gconf_client != NULL);
+        this->priv->history = g_settings_new ("org.gnome.glabels-3.history");
 
-        gconf_client_add_dir (this->priv->gconf_client,
-                              BASE_KEY,
-                              GCONF_CLIENT_PRELOAD_ONELEVEL,
-                              NULL);
+        g_return_if_fail (this->priv->history != NULL);
 
-        gconf_client_notify_add (this->priv->gconf_client,
-                                 RECENT_FONTS_KEY,
-                                 (GConfClientNotifyFunc)conf_notify_cb, this,
-                                 NULL, NULL);
+        g_signal_connect_swapped (G_OBJECT (this->priv->history),
+                                  "changed::recent-fonts",
+                                  G_CALLBACK (history_changed_cb), this);
 }
 
 
@@ -135,7 +121,7 @@ gl_font_history_model_finalize (GObject *object)
         g_return_if_fail (object && IS_GL_FONT_HISTORY_MODEL (object));
         this = GL_FONT_HISTORY_MODEL (object);
 
-        g_object_unref (G_OBJECT(this->priv->gconf_client));
+        g_object_unref (G_OBJECT(this->priv->history));
         g_free (this->priv);
 
         G_OBJECT_CLASS (gl_font_history_model_parent_class)->finalize (object);
@@ -165,62 +151,34 @@ void
 gl_font_history_model_add_family (glFontHistoryModel *this,
                                   const gchar        *family)
 {
-        GSList *list = NULL;
-        GList  *old_list;
-        GList  *p;
-        GSList *ps;
+        gchar **old;
+        gchar **new;
+        gint    i;
 
-        /*
-         * Start new list with this family.
-         */
-        list = g_slist_append (list, (gchar *)family);
+        old = g_settings_get_strv (this->priv->history, "recent-templates");
+                                   
+        new = g_new0 (gchar *, this->priv->max_n+1);
 
-        /*
-         * Transfer old list to new list, ignoring any duplicate of this family
-         */
-        old_list = gl_font_history_model_get_family_list (this);
-        for ( p = old_list; p; p=p->next )
-        {
-                if ( lgl_str_utf8_casecmp (family, p->data) )
-                {
-                        list = g_slist_append (list, p->data);
-                }
-                else
-                {
-                        g_free (p->data);
-                }
-        }
-        g_list_free (old_list);
+        new[0] = g_strdup (family);
 
-        /*
-         * Truncate list to maximum size
-         */
-        while (g_slist_length (list) > this->priv->max_n)
+        for ( i = 0; (i < (this->priv->max_n-1)) && old[i]; i++ )
         {
-                ps = g_slist_last (list);
-                list = g_slist_remove_link (list, ps);
-                g_slist_free_1 (ps);
+                new[i+1] = g_strdup (old[i]);
         }
 
-        /*
-         * Update conf
-         */
-        gconf_client_set_list (this->priv->gconf_client,
-                               RECENT_FONTS_KEY,
-                               GCONF_VALUE_STRING,
-                               list,
-                               NULL);
+        g_settings_set_strv (this->priv->history, "recent-templates",
+                             (const gchar * const *)new);
+
+        g_strfreev (old);
+        g_strfreev (new);
 }
 
 
 /*****************************************************************************/
-/* GConf notify callback.                                                    */
+/* History changed callback.                                                 */
 /*****************************************************************************/
 static void
-conf_notify_cb (GConfClient         *client,
-                guint                cnxn_id,
-                GConfEntry          *entry,
-                glFontHistoryModel  *this)
+history_changed_cb                  (glFontHistoryModel  *this)
 {
         g_signal_emit (G_OBJECT(this), signals[CHANGED], 0);
 }
@@ -232,33 +190,23 @@ conf_notify_cb (GConfClient         *client,
 GList *
 gl_font_history_model_get_family_list (glFontHistoryModel *this)
 {
+        gchar **strv;
         GList  *list = NULL;
-        GSList *tmp_list;
-        GSList *p;
+        gint    i;
 
-        /*
-         * Get family list.
-         */
-	tmp_list = gconf_client_get_list (this->priv->gconf_client,
-                                          RECENT_FONTS_KEY,
-                                          GCONF_VALUE_STRING,
-                                          NULL);
+        strv = g_settings_get_strv (this->priv->history, "recent-templates");
 
         /*
-         * Proof read family list; transfer storage to new list.
+         * Proof read name list; transfer storage to new list.
          */
-        for (p=tmp_list; p != NULL; p=p->next)
+        for ( i = 0; strv[i]; i++ )
         {
-                if ( gl_font_util_is_family_installed (p->data) )
-                {
-                        list = g_list_append (list, p->data);
-                }
-                else
+                if ( gl_font_util_is_family_installed (strv[i]) )
                 {
-                        g_free (p->data);
+                        list = g_list_append (list, g_strdup (strv[i]));
                 }
         }
-        g_slist_free (tmp_list);
+        g_strfreev (strv);
 
         return list;
 }
diff --git a/src/prefs-model.c b/src/prefs-model.c
index ca4537f..167d327 100644
--- a/src/prefs-model.c
+++ b/src/prefs-model.c
@@ -22,10 +22,9 @@
 
 #include "prefs-model.h"
 
-#include <glib.h>
+#include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <string.h>
-#include <gconf/gconf-client.h>
 
 #include <libglabels.h>
 #include "marshal.h"
@@ -39,37 +38,6 @@
 /* Private macros and constants.                          */
 /*========================================================*/
 
-/* GConf keys */
-#define BASE_KEY                            "/apps/glabels"
-
-#define PREF_UNITS                          "/units"
-#define PREF_DEFAULT_PAGE_SIZE              "/default-page-size"
-
-#define PREF_DEFAULT_FONT_FAMILY            "/default-font-family"
-#define PREF_DEFAULT_FONT_SIZE              "/default-font-size"
-#define PREF_DEFAULT_FONT_WEIGHT            "/default-font-weight"
-#define PREF_DEFAULT_FONT_ITALIC_FLAG       "/default-font-italic-flag"
-#define PREF_DEFAULT_TEXT_COLOR             "/default-text-color"
-#define PREF_DEFAULT_TEXT_ALIGNMENT         "/default-text-alignment"
-#define PREF_DEFAULT_TEXT_LINE_SPACING      "/default-text-line-spacing"
-
-#define PREF_DEFAULT_LINE_WIDTH             "/default-line-width"
-#define PREF_DEFAULT_LINE_COLOR             "/default-line-color"
-
-#define PREF_DEFAULT_FILL_COLOR             "/default-fill-color"
-
-#define PREF_MAIN_TOOLBAR_VISIBLE           "/main-toolbar-visible"
-
-#define PREF_DRAWING_TOOLBAR_VISIBLE        "/drawing-toolbar-visible"
-
-#define PREF_PROPERTY_TOOLBAR_VISIBLE        "/property-toolbar-visible"
-
-#define PREF_GRID_VISIBLE                   "/grid-visible"
-#define PREF_MARKUP_VISIBLE                 "/markup-visible"
-
-#define PREF_MAX_RECENTS                    "/max-recents"
-
-
 /* Default values */
 #define DEFAULT_UNITS_STRING_US     lgl_units_get_id (LGL_UNITS_INCH)
 #define DEFAULT_PAGE_SIZE_US        "US-Letter"
@@ -77,19 +45,6 @@
 #define DEFAULT_UNITS_STRING_METRIC lgl_units_get_id (LGL_UNITS_MM)
 #define DEFAULT_PAGE_SIZE_METRIC    "A4"
 
-#define DEFAULT_FONT_FAMILY        "Sans"
-#define DEFAULT_FONT_SIZE          14.0
-#define DEFAULT_FONT_WEIGHT_STRING gl_str_util_weight_to_string (PANGO_WEIGHT_NORMAL)
-#define DEFAULT_FONT_ITALIC_FLAG   FALSE
-#define DEFAULT_TEXT_ALIGN_STRING  gl_str_util_align_to_string (PANGO_ALIGN_LEFT)
-#define DEFAULT_TEXT_COLOR         GL_COLOR (0,0,0)
-#define DEFAULT_TEXT_LINE_SPACING  1.0
-
-#define DEFAULT_LINE_WIDTH         1.0
-#define DEFAULT_LINE_COLOR         GL_COLOR_A (0, 0, 0, 255)
-
-#define DEFAULT_FILL_COLOR         GL_COLOR_A (0, 255, 0, 255)
-
 
 /*========================================================*/
 /* Private types.                                         */
@@ -97,13 +52,15 @@
 
 struct _glPrefsModelPrivate {
 
-	GConfClient *gconf_client;
+        GSettings *locale;
+        GSettings *objects;
+        GSettings *ui;
 
 };
 
 enum {
-	CHANGED,
-	LAST_SIGNAL
+        CHANGED,
+        LAST_SIGNAL
 };
 
 
@@ -120,26 +77,7 @@ static guint signals[LAST_SIGNAL] = {0};
 
 static void           gl_prefs_model_finalize      (GObject             *object);
 
-static void           notify_cb                    (GConfClient         *client,
-						    guint                cnxn_id,
-						    GConfEntry          *entry,
-						    glPrefsModel        *prefs_model);
-
-static gchar         *get_string                   (GConfClient         *client,
-						    const gchar         *key,
-						    const gchar         *def);
-
-static gboolean       get_bool                     (GConfClient         *client,
-						    const gchar         *key,
-						    gboolean             def);
-
-static gint           get_int                      (GConfClient         *client,
-						    const gchar         *key,
-						    gint                 def);
-
-static gdouble        get_float                    (GConfClient         *client,
-						    const gchar         *key,
-						    gdouble              def);
+static void           gsettings_changed_cb         (glPrefsModel        *prefs_model);
 
 
 /*****************************************************************************/
@@ -151,68 +89,71 @@ G_DEFINE_TYPE (glPrefsModel, gl_prefs_model, G_TYPE_OBJECT);
 static void
 gl_prefs_model_class_init (glPrefsModelClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
+        GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-	gl_debug (DEBUG_PREFS, "START");
+        gl_debug (DEBUG_PREFS, "START");
 
-	gl_prefs_model_parent_class = g_type_class_peek_parent (class);
+        gl_prefs_model_parent_class = g_type_class_peek_parent (class);
 
-	object_class->finalize = gl_prefs_model_finalize;
+        object_class->finalize = gl_prefs_model_finalize;
 
-	signals[CHANGED] =
-		g_signal_new ("changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (glPrefsModelClass, changed),
-			      NULL, NULL,
-			      gl_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0);
+        signals[CHANGED] =
+                g_signal_new ("changed",
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (glPrefsModelClass, changed),
+                              NULL, NULL,
+                              gl_marshal_VOID__VOID,
+                              G_TYPE_NONE,
+                              0);
 
-	gl_debug (DEBUG_PREFS, "END");
+        gl_debug (DEBUG_PREFS, "END");
 }
 
 
 static void
 gl_prefs_model_init (glPrefsModel *this)
 {
-	gl_debug (DEBUG_PREFS, "START");
+        gl_debug (DEBUG_PREFS, "START");
 
         this->priv = g_new0 (glPrefsModelPrivate, 1);
 
-        this->priv->gconf_client = gconf_client_get_default ();
+        this->priv->locale  = g_settings_new ("org.gnome.glabels-3.locale");
+        this->priv->objects = g_settings_new ("org.gnome.glabels-3.objects");
+        this->priv->ui      = g_settings_new ("org.gnome.glabels-3.ui");
 
-        g_return_if_fail (this->priv->gconf_client != NULL);
+        g_return_if_fail (this->priv->locale != NULL);
+        g_return_if_fail (this->priv->objects != NULL);
+        g_return_if_fail (this->priv->ui != NULL);
  
-        gconf_client_add_dir (this->priv->gconf_client,
-                              BASE_KEY,
-                              GCONF_CLIENT_PRELOAD_ONELEVEL,
-                              NULL);
-         
-        gconf_client_notify_add (this->priv->gconf_client,
-                                 BASE_KEY,
-                                 (GConfClientNotifyFunc)notify_cb, this,
-                                 NULL, NULL);
+        g_signal_connect_swapped (G_OBJECT (this->priv->locale), "changed",
+                                  G_CALLBACK (gsettings_changed_cb), this);
+        g_signal_connect_swapped (G_OBJECT (this->priv->objects), "changed",
+                                  G_CALLBACK (gsettings_changed_cb), this);
+        g_signal_connect_swapped (G_OBJECT (this->priv->ui), "changed",
+                                  G_CALLBACK (gsettings_changed_cb), this);
 
-	gl_debug (DEBUG_PREFS, "END");
+        gl_debug (DEBUG_PREFS, "END");
 }
 
 
 static void
 gl_prefs_model_finalize (GObject *object)
 {
-	glPrefsModel *this = GL_PREFS_MODEL (object);
+        glPrefsModel *this = GL_PREFS_MODEL (object);
 
-	gl_debug (DEBUG_PREFS, "START");
+        gl_debug (DEBUG_PREFS, "START");
 
-	g_return_if_fail (object && GL_IS_PREFS_MODEL (object));
+        g_return_if_fail (object && GL_IS_PREFS_MODEL (object));
 
-	g_object_unref (G_OBJECT(this->priv->gconf_client));
+        g_object_unref (G_OBJECT(this->priv->locale));
+        g_object_unref (G_OBJECT(this->priv->objects));
+        g_object_unref (G_OBJECT(this->priv->ui));
         g_free (this->priv);
 
-	G_OBJECT_CLASS (gl_prefs_model_parent_class)->finalize (object);
+        G_OBJECT_CLASS (gl_prefs_model_parent_class)->finalize (object);
 
-	gl_debug (DEBUG_PREFS, "END");
+        gl_debug (DEBUG_PREFS, "END");
 }
 
 
@@ -222,15 +163,15 @@ gl_prefs_model_finalize (GObject *object)
 glPrefsModel *
 gl_prefs_model_new (void)
 {
-	glPrefsModel *this;
+        glPrefsModel *this;
 
-	gl_debug (DEBUG_PREFS, "START");
+        gl_debug (DEBUG_PREFS, "START");
 
-	this = GL_PREFS_MODEL (g_object_new (gl_prefs_model_get_type(), NULL));
+        this = GL_PREFS_MODEL (g_object_new (gl_prefs_model_get_type(), NULL));
 
-	gl_debug (DEBUG_PREFS, "END");
+        gl_debug (DEBUG_PREFS, "END");
 
-	return this;
+        return this;
 }
 
 
@@ -241,10 +182,9 @@ void
 gl_prefs_model_set_units (glPrefsModel     *this,
                           lglUnits          units)
 {
-	gconf_client_set_string (this->priv->gconf_client,
-				 BASE_KEY PREF_UNITS,
-				 lgl_units_get_id (units),
-				 NULL);
+        g_settings_set_string (this->priv->locale,
+                               "units",
+                               lgl_units_get_id (units));
 }
 
 
@@ -255,30 +195,32 @@ lglUnits
 gl_prefs_model_get_units (glPrefsModel     *this)
 {
         const gchar  *pgsize;
-        const gchar  *default_units_string;
         gchar        *string;
         lglUnits      units;
 
-        /* Make educated guess about locale default. */
-        pgsize = gtk_paper_size_get_default ();
-        if ( strcmp (pgsize, GTK_PAPER_NAME_LETTER) == 0 )
-        {
-                default_units_string = DEFAULT_UNITS_STRING_US;
-        }
-        else
+        string = g_settings_get_string (this->priv->locale, "units");
+        
+        /* If not set, make educated guess about locale default. */
+        if ( !string || !strlen(string) )
         {
-                default_units_string = DEFAULT_UNITS_STRING_METRIC;
+                pgsize = gtk_paper_size_get_default ();
+                if ( strcmp (pgsize, GTK_PAPER_NAME_LETTER) == 0 )
+                {
+                        string = g_strdup (DEFAULT_UNITS_STRING_US);
+                }
+                else
+                {
+                        string = g_strdup (DEFAULT_UNITS_STRING_METRIC);
+                }
         }
 
-	string = get_string (this->priv->gconf_client,
-                             BASE_KEY PREF_UNITS,
-                             default_units_string);
-	units = lgl_units_from_id (string);
-	g_free (string);
+        units = lgl_units_from_id (string);
+        g_free (string);
 
         /* If invalid, make an educated guess from locale. */
         if (units == LGL_UNITS_INVALID)
         {
+                pgsize = gtk_paper_size_get_default ();
                 if ( strcmp (pgsize, GTK_PAPER_NAME_LETTER) == 0 )
                 {
                         units = LGL_UNITS_INCH;
@@ -300,10 +242,9 @@ void
 gl_prefs_model_set_default_page_size (glPrefsModel     *this,
                                       const gchar      *page_size)
 {
-	gconf_client_set_string (this->priv->gconf_client,
-				 BASE_KEY PREF_DEFAULT_PAGE_SIZE,
-				 page_size,
-				 NULL);
+        g_settings_set_string (this->priv->locale,
+                               "default-page-size",
+                               page_size);
 }
 
 
@@ -314,34 +255,34 @@ gchar *
 gl_prefs_model_get_default_page_size (glPrefsModel     *this)
 {
         const gchar *pgsize;
-        const gchar *default_page_size;
         gchar       *page_size;
-	lglPaper    *paper;
+        lglPaper    *paper;
 
-        /* Make educated guess about locale default. */
-        pgsize = gtk_paper_size_get_default ();
-        if ( strcmp (pgsize, GTK_PAPER_NAME_LETTER) == 0 )
-        {
-                default_page_size = DEFAULT_PAGE_SIZE_US;
-        }
-        else
+        page_size = g_settings_get_string (this->priv->locale, "default-page-size");
+
+        /* If not set, make educated guess about locale default. */
+        if ( !page_size || !strlen(page_size) )
         {
-                default_page_size = DEFAULT_PAGE_SIZE_METRIC;
+                pgsize = gtk_paper_size_get_default ();
+                if ( strcmp (pgsize, GTK_PAPER_NAME_LETTER) == 0 )
+                {
+                        page_size = g_strdup (DEFAULT_PAGE_SIZE_US);
+                }
+                else
+                {
+                        page_size = g_strdup (DEFAULT_PAGE_SIZE_METRIC);
+                }
         }
 
-	page_size = get_string (this->priv->gconf_client,
-                                BASE_KEY PREF_DEFAULT_PAGE_SIZE,
-                                default_page_size);
-
-	/* Proof read the default page size -- it must be a valid id. */
-	/* (For compatability with older versions.) */
-	paper = lgl_db_lookup_paper_from_id (page_size);
-	if ( paper == NULL ) {
+        /* Proof read the default page size -- it must be a valid id. */
+        /* (For compatability with older versions.) */
+        paper = lgl_db_lookup_paper_from_id (page_size);
+        if ( paper == NULL ) {
                 g_free (page_size);
-		page_size = g_strdup (DEFAULT_PAGE_SIZE_US);
-	} else {
-		lgl_paper_free (paper);
-	}
+                page_size = g_strdup (DEFAULT_PAGE_SIZE_US);
+        } else {
+                lgl_paper_free (paper);
+        }
 
         return page_size;
 }
@@ -354,10 +295,9 @@ void
 gl_prefs_model_set_default_font_family (glPrefsModel     *this,
                                         const gchar      *family)
 {
-	gconf_client_set_string (this->priv->gconf_client,
-				 BASE_KEY PREF_DEFAULT_FONT_FAMILY,
-				 family,
-				 NULL);
+        g_settings_set_string (this->priv->objects,
+                               "default-font-family",
+                               family);
 }
 
 
@@ -369,9 +309,8 @@ gl_prefs_model_get_default_font_family (glPrefsModel     *this)
 {
         gchar *family;
 
-        family = get_string (this->priv->gconf_client,
-                             BASE_KEY PREF_DEFAULT_FONT_FAMILY,
-                             DEFAULT_FONT_FAMILY);
+        family = g_settings_get_string (this->priv->objects,
+                                        "default-font-family");
 
         return family;
 }
@@ -384,10 +323,9 @@ void
 gl_prefs_model_set_default_font_size (glPrefsModel     *this,
                                       gdouble           size)
 {
-	gconf_client_set_float (this->priv->gconf_client,
-                                BASE_KEY PREF_DEFAULT_FONT_SIZE,
-                                size,
-                                NULL);
+        g_settings_set_double (this->priv->objects,
+                               "default-font-size",
+                               size);
 }
 
 
@@ -399,9 +337,8 @@ gl_prefs_model_get_default_font_size (glPrefsModel     *this)
 {
         gdouble size;
 
-	size = get_float (this->priv->gconf_client,
-                          BASE_KEY PREF_DEFAULT_FONT_SIZE,
-                          DEFAULT_FONT_SIZE);
+        size = g_settings_get_double (this->priv->objects,
+                                      "default-font-size");
 
         return size;
 }
@@ -414,10 +351,9 @@ void
 gl_prefs_model_set_default_font_weight (glPrefsModel     *this,
                                         PangoWeight       weight)
 {
-	gconf_client_set_string (this->priv->gconf_client,
-				 BASE_KEY PREF_DEFAULT_FONT_WEIGHT,
-				 gl_str_util_weight_to_string(weight),
-				 NULL);
+        g_settings_set_string (this->priv->objects,
+                               "default-font-weight",
+                               gl_str_util_weight_to_string(weight));
 }
 
 
@@ -430,11 +366,10 @@ gl_prefs_model_get_default_font_weight (glPrefsModel     *this)
         gchar       *string;
         PangoWeight  weight;
 
-	string = get_string (this->priv->gconf_client,
-                             BASE_KEY PREF_DEFAULT_FONT_WEIGHT,
-                             DEFAULT_FONT_WEIGHT_STRING);
-	weight = gl_str_util_string_to_weight (string);
-	g_free (string);
+        string = g_settings_get_string (this->priv->objects,
+                                        "default-font-weight");
+        weight = gl_str_util_string_to_weight (string);
+        g_free (string);
 
         return weight;
 }
@@ -447,10 +382,9 @@ void
 gl_prefs_model_set_default_font_italic_flag (glPrefsModel     *this,
                                              gboolean          italic_flag)
 {
-	gconf_client_set_bool (this->priv->gconf_client,
-			       BASE_KEY PREF_DEFAULT_FONT_ITALIC_FLAG,
-			       italic_flag,
-			       NULL);
+        g_settings_set_boolean (this->priv->objects,
+                                "default-font-italic-flag",
+                                italic_flag);
 }
 
 
@@ -462,9 +396,8 @@ gl_prefs_model_get_default_font_italic_flag (glPrefsModel     *this)
 {
         gboolean italic_flag;
 
-	italic_flag = get_bool (this->priv->gconf_client,
-                                BASE_KEY PREF_DEFAULT_FONT_ITALIC_FLAG,
-                                DEFAULT_FONT_ITALIC_FLAG);
+        italic_flag = g_settings_get_boolean (this->priv->objects,
+                                              "default-font-italic-flag");
 
         return italic_flag;
 }
@@ -477,10 +410,9 @@ void
 gl_prefs_model_set_default_text_color (glPrefsModel     *this,
                                        guint             color)
 {
-	gconf_client_set_int    (this->priv->gconf_client,
-				 BASE_KEY PREF_DEFAULT_TEXT_COLOR,
-				 color,
-				 NULL);
+        g_settings_set_value (this->priv->objects,
+                              "default-text-color",
+                              g_variant_new_uint32 (color));
 }
 
 
@@ -490,11 +422,12 @@ gl_prefs_model_set_default_text_color (glPrefsModel     *this,
 guint
 gl_prefs_model_get_default_text_color (glPrefsModel     *this)
 {
-        guint color;
+        GVariant *value;
+        guint     color;
 
-	color =	get_int (this->priv->gconf_client,
-			 BASE_KEY PREF_DEFAULT_TEXT_COLOR,
-			 DEFAULT_TEXT_COLOR);
+        value = g_settings_get_value (this->priv->objects, "default-text-color");
+        color = g_variant_get_uint32 (value);
+        g_variant_unref (value);
 
         return color;
 }
@@ -507,10 +440,9 @@ void
 gl_prefs_model_set_default_text_alignment (glPrefsModel     *this,
                                            PangoAlignment    alignment)
 {
-	gconf_client_set_string (this->priv->gconf_client,
-				 BASE_KEY PREF_DEFAULT_TEXT_ALIGNMENT,
-				 gl_str_util_align_to_string(alignment),
-				 NULL);
+        g_settings_set_string (this->priv->objects,
+                               "default-text-alignment",
+                               gl_str_util_align_to_string(alignment));
 }
 
 
@@ -523,11 +455,10 @@ gl_prefs_model_get_default_text_alignment (glPrefsModel     *this)
         gchar          *string;
         PangoAlignment  alignment;
 
-	string = get_string (this->priv->gconf_client,
-                             BASE_KEY PREF_DEFAULT_TEXT_ALIGNMENT,
-                             DEFAULT_TEXT_ALIGN_STRING);
-	alignment = gl_str_util_string_to_align (string);
-	g_free (string);
+        string = g_settings_get_string (this->priv->objects,
+                                        "default-text-alignment");
+        alignment = gl_str_util_string_to_align (string);
+        g_free (string);
 
         return alignment;
 }
@@ -540,10 +471,9 @@ void
 gl_prefs_model_set_default_text_line_spacing (glPrefsModel     *this,
                                               gdouble           spacing)
 {
-	gconf_client_set_float  (this->priv->gconf_client,
-				 BASE_KEY PREF_DEFAULT_TEXT_LINE_SPACING,
-				 spacing,
-				 NULL);
+        g_settings_set_double (this->priv->objects,
+                               "default-text-line-spacing",
+                               spacing);
 }
 
 
@@ -555,9 +485,8 @@ gl_prefs_model_get_default_text_line_spacing (glPrefsModel     *this)
 {
         gdouble spacing;
 
-	spacing = get_float (this->priv->gconf_client,
-                             BASE_KEY PREF_DEFAULT_TEXT_LINE_SPACING,
-                             DEFAULT_TEXT_LINE_SPACING);
+        spacing = g_settings_get_double (this->priv->objects,
+                                         "default-text-line-spacing");
 
         return spacing;
 }
@@ -570,10 +499,9 @@ void
 gl_prefs_model_set_default_line_width (glPrefsModel     *this,
                                        gdouble           width)
 {
-	gconf_client_set_float  (this->priv->gconf_client,
-				 BASE_KEY PREF_DEFAULT_LINE_WIDTH,
-				 width,
-				 NULL);
+        g_settings_set_double (this->priv->objects,
+                               "default-line-width",
+                               width);
 }
 
 
@@ -585,9 +513,8 @@ gl_prefs_model_get_default_line_width (glPrefsModel     *this)
 {
         gdouble width;
 
-	width = get_float (this->priv->gconf_client,
-			   BASE_KEY PREF_DEFAULT_LINE_WIDTH,
-			   DEFAULT_LINE_WIDTH);
+        width = g_settings_get_double (this->priv->objects,
+                                       "default-line-width");
 
         return width;
 }
@@ -600,10 +527,9 @@ void
 gl_prefs_model_set_default_line_color (glPrefsModel     *this,
                                        guint             color)
 {
-	gconf_client_set_int (this->priv->gconf_client,
-                              BASE_KEY PREF_DEFAULT_LINE_COLOR,
-                              color,
-                              NULL);
+        g_settings_set_value (this->priv->objects,
+                              "default-line-color",
+                              g_variant_new_uint32 (color));
 }
 
 
@@ -613,11 +539,12 @@ gl_prefs_model_set_default_line_color (glPrefsModel     *this,
 guint
 gl_prefs_model_get_default_line_color (glPrefsModel     *this)
 {
-        guint color;
+        GVariant *value;
+        guint     color;
 
-	color = get_int (this->priv->gconf_client,
-			 BASE_KEY PREF_DEFAULT_LINE_COLOR,
-			 DEFAULT_LINE_COLOR);
+        value = g_settings_get_value (this->priv->objects, "default-line-color");
+        color = g_variant_get_uint32 (value);
+        g_variant_unref (value);
 
         return color;
 }
@@ -630,10 +557,9 @@ void
 gl_prefs_model_set_default_fill_color (glPrefsModel     *this,
                                        guint             color)
 {
-	gconf_client_set_int (this->priv->gconf_client,
-                              BASE_KEY PREF_DEFAULT_FILL_COLOR,
-                              color,
-                              NULL);
+        g_settings_set_value (this->priv->objects,
+                              "default-fill-color",
+                              g_variant_new_uint32 (color));
 }
 
 
@@ -643,11 +569,12 @@ gl_prefs_model_set_default_fill_color (glPrefsModel     *this,
 guint
 gl_prefs_model_get_default_fill_color (glPrefsModel     *this)
 {
-        guint color;
+        GVariant *value;
+        guint     color;
 
-	color = get_int (this->priv->gconf_client,
-			 BASE_KEY PREF_DEFAULT_FILL_COLOR,
-			 DEFAULT_FILL_COLOR);
+        value = g_settings_get_value (this->priv->objects, "default-fill-color");
+        color = g_variant_get_uint32 (value);
+        g_variant_unref (value);
 
         return color;
 }
@@ -660,10 +587,9 @@ void
 gl_prefs_model_set_main_toolbar_visible (glPrefsModel     *this,
                                          gboolean          visible)
 {
-	gconf_client_set_bool (this->priv->gconf_client,
-			       BASE_KEY PREF_MAIN_TOOLBAR_VISIBLE,
-			       visible,
-			       NULL);
+        g_settings_set_boolean (this->priv->ui,
+                                "main-toolbar-visible",
+                                visible);
 }
 
 
@@ -675,9 +601,8 @@ gl_prefs_model_get_main_toolbar_visible (glPrefsModel     *this)
 {
         gboolean visible;
 
-	visible = get_bool (this->priv->gconf_client,
-                            BASE_KEY PREF_MAIN_TOOLBAR_VISIBLE,
-                            TRUE);
+        visible = g_settings_get_boolean (this->priv->ui,
+                                          "main-toolbar-visible");
 
         return visible;
 }
@@ -690,10 +615,9 @@ void
 gl_prefs_model_set_drawing_toolbar_visible (glPrefsModel     *this,
                                             gboolean          visible)
 {
-	gconf_client_set_bool (this->priv->gconf_client,
-			       BASE_KEY PREF_DRAWING_TOOLBAR_VISIBLE,
-			       visible,
-			       NULL);
+        g_settings_set_boolean (this->priv->ui,
+                                "drawing-toolbar-visible",
+                                visible);
 }
 
 
@@ -705,9 +629,8 @@ gl_prefs_model_get_drawing_toolbar_visible (glPrefsModel     *this)
 {
         gboolean visible;
 
-	visible = get_bool (this->priv->gconf_client,
-                            BASE_KEY PREF_DRAWING_TOOLBAR_VISIBLE,
-                            TRUE);
+        visible = g_settings_get_boolean (this->priv->ui,
+                                          "drawing-toolbar-visible");
 
         return visible;
 }
@@ -720,10 +643,9 @@ void
 gl_prefs_model_set_property_toolbar_visible (glPrefsModel     *this,
                                              gboolean          visible)
 {
-	gconf_client_set_bool (this->priv->gconf_client,
-			       BASE_KEY PREF_PROPERTY_TOOLBAR_VISIBLE,
-			       visible,
-			       NULL);
+        g_settings_set_boolean (this->priv->ui,
+                                "property-toolbar-visible",
+                                visible);
 }
 
 
@@ -735,9 +657,8 @@ gl_prefs_model_get_property_toolbar_visible (glPrefsModel     *this)
 {
         gboolean visible;
 
-	visible = get_bool (this->priv->gconf_client,
-                            BASE_KEY PREF_PROPERTY_TOOLBAR_VISIBLE,
-                            TRUE);
+        visible = g_settings_get_boolean (this->priv->ui,
+                                          "property-toolbar-visible");
 
         return visible;
 }
@@ -750,10 +671,9 @@ void
 gl_prefs_model_set_grid_visible (glPrefsModel     *this,
                                  gboolean          visible)
 {
-	gconf_client_set_bool (this->priv->gconf_client,
-			       BASE_KEY PREF_GRID_VISIBLE,
-			       visible,
-			       NULL);
+        g_settings_set_boolean (this->priv->ui,
+                                "grid-visible",
+                                visible);
 }
 
 
@@ -765,9 +685,8 @@ gl_prefs_model_get_grid_visible (glPrefsModel     *this)
 {
         gboolean visible;
 
-	visible = get_bool (this->priv->gconf_client,
-                            BASE_KEY PREF_GRID_VISIBLE,
-                            TRUE);
+        visible = g_settings_get_boolean (this->priv->ui,
+                                          "grid-visible");
 
         return visible;
 }
@@ -780,10 +699,9 @@ void
 gl_prefs_model_set_markup_visible (glPrefsModel     *this,
                                    gboolean          visible)
 {
-	gconf_client_set_bool (this->priv->gconf_client,
-			       BASE_KEY PREF_MARKUP_VISIBLE,
-			       visible,
-			       NULL);
+        g_settings_set_boolean (this->priv->ui,
+                                "markup-visible",
+                                visible);
 }
 
 
@@ -795,9 +713,8 @@ gl_prefs_model_get_markup_visible (glPrefsModel     *this)
 {
         gboolean visible;
 
-	visible = get_bool (this->priv->gconf_client,
-                            BASE_KEY PREF_MARKUP_VISIBLE,
-                            TRUE);
+        visible = g_settings_get_boolean (this->priv->ui,
+                                          "markup-visible");
 
         return visible;
 }
@@ -810,10 +727,9 @@ void
 gl_prefs_model_set_max_recents (glPrefsModel     *this,
                                 gint              max_recents)
 {
-	gconf_client_set_int (this->priv->gconf_client,
-			      BASE_KEY PREF_MAX_RECENTS,
-			      max_recents,
-			      NULL);
+        g_settings_set_int (this->priv->ui,
+                            "max-recents",
+                            max_recents);
 }
 
 
@@ -825,9 +741,8 @@ gl_prefs_model_get_max_recents (glPrefsModel     *this)
 {
         gint max_recents;
 
-	max_recents = get_int (this->priv->gconf_client,
-                               BASE_KEY PREF_MAX_RECENTS,
-                               -1);
+        max_recents = g_settings_get_int (this->priv->ui,
+                                          "max-recents");
 
         return max_recents;
 }
@@ -837,131 +752,12 @@ gl_prefs_model_get_max_recents (glPrefsModel     *this)
 /* PRIVATE.  Key changed callback.                                           */
 /*---------------------------------------------------------------------------*/
 static void 
-notify_cb (GConfClient  *client,
-	   guint         cnxn_id,
-	   GConfEntry   *entry,
-	   glPrefsModel *this)
-{
-	gl_debug (DEBUG_PREFS, "Key was changed: %s", entry->key);
-
-	g_signal_emit (G_OBJECT(this), signals[CHANGED], 0);
-}
-
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE.  Utilities to get values with defaults.                          */
-/*---------------------------------------------------------------------------*/
-static gchar*
-get_string (GConfClient *client,
-	    const gchar *key,
-	    const gchar *def)
-{
-	gchar* val;
-
-	val = gconf_client_get_string (client, key, NULL);
-
-	if (val != NULL) {
-
-		return val;
-
-	} else {
-
-		return def ? g_strdup (def) : NULL;
-
-	}
-}
-
-
-static gboolean
-get_bool (GConfClient *client,
-	  const gchar *key,
-	  gboolean     def)
+gsettings_changed_cb (glPrefsModel *this)
 {
-	GConfValue* val;
-	gboolean retval;
-
-	val = gconf_client_get (client, key, NULL);
-
-	if (val != NULL) {
-
-		if ( val->type == GCONF_VALUE_BOOL ) {
-			retval = gconf_value_get_bool (val);
-		} else {
-			retval = def;
-		}
-
-		gconf_value_free (val);
-
-		return retval;
-
-	} else {
-
-		return def;
-
-	}
+        g_signal_emit (G_OBJECT(this), signals[CHANGED], 0);
 }
 
 
-static gint
-get_int (GConfClient *client,
-	 const gchar *key,
-	 gint         def)
-{
-	GConfValue* val;
-	gint retval;
-
-	val = gconf_client_get (client, key, NULL);
-
-	if (val != NULL) {
-
-		if ( val->type == GCONF_VALUE_INT) {
-			retval = gconf_value_get_int(val);
-		} else {
-			retval = def;
-		}
-
-		gconf_value_free (val);
-
-		return retval;
-
-	} else {
-
-		return def;
-
-	}
-}
-
-
-static gdouble
-get_float (GConfClient *client,
-	   const gchar *key,
-	   gdouble      def)
-{
-	GConfValue* val;
-	gdouble retval;
-
-	val = gconf_client_get (client, key, NULL);
-
-	if (val != NULL) {
-
-		if ( val->type == GCONF_VALUE_FLOAT ) {
-			retval = gconf_value_get_float(val);
-		} else {
-			retval = def;
-		}
-
-		gconf_value_free (val);
-
-		return retval;
-
-	} else {
-		return def;
-
-	}
-}
-
-
-
 
 
 /*
diff --git a/src/template-history-model.c b/src/template-history-model.c
index e00579e..1e53862 100644
--- a/src/template-history-model.c
+++ b/src/template-history-model.c
@@ -22,24 +22,19 @@
 
 #include "template-history-model.h"
 
-#include <gconf/gconf-client.h>
+#include <gio/gio.h>
 
 #include <libglabels.h>
 #include "marshal.h"
 
 
-#define BASE_KEY              "/apps/glabels"
-#define RECENT_TEMPLATES_KEY  BASE_KEY "/recent-templates"
-
-
 /*========================================================*/
 /* Private types.                                         */
 /*========================================================*/
 
-/** GL_TEMPLATE_HISTORY_MODEL Private fields */
 struct _glTemplateHistoryModelPrivate {
 
-	GConfClient *gconf_client;
+	GSettings   *history;
 
         guint        max_n;
 };
@@ -63,10 +58,7 @@ static guint signals[LAST_SIGNAL] = {0};
 
 static void gl_template_history_model_finalize (GObject                 *object);
 
-static void conf_notify_cb                     (GConfClient             *client,
-                                                guint                    cnxn_id,
-                                                GConfEntry              *entry,
-                                                glTemplateHistoryModel  *this);
+static void history_changed_cb                 (glTemplateHistoryModel  *this);
 
 
 /*****************************************************************************/
@@ -107,19 +99,13 @@ gl_template_history_model_init (glTemplateHistoryModel *this)
 {
         this->priv = g_new0 (glTemplateHistoryModelPrivate, 1);
 
-        this->priv->gconf_client = gconf_client_get_default ();
-
-        g_return_if_fail (this->priv->gconf_client != NULL);
+        this->priv->history = g_settings_new ("org.gnome.glabels-3.history");
 
-        gconf_client_add_dir (this->priv->gconf_client,
-                              BASE_KEY,
-                              GCONF_CLIENT_PRELOAD_ONELEVEL,
-                              NULL);
+        g_return_if_fail (this->priv->history != NULL);
 
-        gconf_client_notify_add (this->priv->gconf_client,
-                                 RECENT_TEMPLATES_KEY,
-                                 (GConfClientNotifyFunc)conf_notify_cb, this,
-                                 NULL, NULL);
+        g_signal_connect_swapped (G_OBJECT (this->priv->history),
+                                  "changed::recent-templates",
+                                  G_CALLBACK (history_changed_cb), this);
 }
 
 
@@ -134,7 +120,7 @@ gl_template_history_model_finalize (GObject *object)
         g_return_if_fail (object && IS_GL_TEMPLATE_HISTORY_MODEL (object));
         this = GL_TEMPLATE_HISTORY_MODEL (object);
 
-        g_object_unref (G_OBJECT(this->priv->gconf_client));
+        g_object_unref (G_OBJECT(this->priv->history));
         g_free (this->priv);
 
         G_OBJECT_CLASS (gl_template_history_model_parent_class)->finalize (object);
@@ -164,62 +150,34 @@ void
 gl_template_history_model_add_name (glTemplateHistoryModel *this,
                                     const gchar            *name)
 {
-        GSList *list = NULL;
-        GList  *old_list;
-        GList  *p;
-        GSList *ps;
+        gchar **old;
+        gchar **new;
+        gint    i;
 
-        /*
-         * Start new list with this name.
-         */
-        list = g_slist_append (list, (gchar *)name);
+        old = g_settings_get_strv (this->priv->history, "recent-templates");
+                                   
+        new = g_new0 (gchar *, this->priv->max_n+1);
 
-        /*
-         * Transfer old list to new list, ignoring any duplicate of this name
-         */
-        old_list = gl_template_history_model_get_name_list (this);
-        for ( p = old_list; p; p=p->next )
-        {
-                if ( lgl_str_utf8_casecmp (name, p->data) )
-                {
-                        list = g_slist_append (list, p->data);
-                }
-                else
-                {
-                        g_free (p->data);
-                }
-        }
-        g_list_free (old_list);
+        new[0] = g_strdup (name);
 
-        /*
-         * Truncate list to maximum size
-         */
-        while (g_slist_length (list) > this->priv->max_n)
+        for ( i = 0; (i < (this->priv->max_n-1)) && old[i]; i++ )
         {
-                ps = g_slist_last (list);
-                list = g_slist_remove_link (list, ps);
-                g_slist_free_1 (ps);
+                new[i+1] = g_strdup (old[i]);
         }
 
-        /*
-         * Update conf
-         */
-        gconf_client_set_list (this->priv->gconf_client,
-                               RECENT_TEMPLATES_KEY,
-                               GCONF_VALUE_STRING,
-                               list,
-                               NULL);
+        g_settings_set_strv (this->priv->history, "recent-templates",
+                             (const gchar * const *)new);
+
+        g_strfreev (old);
+        g_strfreev (new);
 }
 
 
 /*****************************************************************************/
-/* GConf notify callback.                                                    */
+/* History changed callback.                                                 */
 /*****************************************************************************/
 static void
-conf_notify_cb (GConfClient         *client,
-                guint                cnxn_id,
-                GConfEntry          *entry,
-                glTemplateHistoryModel  *this)
+history_changed_cb (glTemplateHistoryModel  *this)
 {
         g_signal_emit (G_OBJECT(this), signals[CHANGED], 0);
 }
@@ -231,33 +189,23 @@ conf_notify_cb (GConfClient         *client,
 GList *
 gl_template_history_model_get_name_list (glTemplateHistoryModel *this)
 {
+        gchar **strv;
         GList  *list = NULL;
-        GSList *tmp_list;
-        GSList *p;
+        gint    i;
 
-        /*
-         * Get name list.
-         */
-	tmp_list = gconf_client_get_list (this->priv->gconf_client,
-                                          RECENT_TEMPLATES_KEY,
-                                          GCONF_VALUE_STRING,
-                                          NULL);
+        strv = g_settings_get_strv (this->priv->history, "recent-templates");
 
         /*
          * Proof read name list; transfer storage to new list.
          */
-        for (p=tmp_list; p != NULL; p=p->next)
+        for ( i = 0; strv[i]; i++ )
         {
-                if ( lgl_db_does_template_name_exist (p->data) )
-                {
-                        list = g_list_append (list, p->data);
-                }
-                else
+                if ( lgl_db_does_template_name_exist (strv[i]) )
                 {
-                        g_free (p->data);
+                        list = g_list_append (list, g_strdup (strv[i]));
                 }
         }
-        g_slist_free (tmp_list);
+        g_strfreev (strv);
 
         return list;
 }
diff --git a/src/ui.c b/src/ui.c
index b369f9d..14d37ab 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -23,7 +23,6 @@
 #include "ui.h"
 
 #include <glib/gi18n.h>
-#include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 #include <string.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]